diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/artifacts/ArtifactsGenerator.java b/java/compiler/impl/src/com/intellij/compiler/ant/artifacts/ArtifactsGenerator.java index 20f471b8e055..ed75a4d87f02 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/artifacts/ArtifactsGenerator.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/artifacts/ArtifactsGenerator.java @@ -7,7 +7,7 @@ import com.intellij.compiler.ant.Comment; import com.intellij.compiler.ant.taskdefs.*; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.artifacts.ArtifactManager; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactModelImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactModelImpl.java index ff31df0de210..e0a7b73a0b17 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactModelImpl.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactModelImpl.java @@ -1,6 +1,6 @@ package com.intellij.packaging.impl.artifacts; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.packaging.artifacts.*; import com.intellij.util.EventDispatcher; import org.jetbrains.annotations.NotNull; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java similarity index 99% rename from java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactUtil.java rename to java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java index 556fbe1dd697..d27380b6267a 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactUtil.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java @@ -1,7 +1,9 @@ -package com.intellij.openapi.roots.ui.configuration.artifacts; +package com.intellij.packaging.impl.artifacts; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.CompilerProjectExtension; +import com.intellij.packaging.impl.artifacts.PackagingElementProcessor; +import com.intellij.packaging.impl.artifacts.ParentElementProcessor; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementProcessor.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementProcessor.java similarity index 93% rename from java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementProcessor.java rename to java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementProcessor.java index 06cc8dcd1db7..96970f4aa264 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/PackagingElementProcessor.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PackagingElementProcessor.java @@ -1,4 +1,4 @@ -package com.intellij.openapi.roots.ui.configuration.artifacts; +package com.intellij.packaging.impl.artifacts; import com.intellij.openapi.util.text.StringUtil; import com.intellij.packaging.elements.ComplexPackagingElement; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ParentElementProcessor.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ParentElementProcessor.java similarity index 88% rename from java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ParentElementProcessor.java rename to java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ParentElementProcessor.java index aaa539e1c10c..f2d53aa14560 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ParentElementProcessor.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ParentElementProcessor.java @@ -1,4 +1,4 @@ -package com.intellij.openapi.roots.ui.configuration.artifacts; +package com.intellij.packaging.impl.artifacts; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.elements.CompositePackagingElement; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java index 73813fa21064..bf7409936c2b 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactCompileScope.java @@ -4,7 +4,7 @@ import com.intellij.compiler.impl.ModuleCompileScope; import com.intellij.compiler.impl.ProjectCompileScope; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.openapi.util.Key; import com.intellij.openapi.compiler.CompileScope; import com.intellij.packaging.artifacts.Artifact; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java index 42bb2dc06e71..a079adc9a901 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java @@ -1,7 +1,7 @@ package com.intellij.packaging.impl.elements; import com.intellij.openapi.compiler.CompilerBundle; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.openapi.roots.ui.configuration.artifacts.ChooseArtifactsDialog; import com.intellij.openapi.project.Project; import com.intellij.packaging.artifacts.Artifact; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java index 14fefb4d52f2..e9dc4c3a6ac3 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java @@ -3,18 +3,14 @@ package com.intellij.packaging.impl.elements; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.project.Project; -import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; import com.intellij.openapi.roots.ui.configuration.packaging.ChooseLibrariesDialog; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.elements.CompositePackagingElement; import com.intellij.packaging.elements.PackagingElementType; import com.intellij.packaging.ui.PackagingEditorContext; import com.intellij.util.Icons; -import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java index 6bca34970e3c..e808faea31e8 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java @@ -5,8 +5,8 @@ import com.intellij.openapi.deployment.DeploymentUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; -import com.intellij.openapi.roots.ui.configuration.artifacts.PackagingElementProcessor; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.PackagingElementProcessor; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtil; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java index 76e26492e340..dc4214f8632a 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java @@ -6,7 +6,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDialog; import com.intellij.openapi.fileChooser.FileChooserFactory; import com.intellij.openapi.roots.OrderRootType; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; import com.intellij.openapi.ui.Messages; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java index 9fa86c36dfc5..f6328798b1ac 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactConfigurable.java @@ -9,6 +9,7 @@ import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.artifacts.ArtifactType; import com.intellij.packaging.elements.CompositePackagingElement; import com.intellij.packaging.ui.PackagingEditorContext; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import org.jetbrains.annotations.Nls; import javax.swing.*; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java index 6e410fb4a634..5355d33b48cf 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java @@ -24,6 +24,7 @@ import com.intellij.packaging.elements.CompositePackagingElement; import com.intellij.packaging.elements.PackagingElementType; import com.intellij.packaging.ui.ManifestFileConfiguration; import com.intellij.packaging.ui.PackagingEditorContext; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.ui.PopupHandler; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TabbedPaneWrapper; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java index 01cbbbf53790..f2e4bd737512 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactPropertiesEditors.java @@ -7,6 +7,7 @@ import com.intellij.packaging.artifacts.ArtifactPropertiesProvider; import com.intellij.packaging.artifacts.ModifiableArtifact; import com.intellij.packaging.ui.ArtifactPropertiesEditor; import com.intellij.packaging.ui.PackagingEditorContext; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.ui.TabbedPaneWrapper; import javax.swing.*; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java index 8b76988adabb..8fc761534a57 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurableContextImpl.java @@ -8,6 +8,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.packaging.artifacts.*; import com.intellij.packaging.elements.CompositePackagingElement; import com.intellij.packaging.impl.artifacts.ArtifactModelImpl; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.packaging.ui.ManifestFileConfiguration; import com.intellij.packaging.ui.PackagingEditorContext; import org.jetbrains.annotations.NotNull; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java index a7c6538e067e..ade1c6ea3eb2 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutNodesDraggingObject.java @@ -3,6 +3,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts; import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode; import com.intellij.packaging.elements.PackagingElement; import com.intellij.packaging.ui.ArtifactEditorContext; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.ui.treeStructure.SimpleNode; import org.jetbrains.annotations.NotNull; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java index 3a7f7bd47523..b5a23ab73ded 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java @@ -11,6 +11,7 @@ import com.intellij.packaging.artifacts.ArtifactPointerManager; import com.intellij.packaging.elements.CompositePackagingElement; import com.intellij.packaging.elements.PackagingElement; import com.intellij.packaging.impl.artifacts.PlainArtifactType; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.packaging.impl.elements.ArtifactPackagingElement; import java.util.Collection; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java index c91513c0a028..8a5b2d6af06b 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java @@ -4,7 +4,7 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent; import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeSelection; import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/FacetBasedPackagingSourceItemsProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/FacetBasedPackagingSourceItemsProvider.java similarity index 91% rename from java/compiler/impl/src/com/intellij/packaging/impl/ui/FacetBasedPackagingSourceItemsProvider.java rename to java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/FacetBasedPackagingSourceItemsProvider.java index d264583d38cb..7cd932629f77 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/FacetBasedPackagingSourceItemsProvider.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/FacetBasedPackagingSourceItemsProvider.java @@ -1,15 +1,13 @@ -package com.intellij.packaging.impl.ui; +package com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems; import com.intellij.facet.Facet; import com.intellij.facet.FacetTypeId; import com.intellij.openapi.module.Module; -import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.DelegatedSourceItemPresentation; -import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ModuleSourceItemGroup; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.elements.PackagingElement; -import com.intellij.packaging.elements.PackagingElementType; import com.intellij.packaging.elements.PackagingElementOutputKind; +import com.intellij.packaging.elements.PackagingElementType; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.packaging.ui.*; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java index 895d0e3732c2..5c37dec8f39f 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModulesAndLibrariesSourceItemsProvider.java @@ -6,7 +6,7 @@ import com.intellij.openapi.roots.LibraryOrderEntry; import com.intellij.openapi.roots.ModuleRootModel; import com.intellij.openapi.roots.OrderEntry; import com.intellij.openapi.roots.OrderRootType; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.VirtualFile; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java index fc7b1518aec7..03577d956c61 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/PutSourceItemIntoParentAndLinkViaManifestAction.java @@ -5,8 +5,8 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx; import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorImpl; -import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactUtil; -import com.intellij.openapi.roots.ui.configuration.artifacts.ParentElementProcessor; +import com.intellij.packaging.impl.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.ParentElementProcessor; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; import com.intellij.packaging.artifacts.Artifact; diff --git a/java/idea-ui/src/com/intellij/facet/impl/DefaultFacetsProvider.java b/platform/lang-impl/src/com/intellij/facet/impl/DefaultFacetsProvider.java similarity index 100% rename from java/idea-ui/src/com/intellij/facet/impl/DefaultFacetsProvider.java rename to platform/lang-impl/src/com/intellij/facet/impl/DefaultFacetsProvider.java