java-psi-api and java-psi-impl modules extracted

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 453e0541ce8dabddfc773a7ff87e7595a8f7006f..a4740128030d9a8b1b990801631737237557e963 100644 (file)
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -34,13 +34,14 @@ def layoutFull(String home, String targetDirectory) {
 
   //noinspection GroovyAssignabilityCheck
   List<String> openapiModules = [platformApiModules(),
-          "openapi", "testFramework-java", "debugger-openapi", "compiler-openapi", "dom-openapi", "execution-openapi",
+          "java-psi-api", "openapi", "testFramework-java", "debugger-openapi", "compiler-openapi", "dom-openapi", "execution-openapi",
           "jsp-openapi", "jsp-base-openapi"].flatten()
 
   //noinspection GroovyAssignabilityCheck
   List<String> implementationModules = [platformImplementationModules(),
           "notNull",
           "platform-main",
+          "java-psi-impl",
           "java-impl",
           "compiler-impl",
           "debugger-impl",
@@ -423,6 +424,8 @@ def layout_core(String home, String target) {
       module("core-impl")
       module("boot")
       module("extensions")
+      module("java-psi-api")
+      module("java-psi-impl")
     }
 
     jar("annotations.jar") {

diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index f5bd5cce2b5f7d88e475f1da930632c4f845f744..934740800fe97b7b3eac8d120c3e27da8644a989 100644 (file)
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -30,6 +30,7 @@
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="module" module-name="java-psi-impl" exported="" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/java/java-impl/src/com/intellij/codeInsight/ChangeContextUtil.java b/java/java-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
index 857e19e0b51213de241c8a43a67dd2259126fce4..3ea92fcca59920dafde7d5f821018c4c2b98dcfd 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
@@ -27,8 +27,6 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-
 public class ChangeContextUtil {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.ChangeContextUtil");
 

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java
index cfd743bbd406184da644fe6d2585d75af5d3945c..aa860a5eb1e32452d1dc910810a6003d4c439569 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java
@@ -19,7 +19,6 @@ import com.intellij.codeInsight.daemon.QuickFixBundle;
 import static com.intellij.codeInsight.daemon.impl.quickfix.CreateClassKind.CLASS;
 import static com.intellij.codeInsight.daemon.impl.quickfix.CreateClassKind.INTERFACE;
 
-import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.ide.util.PsiClassListCellRenderer;
 import com.intellij.ide.util.PsiElementListCellRenderer;
 import com.intellij.openapi.application.ApplicationManager;
@@ -30,7 +29,6 @@ import com.intellij.openapi.ui.popup.PopupChooserBuilder;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtil;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;

diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java
index 5ba3f1ae8c245f273b55eb4690af315529370932..345f54af339b2cda92848fb82e5f3f5442fc44a7 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.codeInsight.editorActions;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.RawText;
@@ -27,7 +26,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.impl.source.tree.ElementType;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java
index 0d725bcf91ab8162b0bed80c7ba5eacb83b8d70e..8bae1c958ce7beec57ef6ecc34156aa9d29e8772 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java
@@ -27,7 +27,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.psi.*;
-import com.intellij.psi.util.ImportsUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;

diff --git a/java/java-impl/src/com/intellij/codeInspection/actions/ReplaceImplementsWithStaticImportAction.java b/java/java-impl/src/com/intellij/codeInspection/actions/ReplaceImplementsWithStaticImportAction.java
index 3b163eddb9c231caf6f54b1c81a07620226cc6a9..42c551061e2145d28080a27ce61ffef243a05999 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInspection/actions/ReplaceImplementsWithStaticImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInspection/actions/ReplaceImplementsWithStaticImportAction.java
@@ -28,7 +28,6 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
-import com.intellij.psi.impl.JavaPsiImplementationHelper;
 import com.intellij.psi.impl.source.javadoc.PsiDocMethodOrFieldRef;
 import com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl;
 import com.intellij.psi.search.GlobalSearchScope;

diff --git a/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java b/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java
index 9275c149ac0fc27f0c68b82df7fe742f718c4463..fb4cbacc291e74103c6a17073d80ceec2228723c 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java
+++ b/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java
@@ -21,10 +21,8 @@ import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.util.MethodSignature;
 import com.intellij.psi.util.MethodSignatureUtil;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;

diff --git a/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
index 034bf911e99dc1bbd9735f3aba74537e5f36fb05..6b5c2de9678194bd953515af110d24364f3d9da8 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
@@ -19,20 +19,15 @@ import com.intellij.codeInsight.daemon.JavaErrorMessages;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightMessageUtil;
 import com.intellij.codeInspection.BaseJavaLocalInspectionTool;
-import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
-import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.psi.*;
 import com.intellij.psi.infos.MethodCandidateInfo;
 import com.intellij.psi.util.MethodSignatureBackedByPsiMethod;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.refactoring.util.RefactoringUIUtil;
 import com.intellij.refactoring.util.RefactoringUtil;
-import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyUtil.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyUtil.java
index c7c90bbf1e9c92c851d233e4b5fdad12bb304d71..d52c22d93ec67b18f0df96e210eafa928fe26acc 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyUtil.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyUtil.java
@@ -18,9 +18,7 @@ package com.intellij.ide.hierarchy.method;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
-import com.intellij.psi.PsiSubstitutor;
 import com.intellij.psi.util.MethodSignatureUtil;
-import com.intellij.psi.util.MethodSignature;
 
 final class MethodHierarchyUtil {
   public static PsiMethod findBaseMethodInClass(final PsiMethod baseMethod, final PsiClass aClass, final boolean checkBases) {

diff --git a/java/java-impl/src/com/intellij/psi/filters/classes/ClassAssignableToFilter.java b/java/java-impl/src/com/intellij/psi/filters/classes/ClassAssignableToFilter.java
index 02a9aad3e3f41337f348db5b7e453e6c9aba852e..7b639807768757d1b83815aea215aa44753d2d50 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/filters/classes/ClassAssignableToFilter.java
+++ b/java/java-impl/src/com/intellij/psi/filters/classes/ClassAssignableToFilter.java
@@ -18,8 +18,6 @@ package com.intellij.psi.filters.classes;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiManager;
-import com.intellij.psi.util.PsiUtil;
-import com.intellij.psi.util.InheritanceUtil;
 
 /**
  * Created by IntelliJ IDEA.

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/DocCommentBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/DocCommentBlock.java
index cdd8460f7ee609fe6483299a78908e4b2b9ac67a..da5eb0eed933c89174c6c3f46f5f0d9b5916d3ba 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/formatter/java/DocCommentBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/DocCommentBlock.java
@@ -18,7 +18,6 @@ package com.intellij.psi.formatter.java;
 import com.intellij.formatting.*;
 import com.intellij.formatting.alignment.AlignmentStrategy;
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.formatter.FormatterUtil;
 import com.intellij.psi.impl.source.tree.ElementType;

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/ExtendsListBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/ExtendsListBlock.java
index 205180f6cc80343a8afdb4b994921e7b9f99ff5e..644871b30de96b72dbea5d4e730c7f12de45432c 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/formatter/java/ExtendsListBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/ExtendsListBlock.java
@@ -21,7 +21,6 @@ import com.intellij.formatting.Indent;
 import com.intellij.formatting.Wrap;
 import com.intellij.formatting.alignment.AlignmentStrategy;
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.formatter.FormatterUtil;
 import com.intellij.psi.impl.source.tree.ElementType;

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/LabeledJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/LabeledJavaBlock.java
index 316149a675f66ffee5ebfeebe4e9b8113c041de3..ef065c5fa1a20e83a4f60aec65142e27a753d915 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/formatter/java/LabeledJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/LabeledJavaBlock.java
@@ -19,7 +19,6 @@ import com.intellij.formatting.*;
 import com.intellij.formatting.alignment.AlignmentStrategy;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.fileTypes.StdFileTypes;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.formatter.FormatterUtil;
 import com.intellij.psi.impl.source.tree.ElementType;

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
index 6b30060e5b1b1c37abe9345bfbf6025620392141..ea7b4a4162485748e79885aecd383a15b66db6fa 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java
@@ -20,7 +20,6 @@ import com.intellij.formatting.alignment.AlignmentStrategy;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.formatter.FormatterUtil;
 import com.intellij.psi.impl.source.tree.ElementType;

diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightClassReferenceExpression.java b/java/java-impl/src/com/intellij/psi/impl/light/LightClassReferenceExpression.java
index 44ce323429820f2780d8e51fc3e23323cf1a53ba..4c36f7217a96c8b93a2ee66017c8a8da468485ae 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/light/LightClassReferenceExpression.java
+++ b/java/java-impl/src/com/intellij/psi/impl/light/LightClassReferenceExpression.java
@@ -15,9 +15,7 @@
  */
 package com.intellij.psi.impl.light;
 
-import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java b/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java
index c1a54bb648c5aa7e1e24def937287350b22c1a99..a213cfbb0981d5d201cc051367364362a02d42bb 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java
+++ b/java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java
@@ -26,7 +26,6 @@ import com.intellij.psi.impl.PsiClassImplUtil;
 import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.impl.PsiSuperMethodImplUtil;
 import com.intellij.psi.javadoc.PsiDocComment;
-import com.intellij.psi.presentation.java.JavaPresentationUtil;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.util.MethodSignature;
 import com.intellij.psi.util.MethodSignatureBackedByPsiMethod;

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/FormatCommentsProcessor.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/FormatCommentsProcessor.java
index 4a4d59467103f00f3c933d66d9a202338eb2d538..56229247d3c6040210b4de770ee828490c8eb737 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/FormatCommentsProcessor.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/FormatCommentsProcessor.java
@@ -19,11 +19,9 @@ import com.intellij.lang.ASTNode;
 import com.intellij.lang.StdLanguages;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiDocCommentOwner;
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.impl.java.stubs.JavaStubElementType;
 import com.intellij.psi.impl.source.SourceTreeToPsiMap;
 import com.intellij.psi.impl.source.codeStyle.javadoc.CommentFormatter;
 import com.intellij.psi.javadoc.PsiDocComment;

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
index d9a8852a52fdd9d705bb639bae7d9aaf7ecae6c1..d538f8f5854b818e369c81e15cb21f2999ef1409 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
@@ -19,12 +19,10 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.ui.TypeSelectorManagerImpl;

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
index b3cd16605fe91c234d6d40019f47172198f27cdb..f3c5618cca7343d34f2d7e616aedca86772f020b 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceFieldPopup.java
@@ -19,12 +19,10 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiExpressionTrimRenderer;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.ui.TypeSelectorManagerImpl;

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/MergeMethodArguments.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/MergeMethodArguments.java
index 992bff67c21e1187a5893dfd3a306d963d7d0b70..5d9053c7e760dd3b51e2c55029a9dd99464eb847 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/MergeMethodArguments.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/MergeMethodArguments.java
@@ -22,8 +22,6 @@ import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.impl.source.PsiImmediateClassType;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.searches.ReferencesSearch;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.changeSignature.ChangeSignatureProcessor;
 import com.intellij.refactoring.changeSignature.ParameterInfoImpl;

diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
index 07d3b73ac64c20e9bc57e6fe6213e5e8fcf10fd4..7d9f85fd331fe776f8e5874d748aa53a1b9d63c4 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
@@ -27,7 +27,6 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.JavaCodeStyleManager;
-import com.intellij.psi.impl.source.codeStyle.JavaCodeStyleManagerImpl;
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
 import com.intellij.psi.search.searches.ReferencesSearch;

diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
index 01cb28f171cafaa4752fe9bf327ea357b0aff275..e2abaee1a57e0c5c7523458a26ed4bfa2cb0073f 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.refactoring.typeMigration;
 
-import com.intellij.lang.StdLanguages;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;

diff --git a/java/java-psi-api/java-psi-api.iml b/java/java-psi-api/java-psi-api.iml
new file mode 100644 (file)
index 0000000..caff682
--- /dev/null
+++ b/java/java-psi-api/java-psi-api.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="core-api" exported="" />
+  </component>
+</module>
+

diff --git a/java/openapi/src/com/intellij/codeInsight/TestFrameworks.java b/java/java-psi-api/src/com/intellij/codeInsight/TestFrameworks.java
similarity index 100%
rename from java/openapi/src/com/intellij/codeInsight/TestFrameworks.java
rename to java/java-psi-api/src/com/intellij/codeInsight/TestFrameworks.java

diff --git a/java/openapi/src/com/intellij/codeInsight/runner/JavaMainMethodProvider.java b/java/java-psi-api/src/com/intellij/codeInsight/runner/JavaMainMethodProvider.java
similarity index 100%
rename from java/openapi/src/com/intellij/codeInsight/runner/JavaMainMethodProvider.java
rename to java/java-psi-api/src/com/intellij/codeInsight/runner/JavaMainMethodProvider.java

diff --git a/java/openapi/src/com/intellij/lang/java/JavaLanguage.java b/java/java-psi-api/src/com/intellij/lang/java/JavaLanguage.java
similarity index 100%
rename from java/openapi/src/com/intellij/lang/java/JavaLanguage.java
rename to java/java-psi-api/src/com/intellij/lang/java/JavaLanguage.java

diff --git a/java/openapi/src/com/intellij/lexer/JavaDocLexer.java b/java/java-psi-api/src/com/intellij/lexer/JavaDocLexer.java
similarity index 100%
rename from java/openapi/src/com/intellij/lexer/JavaDocLexer.java
rename to java/java-psi-api/src/com/intellij/lexer/JavaDocLexer.java

diff --git a/java/openapi/src/com/intellij/lexer/JavaDocTokenTypes.java b/java/java-psi-api/src/com/intellij/lexer/JavaDocTokenTypes.java
similarity index 100%
rename from java/openapi/src/com/intellij/lexer/JavaDocTokenTypes.java
rename to java/java-psi-api/src/com/intellij/lexer/JavaDocTokenTypes.java

diff --git a/java/openapi/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java b/java/java-psi-api/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java
similarity index 100%
rename from java/openapi/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java
rename to java/java-psi-api/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java

diff --git a/java/openapi/src/com/intellij/openapi/roots/PackageIndex.java b/java/java-psi-api/src/com/intellij/openapi/roots/PackageIndex.java
similarity index 100%
rename from java/openapi/src/com/intellij/openapi/roots/PackageIndex.java
rename to java/java-psi-api/src/com/intellij/openapi/roots/PackageIndex.java

diff --git a/java/openapi/src/com/intellij/pom/java/LanguageLevel.java b/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
similarity index 100%
rename from java/openapi/src/com/intellij/pom/java/LanguageLevel.java
rename to java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java

diff --git a/java/openapi/src/com/intellij/psi/CommonClassNames.java b/java/java-psi-api/src/com/intellij/psi/CommonClassNames.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/CommonClassNames.java
rename to java/java-psi-api/src/com/intellij/psi/CommonClassNames.java

diff --git a/java/openapi/src/com/intellij/psi/EmptySubstitutor.java b/java/java-psi-api/src/com/intellij/psi/EmptySubstitutor.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/EmptySubstitutor.java
rename to java/java-psi-api/src/com/intellij/psi/EmptySubstitutor.java

diff --git a/java/openapi/src/com/intellij/psi/GenericsUtil.java b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/GenericsUtil.java
rename to java/java-psi-api/src/com/intellij/psi/GenericsUtil.java

diff --git a/java/openapi/src/com/intellij/psi/HierarchicalMethodSignature.java b/java/java-psi-api/src/com/intellij/psi/HierarchicalMethodSignature.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/HierarchicalMethodSignature.java
rename to java/java-psi-api/src/com/intellij/psi/HierarchicalMethodSignature.java

diff --git a/java/openapi/src/com/intellij/psi/ImplicitVariable.java b/java/java-psi-api/src/com/intellij/psi/ImplicitVariable.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/ImplicitVariable.java
rename to java/java-psi-api/src/com/intellij/psi/ImplicitVariable.java

diff --git a/java/openapi/src/com/intellij/psi/JVMElementFactories.java b/java/java-psi-api/src/com/intellij/psi/JVMElementFactories.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JVMElementFactories.java
rename to java/java-psi-api/src/com/intellij/psi/JVMElementFactories.java

diff --git a/java/openapi/src/com/intellij/psi/JVMElementFactory.java b/java/java-psi-api/src/com/intellij/psi/JVMElementFactory.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JVMElementFactory.java
rename to java/java-psi-api/src/com/intellij/psi/JVMElementFactory.java

diff --git a/java/openapi/src/com/intellij/psi/JVMElementFactoryProvider.java b/java/java-psi-api/src/com/intellij/psi/JVMElementFactoryProvider.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JVMElementFactoryProvider.java
rename to java/java-psi-api/src/com/intellij/psi/JVMElementFactoryProvider.java

diff --git a/java/openapi/src/com/intellij/psi/JavaCodeFragment.java b/java/java-psi-api/src/com/intellij/psi/JavaCodeFragment.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaCodeFragment.java
rename to java/java-psi-api/src/com/intellij/psi/JavaCodeFragment.java

diff --git a/java/openapi/src/com/intellij/psi/JavaDirectoryService.java b/java/java-psi-api/src/com/intellij/psi/JavaDirectoryService.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaDirectoryService.java
rename to java/java-psi-api/src/com/intellij/psi/JavaDirectoryService.java

diff --git a/java/openapi/src/com/intellij/psi/JavaDocTokenType.java b/java/java-psi-api/src/com/intellij/psi/JavaDocTokenType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaDocTokenType.java
rename to java/java-psi-api/src/com/intellij/psi/JavaDocTokenType.java

diff --git a/java/openapi/src/com/intellij/psi/JavaElementVisitor.java b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaElementVisitor.java
rename to java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java

diff --git a/java/openapi/src/com/intellij/psi/JavaPsiFacade.java b/java/java-psi-api/src/com/intellij/psi/JavaPsiFacade.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaPsiFacade.java
rename to java/java-psi-api/src/com/intellij/psi/JavaPsiFacade.java

diff --git a/java/openapi/src/com/intellij/psi/JavaRecursiveElementVisitor.java b/java/java-psi-api/src/com/intellij/psi/JavaRecursiveElementVisitor.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaRecursiveElementVisitor.java
rename to java/java-psi-api/src/com/intellij/psi/JavaRecursiveElementVisitor.java

diff --git a/java/openapi/src/com/intellij/psi/JavaRecursiveElementWalkingVisitor.java b/java/java-psi-api/src/com/intellij/psi/JavaRecursiveElementWalkingVisitor.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaRecursiveElementWalkingVisitor.java
rename to java/java-psi-api/src/com/intellij/psi/JavaRecursiveElementWalkingVisitor.java

diff --git a/java/openapi/src/com/intellij/psi/JavaResolveResult.java b/java/java-psi-api/src/com/intellij/psi/JavaResolveResult.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaResolveResult.java
rename to java/java-psi-api/src/com/intellij/psi/JavaResolveResult.java

diff --git a/java/openapi/src/com/intellij/psi/JavaTokenType.java b/java/java-psi-api/src/com/intellij/psi/JavaTokenType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/JavaTokenType.java
rename to java/java-psi-api/src/com/intellij/psi/JavaTokenType.java

diff --git a/java/openapi/src/com/intellij/psi/Modifier.java b/java/java-psi-api/src/com/intellij/psi/Modifier.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/Modifier.java
rename to java/java-psi-api/src/com/intellij/psi/Modifier.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAnnotation.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAnnotation.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAnnotationMemberValue.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotationMemberValue.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAnnotationMemberValue.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAnnotationMemberValue.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAnnotationMethod.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotationMethod.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAnnotationMethod.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAnnotationMethod.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAnnotationOwner.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotationOwner.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAnnotationOwner.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAnnotationOwner.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAnnotationParameterList.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotationParameterList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAnnotationParameterList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAnnotationParameterList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAnnotationSupport.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotationSupport.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAnnotationSupport.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAnnotationSupport.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAnonymousClass.java b/java/java-psi-api/src/com/intellij/psi/PsiAnonymousClass.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAnonymousClass.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAnonymousClass.java

diff --git a/java/openapi/src/com/intellij/psi/PsiArrayAccessExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiArrayAccessExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiArrayAccessExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiArrayAccessExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiArrayInitializerExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiArrayInitializerExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiArrayInitializerExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiArrayInitializerExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiArrayInitializerMemberValue.java b/java/java-psi-api/src/com/intellij/psi/PsiArrayInitializerMemberValue.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiArrayInitializerMemberValue.java
rename to java/java-psi-api/src/com/intellij/psi/PsiArrayInitializerMemberValue.java

diff --git a/java/openapi/src/com/intellij/psi/PsiArrayType.java b/java/java-psi-api/src/com/intellij/psi/PsiArrayType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiArrayType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiArrayType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAssertStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiAssertStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAssertStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAssertStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiAssignmentExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiAssignmentExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiAssignmentExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiAssignmentExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiBinaryExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiBinaryExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiBinaryExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiBinaryExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiBlockStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiBlockStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiBlockStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiBlockStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiBreakStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiBreakStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiBreakStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiBreakStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiCall.java b/java/java-psi-api/src/com/intellij/psi/PsiCall.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiCall.java
rename to java/java-psi-api/src/com/intellij/psi/PsiCall.java

diff --git a/java/openapi/src/com/intellij/psi/PsiCallExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiCallExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiCallExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiCallExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiCapturedWildcardType.java b/java/java-psi-api/src/com/intellij/psi/PsiCapturedWildcardType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiCapturedWildcardType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiCapturedWildcardType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiCatchSection.java b/java/java-psi-api/src/com/intellij/psi/PsiCatchSection.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiCatchSection.java
rename to java/java-psi-api/src/com/intellij/psi/PsiCatchSection.java

diff --git a/java/openapi/src/com/intellij/psi/PsiClass.java b/java/java-psi-api/src/com/intellij/psi/PsiClass.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiClass.java
rename to java/java-psi-api/src/com/intellij/psi/PsiClass.java

diff --git a/java/openapi/src/com/intellij/psi/PsiClassInitializer.java b/java/java-psi-api/src/com/intellij/psi/PsiClassInitializer.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiClassInitializer.java
rename to java/java-psi-api/src/com/intellij/psi/PsiClassInitializer.java

diff --git a/java/openapi/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiClassObjectAccessExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiClassObjectAccessExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiClassObjectAccessExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiClassObjectAccessExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiClassOwner.java b/java/java-psi-api/src/com/intellij/psi/PsiClassOwner.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiClassOwner.java
rename to java/java-psi-api/src/com/intellij/psi/PsiClassOwner.java

diff --git a/java/openapi/src/com/intellij/psi/PsiClassOwnerEx.java b/java/java-psi-api/src/com/intellij/psi/PsiClassOwnerEx.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiClassOwnerEx.java
rename to java/java-psi-api/src/com/intellij/psi/PsiClassOwnerEx.java

diff --git a/java/openapi/src/com/intellij/psi/PsiClassType.java b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiClassType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiClassType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiCodeBlock.java b/java/java-psi-api/src/com/intellij/psi/PsiCodeBlock.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiCodeBlock.java
rename to java/java-psi-api/src/com/intellij/psi/PsiCodeBlock.java

diff --git a/java/openapi/src/com/intellij/psi/PsiConditionalExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiConditionalExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiConditionalExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiConditionalExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiConstantEvaluationHelper.java b/java/java-psi-api/src/com/intellij/psi/PsiConstantEvaluationHelper.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiConstantEvaluationHelper.java
rename to java/java-psi-api/src/com/intellij/psi/PsiConstantEvaluationHelper.java

diff --git a/java/openapi/src/com/intellij/psi/PsiConstructorCall.java b/java/java-psi-api/src/com/intellij/psi/PsiConstructorCall.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiConstructorCall.java
rename to java/java-psi-api/src/com/intellij/psi/PsiConstructorCall.java

diff --git a/java/openapi/src/com/intellij/psi/PsiContinueStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiContinueStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiContinueStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiContinueStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiDeclarationStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiDeclarationStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiDeclarationStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiDeclarationStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiDiamondType.java b/java/java-psi-api/src/com/intellij/psi/PsiDiamondType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiDiamondType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiDiamondType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiDisjunctionType.java b/java/java-psi-api/src/com/intellij/psi/PsiDisjunctionType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiDisjunctionType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiDisjunctionType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiDoWhileStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiDoWhileStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiDoWhileStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiDoWhileStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiDocCommentOwner.java b/java/java-psi-api/src/com/intellij/psi/PsiDocCommentOwner.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiDocCommentOwner.java
rename to java/java-psi-api/src/com/intellij/psi/PsiDocCommentOwner.java

diff --git a/java/openapi/src/com/intellij/psi/PsiElementFactory.java b/java/java-psi-api/src/com/intellij/psi/PsiElementFactory.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiElementFactory.java
rename to java/java-psi-api/src/com/intellij/psi/PsiElementFactory.java

diff --git a/java/openapi/src/com/intellij/psi/PsiElementFinder.java b/java/java-psi-api/src/com/intellij/psi/PsiElementFinder.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiElementFinder.java
rename to java/java-psi-api/src/com/intellij/psi/PsiElementFinder.java

diff --git a/java/openapi/src/com/intellij/psi/PsiEllipsisType.java b/java/java-psi-api/src/com/intellij/psi/PsiEllipsisType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiEllipsisType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiEllipsisType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiEmptyStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiEmptyStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiEmptyStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiEmptyStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiEnumConstant.java b/java/java-psi-api/src/com/intellij/psi/PsiEnumConstant.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiEnumConstant.java
rename to java/java-psi-api/src/com/intellij/psi/PsiEnumConstant.java

diff --git a/java/openapi/src/com/intellij/psi/PsiEnumConstantInitializer.java b/java/java-psi-api/src/com/intellij/psi/PsiEnumConstantInitializer.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiEnumConstantInitializer.java
rename to java/java-psi-api/src/com/intellij/psi/PsiEnumConstantInitializer.java

diff --git a/java/openapi/src/com/intellij/psi/PsiExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiExpressionCodeFragment.java b/java/java-psi-api/src/com/intellij/psi/PsiExpressionCodeFragment.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiExpressionCodeFragment.java
rename to java/java-psi-api/src/com/intellij/psi/PsiExpressionCodeFragment.java

diff --git a/java/openapi/src/com/intellij/psi/PsiExpressionList.java b/java/java-psi-api/src/com/intellij/psi/PsiExpressionList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiExpressionList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiExpressionList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiExpressionListStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiExpressionListStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiExpressionListStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiExpressionListStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiExpressionStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiExpressionStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiExpressionStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiExpressionStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiField.java b/java/java-psi-api/src/com/intellij/psi/PsiField.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiField.java
rename to java/java-psi-api/src/com/intellij/psi/PsiField.java

diff --git a/java/openapi/src/com/intellij/psi/PsiForStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiForStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiForStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiForStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiForeachStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiForeachStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiForeachStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiForeachStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiIdentifier.java b/java/java-psi-api/src/com/intellij/psi/PsiIdentifier.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiIdentifier.java
rename to java/java-psi-api/src/com/intellij/psi/PsiIdentifier.java

diff --git a/java/openapi/src/com/intellij/psi/PsiIfStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiIfStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiIfStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiIfStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiImportHolder.java b/java/java-psi-api/src/com/intellij/psi/PsiImportHolder.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiImportHolder.java
rename to java/java-psi-api/src/com/intellij/psi/PsiImportHolder.java

diff --git a/java/openapi/src/com/intellij/psi/PsiImportList.java b/java/java-psi-api/src/com/intellij/psi/PsiImportList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiImportList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiImportList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiImportStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiImportStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiImportStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiImportStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiImportStatementBase.java b/java/java-psi-api/src/com/intellij/psi/PsiImportStatementBase.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiImportStatementBase.java
rename to java/java-psi-api/src/com/intellij/psi/PsiImportStatementBase.java

diff --git a/java/openapi/src/com/intellij/psi/PsiImportStaticReferenceElement.java b/java/java-psi-api/src/com/intellij/psi/PsiImportStaticReferenceElement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiImportStaticReferenceElement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiImportStaticReferenceElement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiImportStaticStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiImportStaticStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiImportStaticStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiImportStaticStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiInstanceOfExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiInstanceOfExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiInstanceOfExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiInstanceOfExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiIntersectionType.java b/java/java-psi-api/src/com/intellij/psi/PsiIntersectionType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiIntersectionType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiIntersectionType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiJavaCodeReferenceCodeFragment.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaCodeReferenceCodeFragment.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiJavaCodeReferenceCodeFragment.java
rename to java/java-psi-api/src/com/intellij/psi/PsiJavaCodeReferenceCodeFragment.java

diff --git a/java/openapi/src/com/intellij/psi/PsiJavaCodeReferenceElement.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaCodeReferenceElement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiJavaCodeReferenceElement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiJavaCodeReferenceElement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiJavaFile.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaFile.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiJavaFile.java
rename to java/java-psi-api/src/com/intellij/psi/PsiJavaFile.java

diff --git a/java/openapi/src/com/intellij/psi/PsiJavaParserFacade.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaParserFacade.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiJavaParserFacade.java
rename to java/java-psi-api/src/com/intellij/psi/PsiJavaParserFacade.java

diff --git a/java/openapi/src/com/intellij/psi/PsiJavaReference.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaReference.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiJavaReference.java
rename to java/java-psi-api/src/com/intellij/psi/PsiJavaReference.java

diff --git a/java/openapi/src/com/intellij/psi/PsiJavaToken.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaToken.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiJavaToken.java
rename to java/java-psi-api/src/com/intellij/psi/PsiJavaToken.java

diff --git a/java/openapi/src/com/intellij/psi/PsiKeyword.java b/java/java-psi-api/src/com/intellij/psi/PsiKeyword.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiKeyword.java
rename to java/java-psi-api/src/com/intellij/psi/PsiKeyword.java

diff --git a/java/openapi/src/com/intellij/psi/PsiLabeledStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiLabeledStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiLabeledStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiLabeledStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiLiteral.java b/java/java-psi-api/src/com/intellij/psi/PsiLiteral.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiLiteral.java
rename to java/java-psi-api/src/com/intellij/psi/PsiLiteral.java

diff --git a/java/openapi/src/com/intellij/psi/PsiLiteralExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiLiteralExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiLiteralExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiLiteralExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiLocalVariable.java b/java/java-psi-api/src/com/intellij/psi/PsiLocalVariable.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiLocalVariable.java
rename to java/java-psi-api/src/com/intellij/psi/PsiLocalVariable.java

diff --git a/java/openapi/src/com/intellij/psi/PsiLoopStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiLoopStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiLoopStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiLoopStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiMember.java b/java/java-psi-api/src/com/intellij/psi/PsiMember.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiMember.java
rename to java/java-psi-api/src/com/intellij/psi/PsiMember.java

diff --git a/java/openapi/src/com/intellij/psi/PsiMethod.java b/java/java-psi-api/src/com/intellij/psi/PsiMethod.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiMethod.java
rename to java/java-psi-api/src/com/intellij/psi/PsiMethod.java

diff --git a/java/openapi/src/com/intellij/psi/PsiMethodCallExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodCallExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiMethodCallExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiMethodCallExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiMethodReceiver.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiMethodReceiver.java
rename to java/java-psi-api/src/com/intellij/psi/PsiMethodReceiver.java

diff --git a/java/openapi/src/com/intellij/psi/PsiMigration.java b/java/java-psi-api/src/com/intellij/psi/PsiMigration.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiMigration.java
rename to java/java-psi-api/src/com/intellij/psi/PsiMigration.java

diff --git a/java/openapi/src/com/intellij/psi/PsiModifiableCodeBlock.java b/java/java-psi-api/src/com/intellij/psi/PsiModifiableCodeBlock.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiModifiableCodeBlock.java
rename to java/java-psi-api/src/com/intellij/psi/PsiModifiableCodeBlock.java

diff --git a/java/openapi/src/com/intellij/psi/PsiModifier.java b/java/java-psi-api/src/com/intellij/psi/PsiModifier.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiModifier.java
rename to java/java-psi-api/src/com/intellij/psi/PsiModifier.java

diff --git a/java/openapi/src/com/intellij/psi/PsiModifierList.java b/java/java-psi-api/src/com/intellij/psi/PsiModifierList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiModifierList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiModifierList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiModifierListOwner.java b/java/java-psi-api/src/com/intellij/psi/PsiModifierListOwner.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiModifierListOwner.java
rename to java/java-psi-api/src/com/intellij/psi/PsiModifierListOwner.java

diff --git a/java/openapi/src/com/intellij/psi/PsiNameHelper.java b/java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiNameHelper.java
rename to java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java

diff --git a/java/openapi/src/com/intellij/psi/PsiNameValuePair.java b/java/java-psi-api/src/com/intellij/psi/PsiNameValuePair.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiNameValuePair.java
rename to java/java-psi-api/src/com/intellij/psi/PsiNameValuePair.java

diff --git a/java/openapi/src/com/intellij/psi/PsiNewExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiNewExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiNewExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiNewExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiPackage.java b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiPackage.java
rename to java/java-psi-api/src/com/intellij/psi/PsiPackage.java

diff --git a/java/openapi/src/com/intellij/psi/PsiPackageStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiPackageStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiPackageStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiPackageStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiParameter.java b/java/java-psi-api/src/com/intellij/psi/PsiParameter.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiParameter.java
rename to java/java-psi-api/src/com/intellij/psi/PsiParameter.java

diff --git a/java/openapi/src/com/intellij/psi/PsiParameterList.java b/java/java-psi-api/src/com/intellij/psi/PsiParameterList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiParameterList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiParameterList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiParenthesizedExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiParenthesizedExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiParenthesizedExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiParenthesizedExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiPolyadicExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiPolyadicExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiPolyadicExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiPolyadicExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiPostfixExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiPostfixExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiPostfixExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiPostfixExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiPrefixExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiPrefixExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiPrefixExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiPrefixExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiPrimitiveType.java b/java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiPrimitiveType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiPrimitiveType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiQualifiedExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiQualifiedExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiQualifiedExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiQualifiedExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiReferenceExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiReferenceExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiReferenceExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiReferenceExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiReferenceList.java b/java/java-psi-api/src/com/intellij/psi/PsiReferenceList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiReferenceList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiReferenceList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiReferenceParameterList.java b/java/java-psi-api/src/com/intellij/psi/PsiReferenceParameterList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiReferenceParameterList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiReferenceParameterList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiResolveHelper.java b/java/java-psi-api/src/com/intellij/psi/PsiResolveHelper.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiResolveHelper.java
rename to java/java-psi-api/src/com/intellij/psi/PsiResolveHelper.java

diff --git a/java/openapi/src/com/intellij/psi/PsiResourceList.java b/java/java-psi-api/src/com/intellij/psi/PsiResourceList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiResourceList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiResourceList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiResourceVariable.java b/java/java-psi-api/src/com/intellij/psi/PsiResourceVariable.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiResourceVariable.java
rename to java/java-psi-api/src/com/intellij/psi/PsiResourceVariable.java

diff --git a/java/openapi/src/com/intellij/psi/PsiReturnStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiReturnStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiReturnStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiReturnStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiSubstitutor.java b/java/java-psi-api/src/com/intellij/psi/PsiSubstitutor.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiSubstitutor.java
rename to java/java-psi-api/src/com/intellij/psi/PsiSubstitutor.java

diff --git a/java/openapi/src/com/intellij/psi/PsiSuperExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiSuperExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiSuperExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiSuperExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiSwitchLabelStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiSwitchLabelStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiSwitchLabelStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiSwitchLabelStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiSwitchStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiSwitchStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiSwitchStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiSwitchStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiSynchronizedStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiSynchronizedStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiSynchronizedStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiSynchronizedStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiSyntheticClass.java b/java/java-psi-api/src/com/intellij/psi/PsiSyntheticClass.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiSyntheticClass.java
rename to java/java-psi-api/src/com/intellij/psi/PsiSyntheticClass.java

diff --git a/java/openapi/src/com/intellij/psi/PsiThisExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiThisExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiThisExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiThisExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiThrowStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiThrowStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiThrowStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiThrowStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiTryStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiTryStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiTryStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiTryStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiType.java b/java/java-psi-api/src/com/intellij/psi/PsiType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiType.java

diff --git a/java/openapi/src/com/intellij/psi/PsiTypeCastExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeCastExpression.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiTypeCastExpression.java
rename to java/java-psi-api/src/com/intellij/psi/PsiTypeCastExpression.java

diff --git a/java/openapi/src/com/intellij/psi/PsiTypeCodeFragment.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeCodeFragment.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiTypeCodeFragment.java
rename to java/java-psi-api/src/com/intellij/psi/PsiTypeCodeFragment.java

diff --git a/java/openapi/src/com/intellij/psi/PsiTypeElement.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiTypeElement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiTypeParameter.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeParameter.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiTypeParameter.java
rename to java/java-psi-api/src/com/intellij/psi/PsiTypeParameter.java

diff --git a/java/openapi/src/com/intellij/psi/PsiTypeParameterList.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeParameterList.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiTypeParameterList.java
rename to java/java-psi-api/src/com/intellij/psi/PsiTypeParameterList.java

diff --git a/java/openapi/src/com/intellij/psi/PsiTypeParameterListOwner.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeParameterListOwner.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiTypeParameterListOwner.java
rename to java/java-psi-api/src/com/intellij/psi/PsiTypeParameterListOwner.java

diff --git a/java/openapi/src/com/intellij/psi/PsiTypeVisitor.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiTypeVisitor.java
rename to java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java

diff --git a/java/openapi/src/com/intellij/psi/PsiVariable.java b/java/java-psi-api/src/com/intellij/psi/PsiVariable.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiVariable.java
rename to java/java-psi-api/src/com/intellij/psi/PsiVariable.java

diff --git a/java/openapi/src/com/intellij/psi/PsiWhileStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiWhileStatement.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiWhileStatement.java
rename to java/java-psi-api/src/com/intellij/psi/PsiWhileStatement.java

diff --git a/java/openapi/src/com/intellij/psi/PsiWildcardType.java b/java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/PsiWildcardType.java
rename to java/java-psi-api/src/com/intellij/psi/PsiWildcardType.java

diff --git a/java/openapi/src/com/intellij/psi/ServerPageFile.java b/java/java-psi-api/src/com/intellij/psi/ServerPageFile.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/ServerPageFile.java
rename to java/java-psi-api/src/com/intellij/psi/ServerPageFile.java

diff --git a/java/openapi/src/com/intellij/psi/augment/PsiAugmentProvider.java b/java/java-psi-api/src/com/intellij/psi/augment/PsiAugmentProvider.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/augment/PsiAugmentProvider.java
rename to java/java-psi-api/src/com/intellij/psi/augment/PsiAugmentProvider.java

diff --git a/java/openapi/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java b/java/java-psi-api/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java
rename to java/java-psi-api/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java

diff --git a/java/openapi/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java b/java/java-psi-api/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java
rename to java/java-psi-api/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java

diff --git a/java/openapi/src/com/intellij/psi/codeStyle/VariableKind.java b/java/java-psi-api/src/com/intellij/psi/codeStyle/VariableKind.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/codeStyle/VariableKind.java
rename to java/java-psi-api/src/com/intellij/psi/codeStyle/VariableKind.java

diff --git a/java/openapi/src/com/intellij/psi/infos/CandidateInfo.java b/java/java-psi-api/src/com/intellij/psi/infos/CandidateInfo.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/infos/CandidateInfo.java
rename to java/java-psi-api/src/com/intellij/psi/infos/CandidateInfo.java

diff --git a/java/openapi/src/com/intellij/psi/infos/ClassCandidateInfo.java b/java/java-psi-api/src/com/intellij/psi/infos/ClassCandidateInfo.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/infos/ClassCandidateInfo.java
rename to java/java-psi-api/src/com/intellij/psi/infos/ClassCandidateInfo.java

diff --git a/java/openapi/src/com/intellij/psi/infos/MethodCandidateInfo.java b/java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/infos/MethodCandidateInfo.java
rename to java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java

diff --git a/java/openapi/src/com/intellij/psi/javadoc/PsiDocComment.java b/java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocComment.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/javadoc/PsiDocComment.java
rename to java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocComment.java

diff --git a/java/openapi/src/com/intellij/psi/javadoc/PsiDocTag.java b/java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocTag.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/javadoc/PsiDocTag.java
rename to java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocTag.java

diff --git a/java/openapi/src/com/intellij/psi/javadoc/PsiDocTagValue.java b/java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocTagValue.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/javadoc/PsiDocTagValue.java
rename to java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocTagValue.java

diff --git a/java/openapi/src/com/intellij/psi/javadoc/PsiDocToken.java b/java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocToken.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/javadoc/PsiDocToken.java
rename to java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocToken.java

diff --git a/java/openapi/src/com/intellij/psi/javadoc/PsiInlineDocTag.java b/java/java-psi-api/src/com/intellij/psi/javadoc/PsiInlineDocTag.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/javadoc/PsiInlineDocTag.java
rename to java/java-psi-api/src/com/intellij/psi/javadoc/PsiInlineDocTag.java

diff --git a/java/openapi/src/com/intellij/psi/scope/JavaScopeProcessorEvent.java b/java/java-psi-api/src/com/intellij/psi/scope/JavaScopeProcessorEvent.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/scope/JavaScopeProcessorEvent.java
rename to java/java-psi-api/src/com/intellij/psi/scope/JavaScopeProcessorEvent.java

diff --git a/java/openapi/src/com/intellij/psi/search/PackageScope.java b/java/java-psi-api/src/com/intellij/psi/search/PackageScope.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/search/PackageScope.java
rename to java/java-psi-api/src/com/intellij/psi/search/PackageScope.java

diff --git a/java/openapi/src/com/intellij/psi/search/searches/DeepestSuperMethodsSearch.java b/java/java-psi-api/src/com/intellij/psi/search/searches/DeepestSuperMethodsSearch.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/search/searches/DeepestSuperMethodsSearch.java
rename to java/java-psi-api/src/com/intellij/psi/search/searches/DeepestSuperMethodsSearch.java

diff --git a/java/openapi/src/com/intellij/psi/search/searches/SuperMethodsSearch.java b/java/java-psi-api/src/com/intellij/psi/search/searches/SuperMethodsSearch.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/search/searches/SuperMethodsSearch.java
rename to java/java-psi-api/src/com/intellij/psi/search/searches/SuperMethodsSearch.java

diff --git a/java/openapi/src/com/intellij/psi/stubs/PsiClassHolderFileStub.java b/java/java-psi-api/src/com/intellij/psi/stubs/PsiClassHolderFileStub.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/stubs/PsiClassHolderFileStub.java
rename to java/java-psi-api/src/com/intellij/psi/stubs/PsiClassHolderFileStub.java

diff --git a/java/openapi/src/com/intellij/psi/tree/java/IJavaDocElementType.java b/java/java-psi-api/src/com/intellij/psi/tree/java/IJavaDocElementType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/tree/java/IJavaDocElementType.java
rename to java/java-psi-api/src/com/intellij/psi/tree/java/IJavaDocElementType.java

diff --git a/java/openapi/src/com/intellij/psi/tree/java/IJavaElementType.java b/java/java-psi-api/src/com/intellij/psi/tree/java/IJavaElementType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/tree/java/IJavaElementType.java
rename to java/java-psi-api/src/com/intellij/psi/tree/java/IJavaElementType.java

diff --git a/java/openapi/src/com/intellij/psi/tree/java/IKeywordElementType.java b/java/java-psi-api/src/com/intellij/psi/tree/java/IKeywordElementType.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/tree/java/IKeywordElementType.java
rename to java/java-psi-api/src/com/intellij/psi/tree/java/IKeywordElementType.java

diff --git a/java/openapi/src/com/intellij/psi/util/ConstantEvaluationOverflowException.java b/java/java-psi-api/src/com/intellij/psi/util/ConstantEvaluationOverflowException.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/ConstantEvaluationOverflowException.java
rename to java/java-psi-api/src/com/intellij/psi/util/ConstantEvaluationOverflowException.java

diff --git a/java/openapi/src/com/intellij/psi/util/ConstantExpressionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/ConstantExpressionUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/ConstantExpressionUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/ConstantExpressionUtil.java

diff --git a/java/openapi/src/com/intellij/psi/util/InheritanceUtil.java b/java/java-psi-api/src/com/intellij/psi/util/InheritanceUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/InheritanceUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/InheritanceUtil.java

diff --git a/java/openapi/src/com/intellij/psi/util/IsConstantExpressionVisitor.java b/java/java-psi-api/src/com/intellij/psi/util/IsConstantExpressionVisitor.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/IsConstantExpressionVisitor.java
rename to java/java-psi-api/src/com/intellij/psi/util/IsConstantExpressionVisitor.java

diff --git a/java/openapi/src/com/intellij/psi/util/MethodSignature.java b/java/java-psi-api/src/com/intellij/psi/util/MethodSignature.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/MethodSignature.java
rename to java/java-psi-api/src/com/intellij/psi/util/MethodSignature.java

diff --git a/java/openapi/src/com/intellij/psi/util/MethodSignatureBackedByPsiMethod.java b/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureBackedByPsiMethod.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/MethodSignatureBackedByPsiMethod.java
rename to java/java-psi-api/src/com/intellij/psi/util/MethodSignatureBackedByPsiMethod.java

diff --git a/java/openapi/src/com/intellij/psi/util/MethodSignatureBase.java b/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureBase.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/MethodSignatureBase.java
rename to java/java-psi-api/src/com/intellij/psi/util/MethodSignatureBase.java

diff --git a/java/openapi/src/com/intellij/psi/util/MethodSignatureHandMade.java b/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureHandMade.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/MethodSignatureHandMade.java
rename to java/java-psi-api/src/com/intellij/psi/util/MethodSignatureHandMade.java

diff --git a/java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java b/java/java-psi-api/src/com/intellij/psi/util/MethodSignatureUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/MethodSignatureUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/MethodSignatureUtil.java

diff --git a/java/openapi/src/com/intellij/psi/util/PsiClassUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiClassUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/PsiClassUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/PsiClassUtil.java

diff --git a/java/openapi/src/com/intellij/psi/util/PsiMethodUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiMethodUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/PsiMethodUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/PsiMethodUtil.java

diff --git a/java/openapi/src/com/intellij/psi/util/PsiTypesUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/PsiTypesUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java

diff --git a/java/openapi/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/PsiUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java

diff --git a/java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/TypeConversionUtil.java
rename to java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java

diff --git a/java/openapi/src/com/intellij/psi/util/TypesDistinctProver.java b/java/java-psi-api/src/com/intellij/psi/util/TypesDistinctProver.java
similarity index 100%
rename from java/openapi/src/com/intellij/psi/util/TypesDistinctProver.java
rename to java/java-psi-api/src/com/intellij/psi/util/TypesDistinctProver.java

diff --git a/java/openapi/src/com/intellij/util/VisibilityIcons.java b/java/java-psi-api/src/com/intellij/util/VisibilityIcons.java
similarity index 100%
rename from java/openapi/src/com/intellij/util/VisibilityIcons.java
rename to java/java-psi-api/src/com/intellij/util/VisibilityIcons.java

diff --git a/java/java-psi-impl/java-psi-impl.iml b/java/java-psi-impl/java-psi-impl.iml
new file mode 100644 (file)
index 0000000..396e854
--- /dev/null
+++ b/java/java-psi-impl/java-psi-impl.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="java-psi-api" exported="" />
+    <orderEntry type="module" module-name="core-impl" exported="" />
+    <orderEntry type="library" name="Guava" level="project" />
+  </component>
+</module>
+

diff --git a/java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java
rename to java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionHints.java b/java/java-psi-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionHints.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionHints.java
rename to java/java-psi-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionHints.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java b/java/java-psi-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java
similarity index 100%
rename from java/java-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java
rename to java/java-psi-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java

diff --git a/java/java-impl/src/com/intellij/ide/highlighter/JavaClassFileType.java b/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaClassFileType.java
similarity index 100%
rename from java/java-impl/src/com/intellij/ide/highlighter/JavaClassFileType.java
rename to java/java-psi-impl/src/com/intellij/ide/highlighter/JavaClassFileType.java

diff --git a/java/java-impl/src/com/intellij/ide/highlighter/JavaFileType.java b/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaFileType.java
similarity index 100%
rename from java/java-impl/src/com/intellij/ide/highlighter/JavaFileType.java
rename to java/java-psi-impl/src/com/intellij/ide/highlighter/JavaFileType.java

diff --git a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java b/java/java-psi-impl/src/com/intellij/lang/java/JavaParserDefinition.java
similarity index 100%
rename from java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java
rename to java/java-psi-impl/src/com/intellij/lang/java/JavaParserDefinition.java

diff --git a/java/java-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
similarity index 99%
rename from java/java-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
rename to java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
index 11de958563ca9defee9f1ab232193bba808093b3..23028f32174cd2dbaf04f501dd0d8de32ba02e85 100644 (file)
--- a/java/java-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
@@ -160,7 +160,7 @@ public class DeclarationParser {
         ExpressionParser.parseArgumentList(builder);
       }
       else {
-        emptyElement(builder, JavaElementType.EXPRESSION_LIST);
+        JavaParserUtil.emptyElement(builder, JavaElementType.EXPRESSION_LIST);
       }
 
       if (builder.getTokenType() == JavaTokenType.LBRACE) {
@@ -293,7 +293,7 @@ public class DeclarationParser {
         }
         idPos.rollbackTo();
         if (typeParams == null) {
-          emptyElement(builder, JavaElementType.TYPE_PARAMETER_LIST);
+          JavaParserUtil.emptyElement(builder, JavaElementType.TYPE_PARAMETER_LIST);
         }
         builder.advanceLexer();
         if (builder.getTokenType() != JavaTokenType.LPARENTH) {
@@ -352,7 +352,7 @@ public class DeclarationParser {
     if (builder.getTokenType() == JavaTokenType.LPARENTH) {
       if (context == Context.CLASS || context == Context.ANNOTATION_INTERFACE) {  // method
         if (typeParams == null) {
-          emptyElement(type, JavaElementType.TYPE_PARAMETER_LIST);
+          JavaParserUtil.emptyElement(type, JavaElementType.TYPE_PARAMETER_LIST);
         }
         return parseMethodFromLeftParenth(builder, declaration, (context == Context.ANNOTATION_INTERFACE), false);
       }
@@ -589,7 +589,7 @@ public class DeclarationParser {
       }
       else {
         error(builder, JavaErrorMessages.message("expected.type"));
-        emptyElement(builder, JavaElementType.TYPE);
+        JavaParserUtil.emptyElement(builder, JavaElementType.TYPE);
       }
     }
 

diff --git a/java/java-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
similarity index 99%
rename from java/java-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
rename to java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
index f567981f3ae594f6322f45c60ac60495f012132f..30b7a375ebb25d2d8641d22b612c4fcfa6d89a9d 100644 (file)
--- a/java/java-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
@@ -820,7 +820,7 @@ public class ExpressionParser {
   }
 
   private static void emptyExpression(final PsiBuilder builder) {
-    emptyElement(builder, JavaElementType.EMPTY_EXPRESSION);
+    JavaParserUtil.emptyElement(builder, JavaElementType.EMPTY_EXPRESSION);
   }
 
   @Nullable

diff --git a/java/java-impl/src/com/intellij/lang/java/parser/FileParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java
similarity index 100%
rename from java/java-impl/src/com/intellij/lang/java/parser/FileParser.java
rename to java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java

diff --git a/java/java-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
similarity index 100%
rename from java/java-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
rename to java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java

diff --git a/java/java-impl/src/com/intellij/lang/java/parser/JavadocParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java
similarity index 100%
rename from java/java-impl/src/com/intellij/lang/java/parser/JavadocParser.java
rename to java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java

diff --git a/java/java-impl/src/com/intellij/lang/java/parser/ReferenceParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
similarity index 99%
rename from java/java-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
rename to java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
index 1987261157637f53c7d12e7b620162822b4b52a5..bf4f23608b1b802e79007bffafb5eb560157dd8b 100644 (file)
--- a/java/java-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
@@ -17,6 +17,7 @@ package com.intellij.lang.java.parser;
 
 import com.intellij.codeInsight.daemon.JavaErrorMessages;
 import com.intellij.lang.PsiBuilder;
+import com.intellij.lang.PsiBuilderUtil;
 import com.intellij.psi.JavaTokenType;
 import com.intellij.psi.impl.source.tree.ElementType;
 import com.intellij.psi.impl.source.tree.JavaElementType;
@@ -93,7 +94,7 @@ public class ReferenceParser {
     }
 
     final IElementType tokenType = builder.getTokenType();
-    if (expect(builder, ElementType.PRIMITIVE_TYPE_BIT_SET)) {
+    if (PsiBuilderUtil.expect(builder, ElementType.PRIMITIVE_TYPE_BIT_SET)) {
       typeInfo.isPrimitive = true;
     }
     else if (tokenType == JavaTokenType.IDENTIFIER) {

diff --git