diff --git a/source/com/intellij/ide/impl/PackagesPaneSelectInTarget.java b/java/java-impl/src/com/intellij/ide/impl/PackagesPaneSelectInTarget.java similarity index 100% rename from source/com/intellij/ide/impl/PackagesPaneSelectInTarget.java rename to java/java-impl/src/com/intellij/ide/impl/PackagesPaneSelectInTarget.java diff --git a/source/com/intellij/projectView/LibrariesElement.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/LibrariesElement.java similarity index 98% rename from source/com/intellij/projectView/LibrariesElement.java rename to java/java-impl/src/com/intellij/ide/projectView/impl/nodes/LibrariesElement.java index 6f650abadf5c..647f6c7054ad 100644 --- a/source/com/intellij/projectView/LibrariesElement.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/LibrariesElement.java @@ -29,7 +29,7 @@ * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * */ -package com.intellij.projectView; +package com.intellij.ide.projectView.impl.nodes; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewLibrariesNode.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewLibrariesNode.java index 8ebafdba764d..6cfdb2eb4d57 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewLibrariesNode.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewLibrariesNode.java @@ -35,6 +35,7 @@ import com.intellij.ide.IdeBundle; import com.intellij.ide.projectView.PresentationData; import com.intellij.ide.projectView.ProjectViewNode; import com.intellij.ide.projectView.ViewSettings; +import com.intellij.ide.projectView.impl.nodes.LibrariesElement; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -42,7 +43,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.*; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.projectView.LibrariesElement; import com.intellij.util.Icons; import org.jetbrains.annotations.NotNull; diff --git a/source/com/intellij/ide/util/FQNameCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java similarity index 100% rename from source/com/intellij/ide/util/FQNameCellRenderer.java rename to java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java diff --git a/source/com/intellij/ide/util/JavaDeleteTypeDescriptionProvider.java b/java/java-impl/src/com/intellij/ide/util/JavaDeleteTypeDescriptionProvider.java similarity index 100% rename from source/com/intellij/ide/util/JavaDeleteTypeDescriptionProvider.java rename to java/java-impl/src/com/intellij/ide/util/JavaDeleteTypeDescriptionProvider.java diff --git a/source/com/intellij/ide/util/JavaUtil.java b/java/java-impl/src/com/intellij/ide/util/JavaUtil.java similarity index 100% rename from source/com/intellij/ide/util/JavaUtil.java rename to java/java-impl/src/com/intellij/ide/util/JavaUtil.java diff --git a/source/com/intellij/ide/util/JavaUtilForVfs.java b/java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java similarity index 100% rename from source/com/intellij/ide/util/JavaUtilForVfs.java rename to java/java-impl/src/com/intellij/ide/util/JavaUtilForVfs.java diff --git a/source/com/intellij/ide/util/MethodCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/MethodCellRenderer.java similarity index 100% rename from source/com/intellij/ide/util/MethodCellRenderer.java rename to java/java-impl/src/com/intellij/ide/util/MethodCellRenderer.java diff --git a/source/com/intellij/ide/util/PackageChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java similarity index 100% rename from source/com/intellij/ide/util/PackageChooserDialog.java rename to java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java diff --git a/source/com/intellij/ide/util/PackageUtil.java b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java similarity index 100% rename from source/com/intellij/ide/util/PackageUtil.java rename to java/java-impl/src/com/intellij/ide/util/PackageUtil.java diff --git a/source/com/intellij/ide/util/PsiClassListCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/PsiClassListCellRenderer.java similarity index 100% rename from source/com/intellij/ide/util/PsiClassListCellRenderer.java rename to java/java-impl/src/com/intellij/ide/util/PsiClassListCellRenderer.java diff --git a/source/com/intellij/ide/util/SuperMethodWarningDialog.java b/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java similarity index 99% rename from source/com/intellij/ide/util/SuperMethodWarningDialog.java rename to java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java index 5e38475870dd..4b518f82e436 100644 --- a/source/com/intellij/ide/util/SuperMethodWarningDialog.java +++ b/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java @@ -1,4 +1,3 @@ - package com.intellij.ide.util; import com.intellij.CommonBundle; diff --git a/source/com/intellij/ide/util/SuperMethodWarningUtil.java b/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningUtil.java similarity index 100% rename from source/com/intellij/ide/util/SuperMethodWarningUtil.java rename to java/java-impl/src/com/intellij/ide/util/SuperMethodWarningUtil.java diff --git a/source/com/intellij/ide/util/TreeClassChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java similarity index 100% rename from source/com/intellij/ide/util/TreeClassChooserDialog.java rename to java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java diff --git a/source/com/intellij/ide/util/TreeClassChooserFactoryImpl.java b/java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java similarity index 100% rename from source/com/intellij/ide/util/TreeClassChooserFactoryImpl.java rename to java/java-impl/src/com/intellij/ide/util/TreeClassChooserFactoryImpl.java diff --git a/source/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java b/java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java similarity index 100% rename from source/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java rename to java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java diff --git a/source/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java b/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java similarity index 100% rename from source/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java rename to java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java diff --git a/source/com/intellij/ide/util/scopeChooser/HierarchyScopeDescriptorProvider.java b/java/java-impl/src/com/intellij/ide/util/scopeChooser/HierarchyScopeDescriptorProvider.java similarity index 100% rename from source/com/intellij/ide/util/scopeChooser/HierarchyScopeDescriptorProvider.java rename to java/java-impl/src/com/intellij/ide/util/scopeChooser/HierarchyScopeDescriptorProvider.java diff --git a/source/com/intellij/lexer/EscapedJavaLexer.java b/java/java-impl/src/com/intellij/lexer/EscapedJavaLexer.java similarity index 99% rename from source/com/intellij/lexer/EscapedJavaLexer.java rename to java/java-impl/src/com/intellij/lexer/EscapedJavaLexer.java index 1f0e7951a53b..ed8be4eee37e 100644 --- a/source/com/intellij/lexer/EscapedJavaLexer.java +++ b/java/java-impl/src/com/intellij/lexer/EscapedJavaLexer.java @@ -1,4 +1,3 @@ - package com.intellij.lexer; import com.intellij.pom.java.LanguageLevel; diff --git a/source/com/intellij/lexer/JavaHighlightingLexer.java b/java/java-impl/src/com/intellij/lexer/JavaHighlightingLexer.java similarity index 100% rename from source/com/intellij/lexer/JavaHighlightingLexer.java rename to java/java-impl/src/com/intellij/lexer/JavaHighlightingLexer.java diff --git a/source/com/intellij/lexer/JavaLexer.java b/java/java-impl/src/com/intellij/lexer/JavaLexer.java similarity index 100% rename from source/com/intellij/lexer/JavaLexer.java rename to java/java-impl/src/com/intellij/lexer/JavaLexer.java diff --git a/source/com/intellij/lexer/_JavaLexer.java b/java/java-impl/src/com/intellij/lexer/_JavaLexer.java similarity index 100% rename from source/com/intellij/lexer/_JavaLexer.java rename to java/java-impl/src/com/intellij/lexer/_JavaLexer.java diff --git a/source/com/intellij/psi/impl/ConstantExpressionEvaluator.java b/java/java-impl/src/com/intellij/psi/impl/ConstantExpressionEvaluator.java similarity index 100% rename from source/com/intellij/psi/impl/ConstantExpressionEvaluator.java rename to java/java-impl/src/com/intellij/psi/impl/ConstantExpressionEvaluator.java diff --git a/source/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java b/java/java-impl/src/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java similarity index 100% rename from source/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java rename to java/java-impl/src/com/intellij/psi/impl/LanguageConstantExpressionEvaluator.java diff --git a/source/com/intellij/psi/impl/PsiExpressionEvaluator.java b/java/java-impl/src/com/intellij/psi/impl/PsiExpressionEvaluator.java similarity index 100% rename from source/com/intellij/psi/impl/PsiExpressionEvaluator.java rename to java/java-impl/src/com/intellij/psi/impl/PsiExpressionEvaluator.java diff --git a/source/com/intellij/psi/impl/source/tree/java/JavaAnnotationSupport.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/JavaAnnotationSupport.java similarity index 100% rename from source/com/intellij/psi/impl/source/tree/java/JavaAnnotationSupport.java rename to java/java-impl/src/com/intellij/psi/impl/source/tree/java/JavaAnnotationSupport.java diff --git a/source/com/intellij/openapi/roots/impl/OrderEntryUtil.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java similarity index 100% rename from source/com/intellij/openapi/roots/impl/OrderEntryUtil.java rename to platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java