From c5311aeaf3843c5e4e63efd7c08d00c029b63433 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 23 Sep 2011 18:57:25 +0200 Subject: [PATCH] java-psi-api and java-psi-impl modules extracted --- build/scripts/layouts.gant | 5 ++++- java/java-impl/java-impl.iml | 1 + .../codeInsight/ChangeContextUtil.java | 2 -- .../CreateInnerClassFromUsageFix.java | 2 -- .../StringLiteralCopyPasteProcessor.java | 2 -- .../impl/ExpandStaticImportAction.java | 1 - ...placeImplementsWithStaticImportAction.java | 1 - .../actions/UnimplementInterfaceAction.java | 2 -- .../deprecation/DeprecationInspection.java | 5 ----- .../hierarchy/method/MethodHierarchyUtil.java | 2 -- .../classes/ClassAssignableToFilter.java | 2 -- .../psi/formatter/java/DocCommentBlock.java | 1 - .../psi/formatter/java/ExtendsListBlock.java | 1 - .../psi/formatter/java/LabeledJavaBlock.java | 1 - .../psi/formatter/java/SimpleJavaBlock.java | 1 - .../light/LightClassReferenceExpression.java | 2 -- .../psi/impl/light/LightMethodBuilder.java | 1 - .../codeStyle/FormatCommentsProcessor.java | 2 -- .../InplaceIntroduceConstantPopup.java | 2 -- .../InplaceIntroduceFieldPopup.java | 2 -- .../usageInfo/MergeMethodArguments.java | 2 -- .../memberPushDown/PushDownProcessor.java | 1 - .../typeMigration/TypeMigrationLabeler.java | 1 - java/java-psi-api/java-psi-api.iml | 13 +++++++++++++ .../intellij/codeInsight/TestFrameworks.java | 0 .../runner/JavaMainMethodProvider.java | 0 .../com/intellij/lang/java/JavaLanguage.java | 0 .../src/com/intellij/lexer/JavaDocLexer.java | 0 .../com/intellij/lexer/JavaDocTokenTypes.java | 0 .../roots/LanguageLevelProjectExtension.java | 0 .../intellij/openapi/roots/PackageIndex.java | 0 .../com/intellij/pom/java/LanguageLevel.java | 0 .../com/intellij/psi/CommonClassNames.java | 0 .../com/intellij/psi/EmptySubstitutor.java | 0 .../src/com/intellij/psi/GenericsUtil.java | 0 .../psi/HierarchicalMethodSignature.java | 0 .../com/intellij/psi/ImplicitVariable.java | 0 .../com/intellij/psi/JVMElementFactories.java | 0 .../com/intellij/psi/JVMElementFactory.java | 0 .../psi/JVMElementFactoryProvider.java | 0 .../com/intellij/psi/JavaCodeFragment.java | 0 .../intellij/psi/JavaDirectoryService.java | 0 .../com/intellij/psi/JavaDocTokenType.java | 0 .../com/intellij/psi/JavaElementVisitor.java | 0 .../src/com/intellij/psi/JavaPsiFacade.java | 0 .../psi/JavaRecursiveElementVisitor.java | 0 .../JavaRecursiveElementWalkingVisitor.java | 0 .../com/intellij/psi/JavaResolveResult.java | 0 .../src/com/intellij/psi/JavaTokenType.java | 0 .../src/com/intellij/psi/Modifier.java | 0 .../src/com/intellij/psi/PsiAnnotation.java | 0 .../psi/PsiAnnotationMemberValue.java | 0 .../com/intellij/psi/PsiAnnotationMethod.java | 0 .../com/intellij/psi/PsiAnnotationOwner.java | 0 .../psi/PsiAnnotationParameterList.java | 0 .../intellij/psi/PsiAnnotationSupport.java | 0 .../com/intellij/psi/PsiAnonymousClass.java | 0 .../psi/PsiArrayAccessExpression.java | 0 .../psi/PsiArrayInitializerExpression.java | 0 .../psi/PsiArrayInitializerMemberValue.java | 0 .../src/com/intellij/psi/PsiArrayType.java | 0 .../com/intellij/psi/PsiAssertStatement.java | 0 .../intellij/psi/PsiAssignmentExpression.java | 0 .../com/intellij/psi/PsiBinaryExpression.java | 0 .../com/intellij/psi/PsiBlockStatement.java | 0 .../com/intellij/psi/PsiBreakStatement.java | 0 .../src/com/intellij/psi/PsiCall.java | 0 .../com/intellij/psi/PsiCallExpression.java | 0 .../intellij/psi/PsiCapturedWildcardType.java | 0 .../src/com/intellij/psi/PsiCatchSection.java | 0 .../src/com/intellij/psi/PsiClass.java | 0 .../com/intellij/psi/PsiClassInitializer.java | 0 .../PsiClassLevelDeclarationStatement.java | 0 .../psi/PsiClassObjectAccessExpression.java | 0 .../src/com/intellij/psi/PsiClassOwner.java | 0 .../src/com/intellij/psi/PsiClassOwnerEx.java | 0 .../src/com/intellij/psi/PsiClassType.java | 0 .../src/com/intellij/psi/PsiCodeBlock.java | 0 .../psi/PsiConditionalExpression.java | 0 .../psi/PsiConstantEvaluationHelper.java | 0 .../com/intellij/psi/PsiConstructorCall.java | 0 .../intellij/psi/PsiContinueStatement.java | 0 .../intellij/psi/PsiDeclarationStatement.java | 0 .../src/com/intellij/psi/PsiDiamondType.java | 0 .../com/intellij/psi/PsiDisjunctionType.java | 0 .../com/intellij/psi/PsiDoWhileStatement.java | 0 .../com/intellij/psi/PsiDocCommentOwner.java | 0 .../com/intellij/psi/PsiElementFactory.java | 0 .../com/intellij/psi/PsiElementFinder.java | 0 .../src/com/intellij/psi/PsiEllipsisType.java | 0 .../com/intellij/psi/PsiEmptyStatement.java | 0 .../src/com/intellij/psi/PsiEnumConstant.java | 0 .../psi/PsiEnumConstantInitializer.java | 0 .../src/com/intellij/psi/PsiExpression.java | 0 .../psi/PsiExpressionCodeFragment.java | 0 .../com/intellij/psi/PsiExpressionList.java | 0 .../psi/PsiExpressionListStatement.java | 0 .../intellij/psi/PsiExpressionStatement.java | 0 .../src/com/intellij/psi/PsiField.java | 0 .../src/com/intellij/psi/PsiForStatement.java | 0 .../com/intellij/psi/PsiForeachStatement.java | 0 .../src/com/intellij/psi/PsiIdentifier.java | 0 .../src/com/intellij/psi/PsiIfStatement.java | 0 .../src/com/intellij/psi/PsiImportHolder.java | 0 .../src/com/intellij/psi/PsiImportList.java | 0 .../com/intellij/psi/PsiImportStatement.java | 0 .../intellij/psi/PsiImportStatementBase.java | 0 .../psi/PsiImportStaticReferenceElement.java | 0 .../psi/PsiImportStaticStatement.java | 0 .../intellij/psi/PsiInstanceOfExpression.java | 0 .../com/intellij/psi/PsiIntersectionType.java | 0 .../psi/PsiJavaCodeReferenceCodeFragment.java | 0 .../psi/PsiJavaCodeReferenceElement.java | 0 .../src/com/intellij/psi/PsiJavaFile.java | 0 .../com/intellij/psi/PsiJavaParserFacade.java | 0 .../com/intellij/psi/PsiJavaReference.java | 0 .../src/com/intellij/psi/PsiJavaToken.java | 0 .../src/com/intellij/psi/PsiKeyword.java | 0 .../com/intellij/psi/PsiLabeledStatement.java | 0 .../src/com/intellij/psi/PsiLiteral.java | 0 .../intellij/psi/PsiLiteralExpression.java | 0 .../com/intellij/psi/PsiLocalVariable.java | 0 .../com/intellij/psi/PsiLoopStatement.java | 0 .../src/com/intellij/psi/PsiMember.java | 0 .../src/com/intellij/psi/PsiMethod.java | 0 .../intellij/psi/PsiMethodCallExpression.java | 0 .../com/intellij/psi/PsiMethodReceiver.java | 0 .../src/com/intellij/psi/PsiMigration.java | 0 .../intellij/psi/PsiModifiableCodeBlock.java | 0 .../src/com/intellij/psi/PsiModifier.java | 0 .../src/com/intellij/psi/PsiModifierList.java | 0 .../intellij/psi/PsiModifierListOwner.java | 0 .../src/com/intellij/psi/PsiNameHelper.java | 0 .../com/intellij/psi/PsiNameValuePair.java | 0 .../com/intellij/psi/PsiNewExpression.java | 0 .../src/com/intellij/psi/PsiPackage.java | 0 .../com/intellij/psi/PsiPackageStatement.java | 0 .../src/com/intellij/psi/PsiParameter.java | 0 .../com/intellij/psi/PsiParameterList.java | 0 .../psi/PsiParenthesizedExpression.java | 0 .../intellij/psi/PsiPolyadicExpression.java | 0 .../intellij/psi/PsiPostfixExpression.java | 0 .../com/intellij/psi/PsiPrefixExpression.java | 0 .../com/intellij/psi/PsiPrimitiveType.java | 0 .../intellij/psi/PsiQualifiedExpression.java | 0 .../intellij/psi/PsiReferenceExpression.java | 0 .../com/intellij/psi/PsiReferenceList.java | 0 .../psi/PsiReferenceParameterList.java | 0 .../com/intellij/psi/PsiResolveHelper.java | 0 .../src/com/intellij/psi/PsiResourceList.java | 0 .../com/intellij/psi/PsiResourceVariable.java | 0 .../com/intellij/psi/PsiReturnStatement.java | 0 .../src/com/intellij/psi/PsiStatement.java | 0 .../src/com/intellij/psi/PsiSubstitutor.java | 0 .../com/intellij/psi/PsiSuperExpression.java | 0 .../intellij/psi/PsiSwitchLabelStatement.java | 0 .../com/intellij/psi/PsiSwitchStatement.java | 0 .../psi/PsiSynchronizedStatement.java | 0 .../com/intellij/psi/PsiSyntheticClass.java | 0 .../com/intellij/psi/PsiThisExpression.java | 0 .../com/intellij/psi/PsiThrowStatement.java | 0 .../src/com/intellij/psi/PsiTryStatement.java | 0 .../src/com/intellij/psi/PsiType.java | 0 .../intellij/psi/PsiTypeCastExpression.java | 0 .../com/intellij/psi/PsiTypeCodeFragment.java | 0 .../src/com/intellij/psi/PsiTypeElement.java | 0 .../com/intellij/psi/PsiTypeParameter.java | 0 .../intellij/psi/PsiTypeParameterList.java | 0 .../psi/PsiTypeParameterListOwner.java | 0 .../src/com/intellij/psi/PsiTypeVisitor.java | 0 .../src/com/intellij/psi/PsiVariable.java | 0 .../com/intellij/psi/PsiWhileStatement.java | 0 .../src/com/intellij/psi/PsiWildcardType.java | 0 .../src/com/intellij/psi/ServerPageFile.java | 0 .../psi/augment/PsiAugmentProvider.java | 0 .../psi/codeStyle/JavaCodeStyleManager.java | 0 .../JavaCodeStyleSettingsFacade.java | 0 .../intellij/psi/codeStyle/VariableKind.java | 0 .../com/intellij/psi/infos/CandidateInfo.java | 0 .../psi/infos/ClassCandidateInfo.java | 0 .../psi/infos/MethodCandidateInfo.java | 0 .../intellij/psi/javadoc/PsiDocComment.java | 0 .../com/intellij/psi/javadoc/PsiDocTag.java | 0 .../intellij/psi/javadoc/PsiDocTagValue.java | 0 .../com/intellij/psi/javadoc/PsiDocToken.java | 0 .../intellij/psi/javadoc/PsiInlineDocTag.java | 0 .../psi/scope/JavaScopeProcessorEvent.java | 0 .../com/intellij/psi/search/PackageScope.java | 0 .../searches/DeepestSuperMethodsSearch.java | 0 .../search/searches/SuperMethodsSearch.java | 0 .../psi/stubs/PsiClassHolderFileStub.java | 0 .../psi/tree/java/IJavaDocElementType.java | 0 .../psi/tree/java/IJavaElementType.java | 0 .../psi/tree/java/IKeywordElementType.java | 0 .../ConstantEvaluationOverflowException.java | 0 .../psi/util/ConstantExpressionUtil.java | 0 .../intellij/psi/util/InheritanceUtil.java | 0 .../psi/util/IsConstantExpressionVisitor.java | 0 .../intellij/psi/util/MethodSignature.java | 0 .../MethodSignatureBackedByPsiMethod.java | 0 .../psi/util/MethodSignatureBase.java | 0 .../psi/util/MethodSignatureHandMade.java | 0 .../psi/util/MethodSignatureUtil.java | 0 .../com/intellij/psi/util/PsiClassUtil.java | 0 .../com/intellij/psi/util/PsiMethodUtil.java | 0 .../com/intellij/psi/util/PsiTypesUtil.java | 0 .../src/com/intellij/psi/util/PsiUtil.java | 0 .../intellij/psi/util/TypeConversionUtil.java | 0 .../psi/util/TypesDistinctProver.java | 0 .../com/intellij/util/VisibilityIcons.java | 0 java/java-psi-impl/java-psi-impl.iml | 15 +++++++++++++++ .../intellij/codeInsight/ExceptionUtil.java | 0 .../completion/scope/JavaCompletionHints.java | 0 .../codeInsight/daemon/JavaErrorMessages.java | 0 .../ide/highlighter/JavaClassFileType.java | 0 .../ide/highlighter/JavaFileType.java | 0 .../lang/java/JavaParserDefinition.java | 0 .../lang/java/parser/DeclarationParser.java | 8 ++++---- .../lang/java/parser/ExpressionParser.java | 2 +- .../intellij/lang/java/parser/FileParser.java | 0 .../lang/java/parser/JavaParserUtil.java | 0 .../lang/java/parser/JavadocParser.java | 0 .../lang/java/parser/ReferenceParser.java | 3 ++- .../lang/java/parser/StatementParser.java | 2 +- .../src/com/intellij/lexer/JavaLexer.java | 0 .../src/com/intellij/lexer/_JavaLexer.java | 0 .../src/com/intellij/psi/Bottom.java | 0 .../intellij/psi/ClassFileViewProvider.java | 0 .../com/intellij/psi/PsiDiamondTypeImpl.java | 0 .../src/com/intellij/psi/PsiTypeVariable.java | 0 .../com/intellij/psi/PsiTypeVisitorEx.java | 0 .../AnalysisCanceledException.java | 0 .../AnalysisCanceledSoftException.java | 0 .../psi/controlFlow/BranchingInstruction.java | 0 .../psi/controlFlow/CallInstruction.java | 0 .../psi/controlFlow/CommentInstruction.java | 0 .../CompositeInstructionClientVisitor.java | 0 .../ConditionalBranchingInstruction.java | 0 .../ConditionalGoToInstruction.java | 0 .../ConditionalThrowToInstruction.java | 0 .../intellij/psi/controlFlow/ControlFlow.java | 0 .../psi/controlFlow/ControlFlowAnalyzer.java | 0 .../psi/controlFlow/ControlFlowFactory.java | 0 .../psi/controlFlow/ControlFlowImpl.java | 0 .../ControlFlowInstructionVisitor.java | 0 .../psi/controlFlow/ControlFlowPolicy.java | 0 .../psi/controlFlow/ControlFlowStack.java | 0 .../psi/controlFlow/ControlFlowSubRange.java | 0 .../psi/controlFlow/ControlFlowUtil.java | 0 .../psi/controlFlow/EmptyInstruction.java | 0 .../psi/controlFlow/GoToInstruction.java | 0 .../intellij/psi/controlFlow/Instruction.java | 0 .../psi/controlFlow/InstructionBase.java | 0 .../controlFlow/InstructionClientVisitor.java | 0 ...lsOrMyInstanceFieldsControlFlowPolicy.java | 0 .../controlFlow/ReadVariableInstruction.java | 0 .../psi/controlFlow/ReturnInstruction.java | 0 .../controlFlow/ReturnStatementsVisitor.java | 0 .../psi/controlFlow/SimpleInstruction.java | 0 .../psi/controlFlow/ThrowToInstruction.java | 0 .../controlFlow/WriteVariableInstruction.java | 0 .../psi/filters/ConstructorFilter.java | 0 .../filters/classes/AnnotationTypeFilter.java | 0 .../psi/filters/element/ModifierFilter.java | 0 .../psi/impl/ConstantExpressionEvaluator.java | 0 .../psi/impl/ConstantExpressionVisitor.java | 0 .../psi/impl/ElementPresentationUtil.java | 0 .../psi/impl/EmptySubstitutorImpl.java | 0 .../psi/impl/InheritanceImplUtil.java | 0 .../impl/JavaConstantExpressionEvaluator.java | 0 .../intellij/psi/impl/JavaPsiFacadeEx.java | 0 .../psi/impl/JavaPsiImplementationHelper.java | 0 .../LanguageConstantExpressionEvaluator.java | 0 .../intellij/psi/impl/PsiClassImplUtil.java | 0 .../impl/PsiConstantEvaluationHelperImpl.java | 0 .../com/intellij/psi/impl/PsiImplUtil.java | 0 .../psi/impl/PsiJavaParserFacadeImpl.java | 0 .../intellij/psi/impl/PsiSubstitutorImpl.java | 0 .../psi/impl/PsiSuperMethodImplUtil.java | 0 .../com/intellij/psi/impl/PsiVariableEx.java | 0 .../psi/impl/cache/ModifierFlags.java | 0 .../intellij/psi/impl/cache/RecordUtil.java | 0 .../com/intellij/psi/impl/cache/TypeInfo.java | 0 .../psi/impl/compiled/ClsAnnotationImpl.java | 0 .../ClsAnnotationParameterListImpl.java | 0 .../impl/compiled/ClsAnnotationValueImpl.java | 0 .../ClsArrayInitializerMemberValueImpl.java | 0 .../compiled/ClsBinaryExpressionImpl.java | 0 .../psi/impl/compiled/ClsClassImpl.java | 0 .../ClsClassObjectAccessExpressionImpl.java | 3 ++- .../psi/impl/compiled/ClsDocCommentImpl.java | 0 .../psi/impl/compiled/ClsDocTagImpl.java | 0 .../psi/impl/compiled/ClsElementImpl.java | 0 .../impl/compiled/ClsEnumConstantImpl.java | 0 .../psi/impl/compiled/ClsFieldImpl.java | 0 .../psi/impl/compiled/ClsFileImpl.java | 0 .../psi/impl/compiled/ClsIdentifierImpl.java | 0 .../ClsJavaCodeReferenceElementImpl.java | 0 .../psi/impl/compiled/ClsJavaTokenImpl.java | 0 .../compiled/ClsLiteralExpressionImpl.java | 0 .../psi/impl/compiled/ClsMethodImpl.java | 0 .../impl/compiled/ClsModifierListImpl.java | 0 .../impl/compiled/ClsModifierListOwner.java | 0 .../impl/compiled/ClsNameValuePairImpl.java | 0 .../compiled/ClsPackageStatementImpl.java | 0 .../psi/impl/compiled/ClsParameterImpl.java | 0 .../impl/compiled/ClsParameterListImpl.java | 0 .../psi/impl/compiled/ClsParsingUtil.java | 0 .../compiled/ClsPrefixExpressionImpl.java | 0 .../compiled/ClsReferenceExpressionImpl.java | 0 .../impl/compiled/ClsReferenceListImpl.java | 0 .../ClsReferenceParametersListImpl.java | 0 .../compiled/ClsRepositoryPsiElement.java | 0 .../psi/impl/compiled/ClsTypeElementImpl.java | 0 .../impl/compiled/ClsTypeParameterImpl.java | 0 .../ClsTypeParameterReferenceImpl.java | 0 .../compiled/ClsTypeParametersListImpl.java | 0 .../psi/impl/compiled/SignatureParsing.java | 0 .../java/stubs/JavaAnnotationElementType.java | 0 .../impl/java/stubs/JavaClassElementType.java | 0 .../JavaClassInitializerElementType.java | 0 .../JavaClassReferenceListElementType.java | 0 .../java/stubs/JavaFieldStubElementType.java | 0 .../java/stubs/JavaImportListElementType.java | 0 .../stubs/JavaImportStatementElementType.java | 0 .../java/stubs/JavaMethodElementType.java | 0 .../stubs/JavaModifierListElementType.java | 0 .../java/stubs/JavaParameterElementType.java | 0 .../stubs/JavaParameterListElementType.java | 0 .../impl/java/stubs/JavaStubElementType.java | 0 .../impl/java/stubs/JavaStubElementTypes.java | 0 .../stubs/JavaTypeParameterElementType.java | 0 .../JavaTypeParameterListElementType.java | 0 .../impl/java/stubs/PsiAnnotationStub.java | 0 .../java/stubs/PsiClassInitializerStub.java | 0 .../java/stubs/PsiClassReferenceListStub.java | 0 .../psi/impl/java/stubs/PsiClassStub.java | 0 .../psi/impl/java/stubs/PsiFieldStub.java | 0 .../impl/java/stubs/PsiImportListStub.java | 0 .../java/stubs/PsiImportStatementStub.java | 0 .../psi/impl/java/stubs/PsiJavaFileStub.java | 0 .../psi/impl/java/stubs/PsiMethodStub.java | 0 .../impl/java/stubs/PsiModifierListStub.java | 0 .../impl/java/stubs/PsiParameterListStub.java | 0 .../psi/impl/java/stubs/PsiParameterStub.java | 0 .../java/stubs/PsiTypeParameterListStub.java | 0 .../impl/java/stubs/PsiTypeParameterStub.java | 0 .../stubs/impl/PsiAnnotationStubImpl.java | 0 .../impl/PsiClassInitializerStubImpl.java | 0 .../impl/PsiClassReferenceListStubImpl.java | 0 .../java/stubs/impl/PsiClassStubImpl.java | 0 .../java/stubs/impl/PsiFieldStubImpl.java | 0 .../stubs/impl/PsiImportListStubImpl.java | 0 .../impl/PsiImportStatementStubImpl.java | 0 .../java/stubs/impl/PsiJavaFileStubImpl.java | 0 .../java/stubs/impl/PsiMethodStubImpl.java | 0 .../stubs/impl/PsiModifierListStubImpl.java | 0 .../stubs/impl/PsiParameterListStubImpl.java | 0 .../java/stubs/impl/PsiParameterStubImpl.java | 0 .../impl/PsiTypeParameterListStubImpl.java | 0 .../stubs/impl/PsiTypeParameterStubImpl.java | 0 .../java/stubs/index/JavaStubIndexKeys.java | 0 .../intellij/psi/impl/light/LightClass.java | 0 .../psi/impl/light/LightClassReference.java | 0 .../impl/light/LightEmptyImplementsList.java | 0 .../intellij/psi/impl/light/LightMethod.java | 0 .../light/LightReferenceParameterList.java | 0 .../psi/impl/light/LightTypeParameter.java | 0 .../psi/impl/source/ClassInnerStuffCache.java | 0 .../intellij/psi/impl/source/Constants.java | 19 ++++++++++--------- .../HierarchicalMethodSignatureImpl.java | 0 .../psi/impl/source/JavaDummyElement.java | 0 .../psi/impl/source/JavaDummyHolder.java | 0 .../psi/impl/source/JavaFileElementType.java | 0 .../psi/impl/source/JavaLightStubBuilder.java | 0 .../psi/impl/source/JavaStubPsiElement.java | 0 .../impl/source/PsiAnnotationMethodImpl.java | 0 .../impl/source/PsiAnonymousClassImpl.java | 4 ---- .../psi/impl/source/PsiClassImpl.java | 0 .../impl/source/PsiClassInitializerImpl.java | 0 .../impl/source/PsiClassReferenceType.java | 0 .../source/PsiDiamondTypeElementImpl.java | 0 .../psi/impl/source/PsiEnumConstantImpl.java | 0 .../PsiEnumConstantInitializerImpl.java | 0 .../psi/impl/source/PsiFieldImpl.java | 0 .../impl/source/PsiImmediateClassType.java | 0 .../psi/impl/source/PsiImportListImpl.java | 0 .../source/PsiImportStatementBaseImpl.java | 0 .../impl/source/PsiImportStatementImpl.java | 0 .../PsiImportStaticReferenceElementImpl.java | 0 .../source/PsiImportStaticStatementImpl.java | 0 .../PsiJavaCodeReferenceElementImpl.java | 2 +- .../psi/impl/source/PsiJavaFileBaseImpl.java | 3 ++- .../psi/impl/source/PsiJavaFileImpl.java | 0 .../psi/impl/source/PsiLabelReference.java | 0 .../psi/impl/source/PsiMethodImpl.java | 0 .../impl/source/PsiMethodReceiverImpl.java | 0 .../psi/impl/source/PsiModifierListImpl.java | 0 .../psi/impl/source/PsiParameterImpl.java | 0 .../psi/impl/source/PsiParameterListImpl.java | 0 .../psi/impl/source/PsiReferenceListImpl.java | 0 .../psi/impl/source/PsiTypeElementImpl.java | 0 .../impl/source/SourceJavaCodeReference.java | 0 .../source/javadoc/PsiDocCommentImpl.java | 0 .../javadoc/PsiDocMethodOrFieldRef.java | 0 .../impl/source/javadoc/PsiDocParamRef.java | 0 .../impl/source/javadoc/PsiDocTagImpl.java | 0 .../resolve/ClassResolverProcessor.java | 3 ++- .../psi/impl/source/resolve/Domination.java | 0 .../impl/source/resolve/JavaResolveCache.java | 0 .../impl/source/resolve/JavaResolveUtil.java | 0 .../resolve/StaticImportResolveProcessor.java | 0 .../resolve/SymbolCollectingProcessor.java | 5 +++-- .../resolve/VariableResolverProcessor.java | 3 ++- .../psi/impl/source/tree/ChildRole.java | 0 .../psi/impl/source/tree/ElementType.java | 0 .../impl/source/tree/JavaDocElementType.java | 0 .../psi/impl/source/tree/JavaElementType.java | 4 ++-- .../impl/source/tree/JavaSharedImplUtil.java | 0 .../psi/impl/source/tree/JavaSourceUtil.java | 0 .../psi/impl/source/tree/SourceUtil.java | 0 .../tree/injected/StringLiteralEscaper.java | 0 .../source/tree/java/AnnotationElement.java | 0 .../tree/java/AnnotationMethodElement.java | 0 .../tree/java/AnonymousClassElement.java | 5 ----- .../tree/java/AnonymousClassElementBase.java | 0 .../impl/source/tree/java/ClassElement.java | 0 .../tree/java/ClassInitializerElement.java | 0 .../source/tree/java/EnumConstantElement.java | 0 .../java/EnumConstantInitializerElement.java | 0 .../tree/java/ExpressionPsiElement.java | 2 +- .../source/tree/java/ExtendsListElement.java | 0 .../impl/source/tree/java/FieldElement.java | 0 .../tree/java/ImplementsListElement.java | 0 .../source/tree/java/ImportListElement.java | 0 .../tree/java/ImportStatementBaseElement.java | 0 .../tree/java/ImportStatementElement.java | 0 .../java/ImportStaticStatementElement.java | 0 .../source/tree/java/JavaFileElement.java | 0 .../impl/source/tree/java/MethodElement.java | 0 .../source/tree/java/ModifierListElement.java | 0 .../source/tree/java/ParameterElement.java | 0 .../tree/java/ParameterListElement.java | 0 .../source/tree/java/PsiAnnotationImpl.java | 0 .../java/PsiAnnotationParameterListImpl.java | 0 .../java/PsiArrayAccessExpressionImpl.java | 0 .../PsiArrayInitializerExpressionImpl.java | 0 .../PsiArrayInitializerMemberValueImpl.java | 0 .../tree/java/PsiAssertStatementImpl.java | 0 .../java/PsiAssignmentExpressionImpl.java | 0 .../tree/java/PsiBinaryExpressionImpl.java | 0 .../tree/java/PsiBlockStatementImpl.java | 0 .../tree/java/PsiBreakStatementImpl.java | 0 .../source/tree/java/PsiCatchSectionImpl.java | 0 .../PsiClassObjectAccessExpressionImpl.java | 3 ++- .../source/tree/java/PsiCodeBlockImpl.java | 0 .../tree/java/PsiCommaSeparatedListImpl.java | 0 .../java/PsiConditionalExpressionImpl.java | 0 .../tree/java/PsiContinueStatementImpl.java | 0 .../java/PsiDeclarationStatementImpl.java | 0 .../tree/java/PsiDoWhileStatementImpl.java | 0 .../tree/java/PsiEmptyExpressionImpl.java | 0 .../tree/java/PsiEmptyStatementImpl.java | 0 .../tree/java/PsiExpressionListImpl.java | 0 .../java/PsiExpressionListStatementImpl.java | 0 .../tree/java/PsiExpressionStatementImpl.java | 0 .../source/tree/java/PsiForStatementImpl.java | 0 .../tree/java/PsiForeachStatementImpl.java | 0 .../source/tree/java/PsiIfStatementImpl.java | 0 .../source/tree/java/PsiInlineDocTagImpl.java | 0 .../java/PsiInstanceOfExpressionImpl.java | 0 .../tree/java/PsiLabeledStatementImpl.java | 0 .../tree/java/PsiLiteralExpressionImpl.java | 0 .../tree/java/PsiLocalVariableImpl.java | 0 .../java/PsiMethodCallExpressionImpl.java | 0 .../tree/java/PsiNameValuePairImpl.java | 0 .../tree/java/PsiNewExpressionImpl.java | 0 .../tree/java/PsiPackageStatementImpl.java | 0 .../java/PsiParenthesizedExpressionImpl.java | 0 .../tree/java/PsiPolyadicExpressionImpl.java | 0 .../tree/java/PsiPostfixExpressionImpl.java | 0 .../tree/java/PsiPrefixExpressionImpl.java | 0 .../tree/java/PsiReferenceExpressionImpl.java | 0 .../java/PsiReferenceParameterListImpl.java | 0 .../source/tree/java/PsiResourceListImpl.java | 0 .../tree/java/PsiResourceVariableImpl.java | 0 .../tree/java/PsiReturnStatementImpl.java | 0 .../tree/java/PsiSuperExpressionImpl.java | 0 .../java/PsiSwitchLabelStatementImpl.java | 0 .../tree/java/PsiSwitchStatementImpl.java | 0 .../java/PsiSynchronizedStatementImpl.java | 0 .../tree/java/PsiThisExpressionImpl.java | 0 .../tree/java/PsiThrowStatementImpl.java | 0 .../source/tree/java/PsiThrowsListImpl.java | 0 .../source/tree/java/PsiTryStatementImpl.java | 0 .../tree/java/PsiTypeCastExpressionImpl.java | 0 ...PsiTypeParameterExtendsBoundsListImpl.java | 0 .../tree/java/PsiTypeParameterImpl.java | 0 .../tree/java/PsiTypeParameterListImpl.java | 0 .../tree/java/PsiWhileStatementImpl.java | 0 .../tree/java/ReferenceListElement.java | 0 .../tree/java/ReplaceExpressionUtil.java | 0 .../tree/java/TypeParameterElement.java | 0 ...TypeParameterExtendsBoundsListElement.java | 0 .../tree/java/TypeParameterListElement.java | 0 .../psi/scope/ElementClassFilter.java | 0 .../intellij/psi/scope/ElementClassHint.java | 0 .../MethodProcessorSetupFailedException.java | 0 .../src/com/intellij/psi/scope/NameHint.java | 0 .../psi/scope/PsiConflictResolver.java | 0 .../DuplicateConflictResolver.java | 0 .../JavaMethodsConflictResolver.java | 0 .../JavaVariableConflictResolver.java | 0 .../processor/ConflictFilterProcessor.java | 3 ++- .../scope/processor/FilterScopeProcessor.java | 4 ++-- .../processor/MethodCandidatesProcessor.java | 0 .../processor/MethodResolverProcessor.java | 0 .../psi/scope/processor/MethodsProcessor.java | 0 .../psi/scope/util/PsiScopesUtil.java | 0 .../intellij/util/text/LiteralFormatUtil.java | 0 .../intellij/psi/Src15RepositoryUseTest.java | 1 - .../psi/resolve/Resolve15TestCase.java | 2 -- .../refactoring/ExtractSuperClassTest.java | 2 -- .../com/intellij/refactoring/PullUpTest.java | 2 -- java/openapi/openapi.iml | 1 + .../MissingOverrideAnnotationInspection.java | 1 - ...dParametersStaticCollectionInspection.java | 1 - .../ComponentNotRegisteredInspection.java | 1 - .../comments/EndOfLineCommentPredicate.java | 1 - .../synthetic/GrDynamicImplicitProperty.java | 1 - .../testng/TestNGRelatedFilesProvider.java | 1 - .../uiDesigner/binding/FormEnumUsageTest.java | 1 - 532 files changed, 73 insertions(+), 90 deletions(-) create mode 100644 java/java-psi-api/java-psi-api.iml rename java/{openapi => java-psi-api}/src/com/intellij/codeInsight/TestFrameworks.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/codeInsight/runner/JavaMainMethodProvider.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/lang/java/JavaLanguage.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/lexer/JavaDocLexer.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/lexer/JavaDocTokenTypes.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/openapi/roots/PackageIndex.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/pom/java/LanguageLevel.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/CommonClassNames.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/EmptySubstitutor.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/GenericsUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/HierarchicalMethodSignature.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/ImplicitVariable.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JVMElementFactories.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JVMElementFactory.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JVMElementFactoryProvider.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaCodeFragment.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaDirectoryService.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaDocTokenType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaElementVisitor.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaPsiFacade.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaRecursiveElementVisitor.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaRecursiveElementWalkingVisitor.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaResolveResult.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/JavaTokenType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/Modifier.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAnnotation.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAnnotationMemberValue.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAnnotationMethod.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAnnotationOwner.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAnnotationParameterList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAnnotationSupport.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAnonymousClass.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiArrayAccessExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiArrayInitializerExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiArrayInitializerMemberValue.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiArrayType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAssertStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiAssignmentExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiBinaryExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiBlockStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiBreakStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiCall.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiCallExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiCapturedWildcardType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiCatchSection.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiClass.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiClassInitializer.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiClassLevelDeclarationStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiClassObjectAccessExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiClassOwner.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiClassOwnerEx.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiClassType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiCodeBlock.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiConditionalExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiConstantEvaluationHelper.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiConstructorCall.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiContinueStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiDeclarationStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiDiamondType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiDisjunctionType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiDoWhileStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiDocCommentOwner.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiElementFactory.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiElementFinder.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiEllipsisType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiEmptyStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiEnumConstant.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiEnumConstantInitializer.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiExpressionCodeFragment.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiExpressionList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiExpressionListStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiExpressionStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiField.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiForStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiForeachStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiIdentifier.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiIfStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiImportHolder.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiImportList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiImportStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiImportStatementBase.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiImportStaticReferenceElement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiImportStaticStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiInstanceOfExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiIntersectionType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiJavaCodeReferenceCodeFragment.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiJavaCodeReferenceElement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiJavaFile.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiJavaParserFacade.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiJavaReference.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiJavaToken.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiKeyword.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiLabeledStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiLiteral.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiLiteralExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiLocalVariable.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiLoopStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiMember.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiMethod.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiMethodCallExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiMethodReceiver.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiMigration.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiModifiableCodeBlock.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiModifier.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiModifierList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiModifierListOwner.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiNameHelper.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiNameValuePair.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiNewExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiPackage.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiPackageStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiParameter.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiParameterList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiParenthesizedExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiPolyadicExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiPostfixExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiPrefixExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiPrimitiveType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiQualifiedExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiReferenceExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiReferenceList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiReferenceParameterList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiResolveHelper.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiResourceList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiResourceVariable.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiReturnStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiSubstitutor.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiSuperExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiSwitchLabelStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiSwitchStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiSynchronizedStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiSyntheticClass.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiThisExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiThrowStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiTryStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiTypeCastExpression.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiTypeCodeFragment.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiTypeElement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiTypeParameter.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiTypeParameterList.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiTypeParameterListOwner.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiTypeVisitor.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiVariable.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiWhileStatement.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/PsiWildcardType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/ServerPageFile.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/augment/PsiAugmentProvider.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/codeStyle/JavaCodeStyleSettingsFacade.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/codeStyle/VariableKind.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/infos/CandidateInfo.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/infos/ClassCandidateInfo.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/infos/MethodCandidateInfo.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/javadoc/PsiDocComment.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/javadoc/PsiDocTag.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/javadoc/PsiDocTagValue.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/javadoc/PsiDocToken.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/javadoc/PsiInlineDocTag.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/scope/JavaScopeProcessorEvent.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/search/PackageScope.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/search/searches/DeepestSuperMethodsSearch.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/search/searches/SuperMethodsSearch.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/stubs/PsiClassHolderFileStub.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/tree/java/IJavaDocElementType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/tree/java/IJavaElementType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/tree/java/IKeywordElementType.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/ConstantEvaluationOverflowException.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/ConstantExpressionUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/InheritanceUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/IsConstantExpressionVisitor.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/MethodSignature.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/MethodSignatureBackedByPsiMethod.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/MethodSignatureBase.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/MethodSignatureHandMade.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/MethodSignatureUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/PsiClassUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/PsiMethodUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/PsiTypesUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/PsiUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/TypeConversionUtil.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/psi/util/TypesDistinctProver.java (100%) rename java/{openapi => java-psi-api}/src/com/intellij/util/VisibilityIcons.java (100%) create mode 100644 java/java-psi-impl/java-psi-impl.iml rename java/{java-impl => java-psi-impl}/src/com/intellij/codeInsight/ExceptionUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/codeInsight/completion/scope/JavaCompletionHints.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/ide/highlighter/JavaClassFileType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/ide/highlighter/JavaFileType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lang/java/JavaParserDefinition.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lang/java/parser/DeclarationParser.java (99%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lang/java/parser/ExpressionParser.java (99%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lang/java/parser/FileParser.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lang/java/parser/JavaParserUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lang/java/parser/JavadocParser.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lang/java/parser/ReferenceParser.java (99%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lang/java/parser/StatementParser.java (99%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lexer/JavaLexer.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/lexer/_JavaLexer.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/Bottom.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/ClassFileViewProvider.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/PsiDiamondTypeImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/PsiTypeVariable.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/PsiTypeVisitorEx.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/AnalysisCanceledException.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/AnalysisCanceledSoftException.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/BranchingInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/CallInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/CommentInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlow.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlowFactory.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlowImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlowInstructionVisitor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlowPolicy.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlowStack.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ControlFlowUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/EmptyInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/GoToInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/Instruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/InstructionBase.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/InstructionClientVisitor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/LocalsOrMyInstanceFieldsControlFlowPolicy.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ReturnInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ReturnStatementsVisitor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/SimpleInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/ThrowToInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/filters/ConstructorFilter.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/filters/classes/AnnotationTypeFilter.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/filters/element/ModifierFilter.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/ConstantExpressionEvaluator.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/ConstantExpressionVisitor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/ElementPresentationUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/EmptySubstitutorImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/InheritanceImplUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/JavaPsiFacadeEx.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/JavaPsiImplementationHelper.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/PsiClassImplUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/PsiConstantEvaluationHelperImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/PsiImplUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/PsiSubstitutorImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/PsiVariableEx.java (100%) rename {platform/lang-impl => java/java-psi-impl}/src/com/intellij/psi/impl/cache/ModifierFlags.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/cache/RecordUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/cache/TypeInfo.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsBinaryExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsClassImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java (95%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsElementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsFileImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsJavaTokenImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsModifierListOwner.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsRepositoryPsiElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/compiled/SignatureParsing.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaAnnotationElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaClassElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaClassInitializerElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaClassReferenceListElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaFieldStubElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaImportListElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaImportStatementElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaMethodElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaModifierListElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaParameterElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaParameterListElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaStubElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterListElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiAnnotationStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiClassInitializerStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiClassReferenceListStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiFieldStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiImportListStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiImportStatementStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiModifierListStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiParameterListStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiParameterStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterListStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterStub.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiClassReferenceListStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiClassStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiFieldStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiImportStatementStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiJavaFileStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/java/stubs/index/JavaStubIndexKeys.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/light/LightClass.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/light/LightClassReference.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/light/LightEmptyImplementsList.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/light/LightMethod.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/light/LightReferenceParameterList.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/light/LightTypeParameter.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/Constants.java (85%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/HierarchicalMethodSignatureImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/JavaDummyElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/JavaDummyHolder.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/JavaFileElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/JavaStubPsiElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiAnonymousClassImpl.java (97%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiClassImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiClassInitializerImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiClassReferenceType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiDiamondTypeElementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiFieldImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiImmediateClassType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiImportListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiImportStatementBaseImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java (99%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java (99%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiLabelReference.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiMethodImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiModifierListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiParameterImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiParameterListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiReferenceListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/SourceJavaCodeReference.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java (98%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/resolve/Domination.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java (94%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java (96%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/ChildRole.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/ElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/JavaDocElementType.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/JavaElementType.java (98%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/SourceUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/AnnotationMethodElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElement.java (82%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ClassElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/EnumConstantInitializerElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ExpressionPsiElement.java (96%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ExtendsListElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/FieldElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ImplementsListElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ImportListElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ImportStatementElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ImportStaticStatementElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/MethodElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationParameterListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java (95%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiCommaSeparatedListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiEmptyExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiEmptyStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiInlineDocTagImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiResourceListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiResourceVariableImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiSwitchStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiThrowsListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterExtendsBoundsListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ReferenceListElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/TypeParameterExtendsBoundsListElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/ElementClassFilter.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/ElementClassHint.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/MethodProcessorSetupFailedException.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/NameHint.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/PsiConflictResolver.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/conflictResolvers/JavaVariableConflictResolver.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java (96%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java (93%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/processor/MethodCandidatesProcessor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/processor/MethodsProcessor.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/psi/scope/util/PsiScopesUtil.java (100%) rename java/{java-impl => java-psi-impl}/src/com/intellij/util/text/LiteralFormatUtil.java (100%) diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 453e0541ce8d..a4740128030d 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -34,13 +34,14 @@ def layoutFull(String home, String targetDirectory) { //noinspection GroovyAssignabilityCheck List 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 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 f5bd5cce2b5f..934740800fe9 100644 --- a/java/java-impl/java-impl.iml +++ b/java/java-impl/java-impl.iml @@ -30,6 +30,7 @@ + diff --git a/java/java-impl/src/com/intellij/codeInsight/ChangeContextUtil.java b/java/java-impl/src/com/intellij/codeInsight/ChangeContextUtil.java index 857e19e0b512..3ea92fcca599 100644 --- 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 cfd743bbd406..aa860a5eb1e3 100644 --- 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 5ba3f1ae8c24..345f54af339b 100644 --- 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 0d725bcf91ab..8bae1c958ce7 100644 --- 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 3b163eddb9c2..42c551061e21 100644 --- 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 9275c149ac0f..fb4cbacc291e 100644 --- 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 034bf911e99d..6b5c2de96781 100644 --- 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 c7c90bbf1e9c..d52c22d93ec6 100644 --- 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 02a9aad3e3f4..7b6398077687 100644 --- 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 cdd8460f7ee6..da5eb0eed933 100644 --- 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 205180f6cc80..644871b30de9 100644 --- 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 316149a675f6..ef065c5fa1a2 100644 --- 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 6b30060e5b1b..ea7b4a416248 100644 --- 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 44ce32342982..4c36f7217a96 100644 --- 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 c1a54bb648c5..a213cfbb0981 100644 --- 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 4a4d59467103..56229247d3c6 100644 --- 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 d9a8852a52fd..d538f8f5854b 100644 --- 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 b3cd16605fe9..f3c5618cca73 100644 --- 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 992bff67c21e..5d9053c7e760 100644 --- 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 07d3b73ac64c..7d9f85fd331f 100644 --- 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 01cb28f171ca..e2abaee1a57e 100644 --- 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 index 000000000000..caff682b4a06 --- /dev/null +++ b/java/java-psi-api/java-psi-api.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + 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 index 000000000000..396e8549943a --- /dev/null +++ b/java/java-psi-impl/java-psi-impl.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + 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 11de958563ca..23028f32174c 100644 --- 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 f567981f3ae5..30b7a375ebb2 100644 --- 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 198726115763..bf4f23608b1b 100644 --- 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 a/java/java-impl/src/com/intellij/lang/java/parser/StatementParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java similarity index 99% rename from java/java-impl/src/com/intellij/lang/java/parser/StatementParser.java rename to java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java index 17a194f2f125..e4faf99c851f 100644 --- a/java/java-impl/src/com/intellij/lang/java/parser/StatementParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java @@ -381,7 +381,7 @@ public class StatementParser { final PsiBuilder.Marker afterParenth = builder.mark(); final PsiBuilder.Marker param = DeclarationParser.parseParameter(builder, false, false); - if (param == null || JavaParserUtil.exprType(param) != JavaElementType.PARAMETER || builder.getTokenType() != JavaTokenType.COLON) { + if (param == null || exprType(param) != JavaElementType.PARAMETER || builder.getTokenType() != JavaTokenType.COLON) { afterParenth.rollbackTo(); return parseForLoopFromInitialization(builder, statement); } diff --git a/java/java-impl/src/com/intellij/lexer/JavaLexer.java b/java/java-psi-impl/src/com/intellij/lexer/JavaLexer.java similarity index 100% rename from java/java-impl/src/com/intellij/lexer/JavaLexer.java rename to java/java-psi-impl/src/com/intellij/lexer/JavaLexer.java diff --git a/java/java-impl/src/com/intellij/lexer/_JavaLexer.java b/java/java-psi-impl/src/com/intellij/lexer/_JavaLexer.java similarity index 100% rename from java/java-impl/src/com/intellij/lexer/_JavaLexer.java rename to java/java-psi-impl/src/com/intellij/lexer/_JavaLexer.java diff --git a/java/java-impl/src/com/intellij/psi/Bottom.java b/java/java-psi-impl/src/com/intellij/psi/Bottom.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/Bottom.java rename to java/java-psi-impl/src/com/intellij/psi/Bottom.java diff --git a/java/java-impl/src/com/intellij/psi/ClassFileViewProvider.java b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/ClassFileViewProvider.java rename to java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java diff --git a/java/java-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java rename to java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java diff --git a/java/java-impl/src/com/intellij/psi/PsiTypeVariable.java b/java/java-psi-impl/src/com/intellij/psi/PsiTypeVariable.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/PsiTypeVariable.java rename to java/java-psi-impl/src/com/intellij/psi/PsiTypeVariable.java diff --git a/java/java-impl/src/com/intellij/psi/PsiTypeVisitorEx.java b/java/java-psi-impl/src/com/intellij/psi/PsiTypeVisitorEx.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/PsiTypeVisitorEx.java rename to java/java-psi-impl/src/com/intellij/psi/PsiTypeVisitorEx.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/AnalysisCanceledException.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/AnalysisCanceledException.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/AnalysisCanceledException.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/AnalysisCanceledException.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/AnalysisCanceledSoftException.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/AnalysisCanceledSoftException.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/AnalysisCanceledSoftException.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/AnalysisCanceledSoftException.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/BranchingInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/BranchingInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/BranchingInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/BranchingInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/CallInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CallInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/CallInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/CallInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/CommentInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CommentInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/CommentInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/CommentInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalGoToInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalThrowToInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlow.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlow.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlow.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlow.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowFactory.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowFactory.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowFactory.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowFactory.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowInstructionVisitor.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowInstructionVisitor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowInstructionVisitor.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowInstructionVisitor.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowPolicy.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowPolicy.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowPolicy.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowPolicy.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowStack.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowStack.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowStack.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowStack.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowSubRange.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/EmptyInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/EmptyInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/EmptyInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/EmptyInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/Instruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/Instruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/Instruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/Instruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/InstructionBase.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/InstructionBase.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/InstructionBase.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/InstructionBase.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/InstructionClientVisitor.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/InstructionClientVisitor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/InstructionClientVisitor.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/InstructionClientVisitor.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/LocalsOrMyInstanceFieldsControlFlowPolicy.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/LocalsOrMyInstanceFieldsControlFlowPolicy.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/LocalsOrMyInstanceFieldsControlFlowPolicy.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/LocalsOrMyInstanceFieldsControlFlowPolicy.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ReadVariableInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ReturnStatementsVisitor.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnStatementsVisitor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ReturnStatementsVisitor.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnStatementsVisitor.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/SimpleInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/SimpleInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/SimpleInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/SimpleInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java rename to java/java-psi-impl/src/com/intellij/psi/controlFlow/WriteVariableInstruction.java diff --git a/java/java-impl/src/com/intellij/psi/filters/ConstructorFilter.java b/java/java-psi-impl/src/com/intellij/psi/filters/ConstructorFilter.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/filters/ConstructorFilter.java rename to java/java-psi-impl/src/com/intellij/psi/filters/ConstructorFilter.java diff --git a/java/java-impl/src/com/intellij/psi/filters/classes/AnnotationTypeFilter.java b/java/java-psi-impl/src/com/intellij/psi/filters/classes/AnnotationTypeFilter.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/filters/classes/AnnotationTypeFilter.java rename to java/java-psi-impl/src/com/intellij/psi/filters/classes/AnnotationTypeFilter.java diff --git a/java/java-impl/src/com/intellij/psi/filters/element/ModifierFilter.java b/java/java-psi-impl/src/com/intellij/psi/filters/element/ModifierFilter.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/filters/element/ModifierFilter.java rename to java/java-psi-impl/src/com/intellij/psi/filters/element/ModifierFilter.java diff --git a/java/java-impl/src/com/intellij/psi/impl/ConstantExpressionEvaluator.java b/java/java-psi-impl/src/com/intellij/psi/impl/ConstantExpressionEvaluator.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/ConstantExpressionEvaluator.java rename to java/java-psi-impl/src/com/intellij/psi/impl/ConstantExpressionEvaluator.java diff --git a/java/java-impl/src/com/intellij/psi/impl/ConstantExpressionVisitor.java b/java/java-psi-impl/src/com/intellij/psi/impl/ConstantExpressionVisitor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/ConstantExpressionVisitor.java rename to java/java-psi-impl/src/com/intellij/psi/impl/ConstantExpressionVisitor.java diff --git a/java/java-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java rename to java/java-psi-impl/src/com/intellij/psi/impl/JavaConstantExpressionEvaluator.java diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeEx.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeEx.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeEx.java rename to java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeEx.java diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelper.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelper.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelper.java rename to java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelper.java diff --git a/java/java-impl/src/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java b/java/java-psi-impl/src/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java rename to java/java-psi-impl/src/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiConstantEvaluationHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiConstantEvaluationHelperImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/PsiConstantEvaluationHelperImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/PsiConstantEvaluationHelperImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiVariableEx.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiVariableEx.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/PsiVariableEx.java rename to java/java-psi-impl/src/com/intellij/psi/impl/PsiVariableEx.java diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/ModifierFlags.java b/java/java-psi-impl/src/com/intellij/psi/impl/cache/ModifierFlags.java similarity index 100% rename from platform/lang-impl/src/com/intellij/psi/impl/cache/ModifierFlags.java rename to java/java-psi-impl/src/com/intellij/psi/impl/cache/ModifierFlags.java diff --git a/java/java-impl/src/com/intellij/psi/impl/cache/RecordUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/cache/RecordUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/cache/RecordUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/cache/RecordUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/cache/TypeInfo.java b/java/java-psi-impl/src/com/intellij/psi/impl/cache/TypeInfo.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/cache/TypeInfo.java rename to java/java-psi-impl/src/com/intellij/psi/impl/cache/TypeInfo.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationParameterListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsAnnotationValueImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsArrayInitializerMemberValueImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsBinaryExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsBinaryExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsBinaryExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsBinaryExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java similarity index 95% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java index 6809e2117cbd..9b4af1859b8d 100644 --- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassObjectAccessExpressionImpl.java @@ -17,6 +17,7 @@ package com.intellij.psi.impl.compiled; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; +import com.intellij.psi.impl.ElementBase; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.impl.source.SourceTreeToPsiMap; import com.intellij.psi.impl.source.tree.TreeElement; @@ -87,7 +88,7 @@ public class ClsClassObjectAccessExpressionImpl extends ClsElementImpl implement } public Icon getElementIcon(final int flags) { - final RowIcon rowIcon = createLayeredIcon(this, PlatformIcons.FIELD_ICON, 0); + final RowIcon rowIcon = ElementBase.createLayeredIcon(this, PlatformIcons.FIELD_ICON, 0); rowIcon.setIcon(PlatformIcons.PUBLIC_ICON, 1); return rowIcon; } diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsDocCommentImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsEnumConstantImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaTokenImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaTokenImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaTokenImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaTokenImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsLiteralExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsMethodImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsModifierListOwner.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListOwner.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsModifierListOwner.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsModifierListOwner.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsNameValuePairImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsPackageStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParameterImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParameterListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsPrefixExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsReferenceParametersListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsRepositoryPsiElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsRepositoryPsiElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsRepositoryPsiElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsRepositoryPsiElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParametersListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaAnnotationElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaAnnotationElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaAnnotationElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaAnnotationElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaClassElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaClassElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaClassElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaClassElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaClassInitializerElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaClassInitializerElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaClassInitializerElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaClassInitializerElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaClassReferenceListElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaClassReferenceListElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaClassReferenceListElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaClassReferenceListElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaFieldStubElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaFieldStubElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaFieldStubElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaFieldStubElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaImportListElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaImportListElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaImportListElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaImportListElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaImportStatementElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaImportStatementElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaImportStatementElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaImportStatementElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaMethodElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaMethodElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaMethodElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaMethodElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaModifierListElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaModifierListElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaModifierListElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaModifierListElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterListElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterListElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterListElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaParameterListElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterListElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterListElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterListElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaTypeParameterListElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiAnnotationStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiAnnotationStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiAnnotationStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiAnnotationStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiClassInitializerStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassInitializerStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiClassInitializerStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassInitializerStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiClassReferenceListStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassReferenceListStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiClassReferenceListStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassReferenceListStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiClassStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiFieldStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiFieldStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiFieldStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiFieldStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiImportListStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiImportListStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiImportListStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiImportListStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiImportStatementStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiImportStatementStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiImportStatementStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiImportStatementStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiJavaFileStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiMethodStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiModifierListStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiModifierListStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiModifierListStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiModifierListStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiParameterListStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiParameterListStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiParameterListStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiParameterListStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiParameterStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiParameterStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiParameterStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiParameterStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterListStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterListStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterListStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterListStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterStub.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterStub.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/PsiTypeParameterStub.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassInitializerStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassReferenceListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassReferenceListStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassReferenceListStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassReferenceListStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiClassStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiFieldStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiFieldStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiFieldStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiFieldStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportListStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportStatementStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportStatementStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportStatementStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiImportStatementStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiJavaFileStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiJavaFileStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiJavaFileStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiJavaFileStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiMethodStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiModifierListStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterListStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiParameterStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterListStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiTypeParameterStubImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaStubIndexKeys.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/index/JavaStubIndexKeys.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaStubIndexKeys.java rename to java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/index/JavaStubIndexKeys.java diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightClass.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightClass.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/light/LightClass.java rename to java/java-psi-impl/src/com/intellij/psi/impl/light/LightClass.java diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightClassReference.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightClassReference.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/light/LightClassReference.java rename to java/java-psi-impl/src/com/intellij/psi/impl/light/LightClassReference.java diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightEmptyImplementsList.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightEmptyImplementsList.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/light/LightEmptyImplementsList.java rename to java/java-psi-impl/src/com/intellij/psi/impl/light/LightEmptyImplementsList.java diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightMethod.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/light/LightMethod.java rename to java/java-psi-impl/src/com/intellij/psi/impl/light/LightMethod.java diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightReferenceParameterList.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightReferenceParameterList.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/light/LightReferenceParameterList.java rename to java/java-psi-impl/src/com/intellij/psi/impl/light/LightReferenceParameterList.java diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightTypeParameter.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameter.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/light/LightTypeParameter.java rename to java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameter.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/Constants.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/Constants.java similarity index 85% rename from java/java-impl/src/com/intellij/psi/impl/source/Constants.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/Constants.java index 607c7efaa8eb..166dc1767e61 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/Constants.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/Constants.java @@ -17,6 +17,7 @@ package com.intellij.psi.impl.source; import com.intellij.psi.*; import com.intellij.psi.impl.source.tree.ElementType; +import com.intellij.psi.impl.source.tree.JavaElementType; import com.intellij.psi.tree.TokenSet; public interface Constants extends ElementType { @@ -112,13 +113,13 @@ public interface Constants extends ElementType { } }; - TokenSet CLASS_BIT_SET = TokenSet.create(CLASS, ANONYMOUS_CLASS, ENUM_CONSTANT_INITIALIZER); - TokenSet FIELD_BIT_SET = TokenSet.create(FIELD, ENUM_CONSTANT); - TokenSet METHOD_BIT_SET = TokenSet.create(METHOD, ANNOTATION_METHOD); - TokenSet CLASS_INITIALIZER_BIT_SET = TokenSet.create(CLASS_INITIALIZER); - TokenSet PARAMETER_BIT_SET = TokenSet.create(PARAMETER); - TokenSet CATCH_SECTION_BIT_SET = TokenSet.create(CATCH_SECTION); - TokenSet JAVA_CODE_REFERENCE_BIT_SET = TokenSet.create(JAVA_CODE_REFERENCE); - TokenSet NAME_VALUE_PAIR_BIT_SET = TokenSet.create(NAME_VALUE_PAIR); - TokenSet ANNOTATION_BIT_SET = TokenSet.create(ANNOTATION); + TokenSet CLASS_BIT_SET = TokenSet.create(JavaElementType.CLASS, JavaElementType.ANONYMOUS_CLASS, JavaElementType.ENUM_CONSTANT_INITIALIZER); + TokenSet FIELD_BIT_SET = TokenSet.create(JavaElementType.FIELD, JavaElementType.ENUM_CONSTANT); + TokenSet METHOD_BIT_SET = TokenSet.create(JavaElementType.METHOD, JavaElementType.ANNOTATION_METHOD); + TokenSet CLASS_INITIALIZER_BIT_SET = TokenSet.create(JavaElementType.CLASS_INITIALIZER); + TokenSet PARAMETER_BIT_SET = TokenSet.create(JavaElementType.PARAMETER); + TokenSet CATCH_SECTION_BIT_SET = TokenSet.create(JavaElementType.CATCH_SECTION); + TokenSet JAVA_CODE_REFERENCE_BIT_SET = TokenSet.create(JavaElementType.JAVA_CODE_REFERENCE); + TokenSet NAME_VALUE_PAIR_BIT_SET = TokenSet.create(JavaElementType.NAME_VALUE_PAIR); + TokenSet ANNOTATION_BIT_SET = TokenSet.create(JavaElementType.ANNOTATION); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/HierarchicalMethodSignatureImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/HierarchicalMethodSignatureImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/HierarchicalMethodSignatureImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/HierarchicalMethodSignatureImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/JavaDummyElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaDummyElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/JavaDummyElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/JavaDummyElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/JavaDummyHolder.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiAnnotationMethodImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiAnonymousClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiAnonymousClassImpl.java similarity index 97% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiAnonymousClassImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiAnonymousClassImpl.java index ac0fbc95b8be..3f31cafe4989 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiAnonymousClassImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiAnonymousClassImpl.java @@ -17,8 +17,6 @@ package com.intellij.psi.impl.source; import com.intellij.lang.ASTNode; import com.intellij.psi.*; -import com.intellij.psi.impl.PsiClassImplUtil; -import com.intellij.psi.impl.PsiSuperMethodImplUtil; import com.intellij.psi.impl.java.stubs.JavaStubElementTypes; import com.intellij.psi.impl.java.stubs.PsiClassStub; import com.intellij.psi.impl.source.tree.ChildRole; @@ -28,8 +26,6 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.PatchedSoftReference; import org.jetbrains.annotations.NotNull; -import java.util.Collection; - public class PsiAnonymousClassImpl extends PsiClassImpl implements PsiAnonymousClass { private PatchedSoftReference myCachedBaseType = null; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiClassInitializerImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassInitializerImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiClassInitializerImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassInitializerImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiDiamondTypeElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiDiamondTypeElementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiDiamondTypeElementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiDiamondTypeElementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiImportStatementBaseImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStatementBaseImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiImportStatementBaseImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStatementBaseImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java similarity index 99% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java index 3c2aa6e458af..eae30113a56d 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java @@ -58,7 +58,7 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme public static final int CLASS_FQ_OR_PACKAGE_NAME_KIND = 5; public static final int CLASS_IN_QUALIFIED_NEW_KIND = 6; - private final int myHC = ourHC++; + private final int myHC = CompositePsiElement.ourHC++; @Override public final int hashCode() { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java similarity index 99% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java index f4b65ce0302d..f5a33d3b309f 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java @@ -29,6 +29,7 @@ import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.impl.JavaPsiImplementationHelper; +import com.intellij.psi.impl.PsiFileEx; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.impl.java.stubs.JavaStubElementTypes; import com.intellij.psi.impl.java.stubs.PsiJavaFileStub; @@ -244,7 +245,7 @@ public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJava PsiElement lastParent, @NotNull PsiElement place) { if (processor instanceof ClassResolverProcessor && isPhysical() && - (getUserData(BATCH_REFERENCE_PROCESSING) == Boolean.TRUE || myResolveCache.hasUpToDateValue())) { + (getUserData(PsiFileEx.BATCH_REFERENCE_PROCESSING) == Boolean.TRUE || myResolveCache.hasUpToDateValue())) { final ClassResolverProcessor hint = (ClassResolverProcessor)processor; String name = hint.getName(state); MostlySingularMultiMap cache = myResolveCache.getValue(); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodReceiverImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiReferenceListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiReferenceListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiReferenceListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiReferenceListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiTypeElementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/SourceJavaCodeReference.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/SourceJavaCodeReference.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/SourceJavaCodeReference.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/SourceJavaCodeReference.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java similarity index 98% rename from java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java index 7af04d6dce88..4af44bbc9ca8 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java @@ -25,6 +25,7 @@ import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.JavaScopeProcessorEvent; import com.intellij.psi.scope.NameHint; +import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.util.SmartList; import java.util.Iterator; @@ -84,7 +85,7 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi private boolean myStaticContext = false; - public void handleEvent(Event event, Object associated) { + public void handleEvent(PsiScopeProcessor.Event event, Object associated) { if (event == JavaScopeProcessorEvent.START_STATIC) { myStaticContext = true; } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/Domination.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/Domination.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/resolve/Domination.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/Domination.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveCache.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java similarity index 94% rename from java/java-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java index 1c848ed65751..46d32ae49118 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/SymbolCollectingProcessor.java @@ -22,6 +22,7 @@ import com.intellij.psi.ResolveState; import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.JavaScopeProcessorEvent; +import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.util.containers.MostlySingularMultiMap; /** @@ -33,7 +34,7 @@ public class SymbolCollectingProcessor extends BaseScopeProcessor implements Ele @Override public T getHint(Key hintKey) { - if (hintKey == KEY) { + if (hintKey == ElementClassHint.KEY) { //noinspection unchecked return (T)this; } @@ -41,7 +42,7 @@ public class SymbolCollectingProcessor extends BaseScopeProcessor implements Ele } @Override - public void handleEvent(Event event, Object associated) { + public void handleEvent(PsiScopeProcessor.Event event, Object associated) { if (event == JavaScopeProcessorEvent.SET_CURRENT_FILE_CONTEXT) { myCurrentFileContext = (PsiElement)associated; } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java similarity index 96% rename from java/java-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java index 17aa8205a74c..dbfc2650039b 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/VariableResolverProcessor.java @@ -24,6 +24,7 @@ import com.intellij.psi.scope.ElementClassFilter; import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.JavaScopeProcessorEvent; import com.intellij.psi.scope.PsiConflictResolver; +import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.psi.scope.conflictResolvers.JavaVariableConflictResolver; import com.intellij.psi.scope.processor.ConflictFilterProcessor; import com.intellij.psi.util.PsiUtil; @@ -66,7 +67,7 @@ public class VariableResolverProcessor extends ConflictFilterProcessor implement myAccessClass = access; } - public final void handleEvent(Event event, Object associated) { + public final void handleEvent(PsiScopeProcessor.Event event, Object associated) { super.handleEvent(event, associated); if(event == JavaScopeProcessorEvent.START_STATIC){ myStaticScopeFlag = true; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/ChildRole.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ChildRole.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/ChildRole.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ChildRole.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/ElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/ElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaDocElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaDocElementType.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/JavaDocElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaDocElementType.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java similarity index 98% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java index 0b0197e6e50f..529aceffb89e 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java @@ -172,13 +172,13 @@ public interface JavaElementType { final Lexer lexer = new JavaLexer(LanguageLevel.HIGHEST); lexer.start(seq); - if (lexer.getTokenType() != JavaTokenType.LBRACE) return FATAL_ERROR; + if (lexer.getTokenType() != JavaTokenType.LBRACE) return IErrorCounterReparseableElementType.FATAL_ERROR; lexer.advance(); int balance = 1; while (true) { IElementType type = lexer.getTokenType(); if (type == null) break; - if (balance == 0) return FATAL_ERROR; + if (balance == 0) return IErrorCounterReparseableElementType.FATAL_ERROR; if (type == JavaTokenType.LBRACE) { balance++; } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/SourceUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/SourceUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/SourceUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/SourceUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/injected/StringLiteralEscaper.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationMethodElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationMethodElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationMethodElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationMethodElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElement.java similarity index 82% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElement.java index 976ec18bdb33..c5d5d4974f91 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElement.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElement.java @@ -15,11 +15,6 @@ */ package com.intellij.psi.impl.source.tree.java; -import com.intellij.psi.JavaTokenType; -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.psi.impl.source.tree.*; -import com.intellij.psi.JavaTokenType; - public class AnonymousClassElement extends AnonymousClassElementBase { public AnonymousClassElement() { super(ANONYMOUS_CLASS); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantInitializerElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantInitializerElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantInitializerElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantInitializerElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ExpressionPsiElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ExpressionPsiElement.java similarity index 96% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ExpressionPsiElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ExpressionPsiElement.java index b229c9327a4e..032a7542cb2e 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ExpressionPsiElement.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ExpressionPsiElement.java @@ -25,7 +25,7 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; public class ExpressionPsiElement extends CompositePsiElement { - private final int myHC = ourHC++; + private final int myHC = CompositePsiElement.ourHC++; @Override public final int hashCode() { diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ExtendsListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ExtendsListElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ExtendsListElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ExtendsListElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/FieldElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/FieldElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/FieldElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/FieldElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImplementsListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImplementsListElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImplementsListElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImplementsListElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImportListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportListElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImportListElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportListElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImportStaticStatementElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStaticStatementElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ImportStaticStatementElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStaticStatementElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationParameterListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationParameterListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAnnotationParameterListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerMemberValueImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java similarity index 95% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java index 47cb75c351fc..1016783f90bd 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java @@ -18,6 +18,7 @@ package com.intellij.psi.impl.source.tree.java; import com.intellij.lang.ASTNode; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; +import com.intellij.psi.impl.ElementBase; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.impl.source.Constants; import com.intellij.psi.impl.source.tree.ChildRole; @@ -99,7 +100,7 @@ public class PsiClassObjectAccessExpressionImpl extends ExpressionPsiElement imp @NotNull public Icon getElementIcon(final int flags) { - final RowIcon rowIcon = createLayeredIcon(this, PlatformIcons.FIELD_ICON, 0); + final RowIcon rowIcon = ElementBase.createLayeredIcon(this, PlatformIcons.FIELD_ICON, 0); rowIcon.setIcon(PlatformIcons.PUBLIC_ICON, 1); return rowIcon; } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCommaSeparatedListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCommaSeparatedListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCommaSeparatedListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCommaSeparatedListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDeclarationStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiEmptyExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiEmptyExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiEmptyExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiEmptyExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiEmptyStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiEmptyStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiEmptyStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiEmptyStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiInlineDocTagImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiInlineDocTagImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiInlineDocTagImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiInlineDocTagImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiResourceListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiResourceListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiResourceListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiResourceListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiResourceVariableImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiResourceVariableImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiResourceVariableImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiResourceVariableImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowsListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowsListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowsListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowsListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterExtendsBoundsListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterExtendsBoundsListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterExtendsBoundsListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterExtendsBoundsListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ReferenceListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReferenceListElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ReferenceListElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReferenceListElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterExtendsBoundsListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterExtendsBoundsListElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterExtendsBoundsListElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterExtendsBoundsListElement.java diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java diff --git a/java/java-impl/src/com/intellij/psi/scope/ElementClassFilter.java b/java/java-psi-impl/src/com/intellij/psi/scope/ElementClassFilter.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/ElementClassFilter.java rename to java/java-psi-impl/src/com/intellij/psi/scope/ElementClassFilter.java diff --git a/java/java-impl/src/com/intellij/psi/scope/ElementClassHint.java b/java/java-psi-impl/src/com/intellij/psi/scope/ElementClassHint.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/ElementClassHint.java rename to java/java-psi-impl/src/com/intellij/psi/scope/ElementClassHint.java diff --git a/java/java-impl/src/com/intellij/psi/scope/MethodProcessorSetupFailedException.java b/java/java-psi-impl/src/com/intellij/psi/scope/MethodProcessorSetupFailedException.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/MethodProcessorSetupFailedException.java rename to java/java-psi-impl/src/com/intellij/psi/scope/MethodProcessorSetupFailedException.java diff --git a/java/java-impl/src/com/intellij/psi/scope/NameHint.java b/java/java-psi-impl/src/com/intellij/psi/scope/NameHint.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/NameHint.java rename to java/java-psi-impl/src/com/intellij/psi/scope/NameHint.java diff --git a/java/java-impl/src/com/intellij/psi/scope/PsiConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/PsiConflictResolver.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/PsiConflictResolver.java rename to java/java-psi-impl/src/com/intellij/psi/scope/PsiConflictResolver.java diff --git a/java/java-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java rename to java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/DuplicateConflictResolver.java diff --git a/java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java rename to java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java diff --git a/java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaVariableConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaVariableConflictResolver.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaVariableConflictResolver.java rename to java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaVariableConflictResolver.java diff --git a/java/java-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java similarity index 96% rename from java/java-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java index 6f587da170e0..2716f9f6695b 100644 --- a/java/java-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java @@ -22,6 +22,7 @@ import com.intellij.psi.infos.CandidateInfo; import com.intellij.psi.scope.JavaScopeProcessorEvent; import com.intellij.psi.scope.NameHint; import com.intellij.psi.scope.PsiConflictResolver; +import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.psi.util.PsiUtil; import java.util.List; @@ -64,7 +65,7 @@ public class ConflictFilterProcessor extends FilterScopeProcessor myResults.add(info); } - public void handleEvent(Event event, Object associated) { + public void handleEvent(PsiScopeProcessor.Event event, Object associated) { if (event == JavaScopeProcessorEvent.CHANGE_LEVEL && myName != null) { getResult(); } diff --git a/java/java-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java similarity index 93% rename from java/java-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java index 466bc063fbd4..ccd5b8f63128 100644 --- a/java/java-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/processor/FilterScopeProcessor.java @@ -55,11 +55,11 @@ public class FilterScopeProcessor extends BaseScopeProcessor { myResults = container; } - public void handleEvent(Event event, Object associated) { + public void handleEvent(PsiScopeProcessor.Event event, Object associated) { if (myProcessor != null) { myProcessor.handleEvent(event, associated); } - if (event == Event.SET_DECLARATION_HOLDER && associated instanceof PsiElement) { + if (event == PsiScopeProcessor.Event.SET_DECLARATION_HOLDER && associated instanceof PsiElement) { myCurrentDeclarationHolder = (PsiElement)associated; } } diff --git a/java/java-impl/src/com/intellij/psi/scope/processor/MethodCandidatesProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodCandidatesProcessor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/processor/MethodCandidatesProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodCandidatesProcessor.java diff --git a/java/java-impl/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodResolverProcessor.java diff --git a/java/java-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java rename to java/java-psi-impl/src/com/intellij/psi/scope/processor/MethodsProcessor.java diff --git a/java/java-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java rename to java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java diff --git a/java/java-impl/src/com/intellij/util/text/LiteralFormatUtil.java b/java/java-psi-impl/src/com/intellij/util/text/LiteralFormatUtil.java similarity index 100% rename from java/java-impl/src/com/intellij/util/text/LiteralFormatUtil.java rename to java/java-psi-impl/src/com/intellij/util/text/LiteralFormatUtil.java diff --git a/java/java-tests/testSrc/com/intellij/psi/Src15RepositoryUseTest.java b/java/java-tests/testSrc/com/intellij/psi/Src15RepositoryUseTest.java index b3fd5a1a4e28..ad729dd5482d 100644 --- a/java/java-tests/testSrc/com/intellij/psi/Src15RepositoryUseTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/Src15RepositoryUseTest.java @@ -1,7 +1,6 @@ package com.intellij.psi; import com.intellij.openapi.application.ex.PathManagerEx; -import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.openapi.vfs.VirtualFile; diff --git a/java/java-tests/testSrc/com/intellij/psi/resolve/Resolve15TestCase.java b/java/java-tests/testSrc/com/intellij/psi/resolve/Resolve15TestCase.java index 4abe3d580899..f88fa3c20f91 100644 --- a/java/java-tests/testSrc/com/intellij/psi/resolve/Resolve15TestCase.java +++ b/java/java-tests/testSrc/com/intellij/psi/resolve/Resolve15TestCase.java @@ -3,8 +3,6 @@ */ package com.intellij.psi.resolve; -import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.pom.java.LanguageLevel; import com.intellij.testFramework.ResolveTestCase; diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java index 34f7b9b2cc86..8878b8ab35f4 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java @@ -3,7 +3,6 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.openapi.vfs.LocalFileSystem; @@ -22,7 +21,6 @@ import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.PsiTestUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; -import junit.framework.Assert; import org.jetbrains.annotations.NonNls; import java.io.File; diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java index 42230c401e1f..012a9e96808a 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java @@ -4,8 +4,6 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; -import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; diff --git a/java/openapi/openapi.iml b/java/openapi/openapi.iml index d9b23a58fd36..f555da38dee0 100644 --- a/java/openapi/openapi.iml +++ b/java/openapi/openapi.iml @@ -24,6 +24,7 @@ +