From fcb123ee64663eff6668318a35ffa09bc9750191 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 9 May 2012 17:56:58 +0200 Subject: [PATCH] extract ModulesFacetsProvider out of ModulesProvider --- ...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 +++++++++++++++++++ .../facet/impl/pointers/FacetPointerImpl.java | 5 ++-- ...BasedDetectedFrameworkDescriptionImpl.java | 3 +-- .../configuration/DefaultModulesProvider.java | 4 +-- .../ui/configuration/ModulesProvider.java | 6 ++--- .../MavenBaseModifiableModelsProvider.java | 5 ++-- 13 files changed, 55 insertions(+), 35 deletions(-) create mode 100644 platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesFacetsProvider.java rename platform/{lang-api => projectModel-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 16000b44f540..2ce78a7b369c 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-2009 JetBrains s.r.o. + * 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. @@ -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.ModulesProvider; +import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; 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 ModulesProvider getModulesProvider() { + public ModulesFacetsProvider 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 b8ed003f5213..d776410599f1 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-2009 JetBrains s.r.o. + * 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. @@ -16,13 +16,10 @@ 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 a033d3ce9696..63dac36cfddc 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-2009 JetBrains s.r.o. + * 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. @@ -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.ModulesProvider; +import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; 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 - ModulesProvider getModulesProvider(); + ModulesFacetsProvider 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 3387210c772b..eb2b4f660514 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-2011 JetBrains s.r.o. + * 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. @@ -23,7 +23,6 @@ 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 f541326f0ec5..3eb74067efaf 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-2009 JetBrains s.r.o. + * 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. @@ -26,10 +26,7 @@ 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.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.openapi.roots.ui.configuration.*; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.artifacts.ArtifactModel; import com.intellij.packaging.artifacts.ArtifactType; @@ -146,7 +143,7 @@ public class ArtifactEditorContextImpl implements ArtifactEditorContext { } @NotNull - public ModulesProvider getModulesProvider() { + public ModulesFacetsProvider 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 996be032815e..48bd0295b787 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-2009 JetBrains s.r.o. + * 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. @@ -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.ModulesProvider; +import com.intellij.openapi.roots.ui.configuration.ModulesFacetsProvider; 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 ModulesProvider getModulesProvider() { + public ModulesFacetsProvider 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 b741aae7a630..4e44d745e4e1 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-2009 JetBrains s.r.o. + * 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. @@ -21,6 +21,7 @@ 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; @@ -55,7 +56,7 @@ public interface FacetPointer { String getFacetTypeId(); @NotNull - String getFacetName(@NotNull ModulesProvider modulesProvider, @NotNull FacetsProvider facetsProvider); + String getFacetName(@NotNull ModulesFacetsProvider 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 new file mode 100644 index 000000000000..0e8f9fb79875 --- /dev/null +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesFacetsProvider.java @@ -0,0 +1,27 @@ +/* + * 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/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointerImpl.java index e79c41688cd4..58ab198900e7 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-2009 JetBrains s.r.o. + * 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. @@ -25,6 +25,7 @@ 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; @@ -151,7 +152,7 @@ public class FacetPointerImpl implements FacetPointer { } @NotNull - public String getFacetName(@NotNull ModulesProvider modulesProvider, @NotNull FacetsProvider facetsProvider) { + public String getFacetName(@NotNull ModulesFacetsProvider 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 a2504cbf3d8f..c8dc5b119baa 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-2011 JetBrains s.r.o. + * 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. @@ -22,7 +22,6 @@ 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 0098acb4b448..eee932f54569 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-2009 JetBrains s.r.o. + * 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. @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; /** * @author nik */ -public class DefaultModulesProvider implements ModulesProvider { +public class DefaultModulesProvider implements ModulesFacetsProvider { private final Project myProject; public DefaultModulesProvider(final Project project) { diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java b/platform/projectModel-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java similarity index 92% rename from platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java rename to platform/projectModel-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java index e631f3ef2dbf..ff31c6457575 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java @@ -15,8 +15,6 @@ */ 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; @@ -36,10 +34,12 @@ 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,6 +48,4 @@ public interface ModulesProvider { Module getModule(String name); ModuleRootModel getRootModel(@NotNull Module module); - - FacetModel getFacetModel(@NotNull Module module); } 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 4ad84dfd5780..d47a7d2bb583 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-2009 JetBrains s.r.o. + * 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. @@ -29,6 +29,7 @@ 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; @@ -157,7 +158,7 @@ public abstract class MavenBaseModifiableModelsProvider implements MavenModifiab } @NotNull - public ModulesProvider getModulesProvider() { + public ModulesFacetsProvider getModulesProvider() { return myModulesProvider; }