From 799a491efba86475538345113dd8366ec230f4ae Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 9 May 2012 18:23:36 +0200 Subject: [PATCH] Revert "extract ModulesFacetsProvider out of ModulesProvider" This reverts commit 6bc182de4b9821e6d544f148d0859fdd0abce6f9. --- ...faultPackagingElementResolvingContext.java | 6 ++--- .../elements/LibraryPackagingElement.java | 5 +++- .../PackagingElementResolvingContext.java | 6 ++--- ...dDetectedFrameworkDescriptionInWizard.java | 3 ++- .../artifacts/ArtifactEditorContextImpl.java | 9 ++++--- ...factsStructureConfigurableContextImpl.java | 6 ++--- .../intellij/facet/pointers/FacetPointer.java | 5 ++-- .../configuration/ModulesFacetsProvider.java | 27 ------------------- .../ui/configuration/ModulesProvider.java | 6 +++-- .../facet/impl/pointers/FacetPointerImpl.java | 5 ++-- ...BasedDetectedFrameworkDescriptionImpl.java | 3 ++- .../configuration/DefaultModulesProvider.java | 4 +-- .../MavenBaseModifiableModelsProvider.java | 5 ++-- 13 files changed, 35 insertions(+), 55 deletions(-) delete mode 100644 platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesFacetsProvider.java rename platform/{projectModel-api => lang-api}/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java (92%) diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/DefaultPackagingElementResolvingContext.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/DefaultPackagingElementResolvingContext.java index 2ce78a7b369c..16000b44f540 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/DefaultPackagingElementResolvingContext.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/DefaultPackagingElementResolvingContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import com.intellij.openapi.roots.libraries.LibraryTable; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; import com.intellij.openapi.roots.ui.configuration.DefaultModulesProvider; import com.intellij.openapi.roots.ui.configuration.FacetsProvider; -import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; +import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.packaging.artifacts.ArtifactManager; import com.intellij.packaging.artifacts.ArtifactModel; import com.intellij.packaging.elements.ManifestFileProvider; @@ -53,7 +53,7 @@ public class DefaultPackagingElementResolvingContext implements PackagingElement } @NotNull - public ModulesFacetsProvider getModulesProvider() { + public ModulesProvider getModulesProvider() { return myModulesProvider; } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java index d776410599f1..b8ed003f5213 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,13 @@ package com.intellij.packaging.impl.elements; import com.intellij.openapi.module.Module; +import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.LibraryOrderEntry; import com.intellij.openapi.roots.OrderEntry; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; +import com.intellij.openapi.roots.libraries.LibraryTable; +import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.io.FileUtil; diff --git a/java/compiler/openapi/src/com/intellij/packaging/elements/PackagingElementResolvingContext.java b/java/compiler/openapi/src/com/intellij/packaging/elements/PackagingElementResolvingContext.java index 63dac36cfddc..a033d3ce9696 100644 --- a/java/compiler/openapi/src/com/intellij/packaging/elements/PackagingElementResolvingContext.java +++ b/java/compiler/openapi/src/com/intellij/packaging/elements/PackagingElementResolvingContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package com.intellij.packaging.elements; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.ui.configuration.FacetsProvider; -import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; +import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.packaging.artifacts.ArtifactModel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,7 +34,7 @@ public interface PackagingElementResolvingContext { ArtifactModel getArtifactModel(); @NotNull - ModulesFacetsProvider getModulesProvider(); + ModulesProvider getModulesProvider(); @NotNull FacetsProvider getFacetsProvider(); diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/FacetBasedDetectedFrameworkDescriptionInWizard.java b/java/idea-ui/src/com/intellij/ide/util/importProject/FacetBasedDetectedFrameworkDescriptionInWizard.java index eb2b4f660514..3387210c772b 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/FacetBasedDetectedFrameworkDescriptionInWizard.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/FacetBasedDetectedFrameworkDescriptionInWizard.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2011 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ import com.intellij.framework.detection.impl.FacetBasedDetectedFrameworkDescript import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ModifiableModelsProvider; +import com.intellij.openapi.roots.ui.configuration.FacetsProvider; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java index 3eb74067efaf..f541326f0ec5 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorContextImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,10 @@ import com.intellij.openapi.roots.impl.ModuleLibraryOrderEntryImpl; import com.intellij.openapi.roots.impl.libraries.LibraryImpl; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; -import com.intellij.openapi.roots.ui.configuration.*; +import com.intellij.openapi.roots.ui.configuration.ChooseModulesDialog; +import com.intellij.openapi.roots.ui.configuration.FacetsProvider; +import com.intellij.openapi.roots.ui.configuration.ModulesProvider; +import com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.artifacts.ArtifactModel; import com.intellij.packaging.artifacts.ArtifactType; @@ -143,7 +146,7 @@ public class ArtifactEditorContextImpl implements ArtifactEditorContext { } @NotNull - public ModulesFacetsProvider getModulesProvider() { + public ModulesProvider getModulesProvider() { return myParent.getModulesProvider(); } 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 48bd0295b787..996be032815e 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 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.ui.configuration.FacetsProvider; import com.intellij.openapi.roots.ui.configuration.ModuleEditor; -import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; +import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.roots.ui.configuration.projectRoot.StructureConfigurableContext; import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureDaemonAnalyzerListener; import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureElement; @@ -179,7 +179,7 @@ public class ArtifactsStructureConfigurableContextImpl implements ArtifactsStruc } @NotNull - public ModulesFacetsProvider getModulesProvider() { + public ModulesProvider getModulesProvider() { return myContext.getModulesConfigurator(); } diff --git a/platform/lang-api/src/com/intellij/facet/pointers/FacetPointer.java b/platform/lang-api/src/com/intellij/facet/pointers/FacetPointer.java index 4e44d745e4e1..b741aae7a630 100644 --- a/platform/lang-api/src/com/intellij/facet/pointers/FacetPointer.java +++ b/platform/lang-api/src/com/intellij/facet/pointers/FacetPointer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ import com.intellij.facet.FacetType; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.FacetsProvider; -import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,7 +55,7 @@ public interface FacetPointer { String getFacetTypeId(); @NotNull - String getFacetName(@NotNull ModulesFacetsProvider modulesProvider, @NotNull FacetsProvider facetsProvider); + String getFacetName(@NotNull ModulesProvider modulesProvider, @NotNull FacetsProvider facetsProvider); @NotNull String getModuleName(@Nullable ModifiableModuleModel moduleModel); diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesFacetsProvider.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesFacetsProvider.java deleted file mode 100644 index 0e8f9fb79875..000000000000 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesFacetsProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2012 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.openapi.roots.ui.configuration; - -import com.intellij.facet.FacetModel; -import com.intellij.openapi.module.Module; -import org.jetbrains.annotations.NotNull; - -/** - * @author yole - */ -public interface ModulesFacetsProvider extends ModulesProvider { - FacetModel getFacetModel(@NotNull Module module); -} diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java similarity index 92% rename from platform/projectModel-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java rename to platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java index ff31c6457575..e631f3ef2dbf 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java @@ -15,6 +15,8 @@ */ package com.intellij.openapi.roots.ui.configuration; +import com.intellij.facet.FacetManager; +import com.intellij.facet.FacetModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ModuleRootModel; @@ -34,12 +36,10 @@ public interface ModulesProvider { public ModuleRootModel getRootModel(@NotNull Module module) { return ModuleRootManager.getInstance(module); } - /* public FacetModel getFacetModel(@NotNull Module module) { return FacetManager.getInstance(module); } - */ }; @NotNull Module[] getModules(); @@ -48,4 +48,6 @@ public interface ModulesProvider { Module getModule(String name); ModuleRootModel getRootModel(@NotNull Module module); + + FacetModel getFacetModel(@NotNull Module module); } diff --git a/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java index 58ab198900e7..e79c41688cd4 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.FacetsProvider; -import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.NotNull; @@ -152,7 +151,7 @@ public class FacetPointerImpl implements FacetPointer { } @NotNull - public String getFacetName(@NotNull ModulesFacetsProvider modulesProvider, @NotNull FacetsProvider facetsProvider) { + public String getFacetName(@NotNull ModulesProvider modulesProvider, @NotNull FacetsProvider facetsProvider) { if (myFacet != null) { return modulesProvider.getFacetModel(myFacet.getModule()).getFacetName(myFacet); } diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescriptionImpl.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescriptionImpl.java index c8dc5b119baa..a2504cbf3d8f 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescriptionImpl.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescriptionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2011 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.facet.FacetTypeId; import com.intellij.framework.detection.FacetBasedFrameworkDetector; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ModifiableModelsProvider; +import com.intellij.openapi.roots.ui.configuration.FacetsProvider; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java index eee932f54569..0098acb4b448 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; /** * @author nik */ -public class DefaultModulesProvider implements ModulesFacetsProvider { +public class DefaultModulesProvider implements ModulesProvider { private final Project myProject; public DefaultModulesProvider(final Project project) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenBaseModifiableModelsProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenBaseModifiableModelsProvider.java index d47a7d2bb583..4ad84dfd5780 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenBaseModifiableModelsProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenBaseModifiableModelsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2009 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,6 @@ import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; import com.intellij.openapi.roots.ui.configuration.FacetsProvider; -import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.packaging.artifacts.ArtifactModel; @@ -158,7 +157,7 @@ public abstract class MavenBaseModifiableModelsProvider implements MavenModifiab } @NotNull - public ModulesFacetsProvider getModulesProvider() { + public ModulesProvider getModulesProvider() { return myModulesProvider; }