From ed7ca73319014e7664b05ce55123e3dce9afbaa0 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 2 Nov 2009 16:34:16 +0300 Subject: [PATCH] IDEADEV-41146: Clicked into artifact settings for an EAR - happens every time --- .../intellij/packaging/impl/artifacts/ArtifactUtil.java | 14 ++++++++------ .../roots/ui/configuration/ModulesConfigurator.java | 5 +++-- .../openapi/roots/ui/configuration/ModulesProvider.java | 14 +++++++++----- .../roots/ui/configuration/DefaultModulesProvider.java | 6 ++++-- .../maven/importing/MavenBaseModifiableModelsProvider.java | 5 +++-- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java index 3fb3b23f6c..019aa3e91e 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java @@ -393,12 +393,14 @@ public class ArtifactUtil { } else if (element instanceof ModuleOutputPackagingElement) { final Module module = ((ModuleOutputPackagingElement)element).findModule(context); - final ContentEntry[] contentEntries = context.getModulesProvider().getRootModel(module).getContentEntries(); - for (ContentEntry contentEntry : contentEntries) { - for (SourceFolder sourceFolder : contentEntry.getSourceFolders()) { - final VirtualFile sourceRoot = sourceFolder.getFile(); - if (!sourceFolder.isTestSource() && sourceRoot != null) { - ContainerUtil.addIfNotNull(sourceRoot.findFileByRelativePath(path), result); + if (module != null) { + final ContentEntry[] contentEntries = context.getModulesProvider().getRootModel(module).getContentEntries(); + for (ContentEntry contentEntry : contentEntries) { + for (SourceFolder sourceFolder : contentEntry.getSourceFolders()) { + final VirtualFile sourceRoot = sourceFolder.getFile(); + if (!sourceFolder.isTestSource() && sourceRoot != null) { + ContainerUtil.addIfNotNull(sourceRoot.findFileByRelativePath(path), result); + } } } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java index 4b1f04bdea..2a8ba858b6 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java @@ -124,6 +124,7 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change return myProjectConfigurable; } + @NotNull public Module[] getModules() { return myModuleModel.getModules(); } @@ -147,7 +148,7 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change return null; } - public ModuleRootModel getRootModel(Module module) { + public ModuleRootModel getRootModel(@NotNull Module module) { final ModuleEditor editor = getModuleEditor(module); ModuleRootModel rootModel = null; if (editor != null) { @@ -161,7 +162,7 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change return rootModel; } - public FacetModel getFacetModel(Module module) { + public FacetModel getFacetModel(@NotNull Module module) { return myFacetsConfigurator.getOrCreateModifiableModel(module); } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java index 99f1f08a1c..e631f3ef2d 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java @@ -20,9 +20,12 @@ import com.intellij.facet.FacetModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ModuleRootModel; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public interface ModulesProvider { ModulesProvider EMPTY_MODULES_PROVIDER = new ModulesProvider() { + @NotNull public Module[] getModules() { return Module.EMPTY_ARRAY; } @@ -30,20 +33,21 @@ public interface ModulesProvider { return null; } - public ModuleRootModel getRootModel(Module module) { + public ModuleRootModel getRootModel(@NotNull Module module) { return ModuleRootManager.getInstance(module); } - public FacetModel getFacetModel(Module module) { + public FacetModel getFacetModel(@NotNull Module module) { return FacetManager.getInstance(module); } }; - + @NotNull Module[] getModules(); + @Nullable Module getModule(String name); - ModuleRootModel getRootModel(Module module); + ModuleRootModel getRootModel(@NotNull Module module); - FacetModel getFacetModel(Module module); + FacetModel getFacetModel(@NotNull Module module); } 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 e90b61e95f..0098acb4b4 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 @@ -23,6 +23,7 @@ import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ModuleRootModel; import com.intellij.facet.FacetModel; import com.intellij.facet.FacetManager; +import org.jetbrains.annotations.NotNull; /** * @author nik @@ -34,6 +35,7 @@ public class DefaultModulesProvider implements ModulesProvider { myProject = project; } + @NotNull public Module[] getModules() { return ModuleManager.getInstance(myProject).getModules(); } @@ -42,11 +44,11 @@ public class DefaultModulesProvider implements ModulesProvider { return ModuleManager.getInstance(myProject).findModuleByName(name); } - public ModuleRootModel getRootModel(Module module) { + public ModuleRootModel getRootModel(@NotNull Module module) { return ModuleRootManager.getInstance(module); } - public FacetModel getFacetModel(Module module) { + public FacetModel getFacetModel(@NotNull Module module) { return FacetManager.getInstance(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 c34c4e0d35..36d3dbcbba 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 @@ -153,6 +153,7 @@ public abstract class MavenBaseModifiableModelsProvider implements MavenModifiab } private class MavenModulesProvider implements ModulesProvider { + @NotNull public Module[] getModules() { return getModuleModel().getModules(); } @@ -161,11 +162,11 @@ public abstract class MavenBaseModifiableModelsProvider implements MavenModifiab return getModuleModel().findModuleByName(name); } - public ModuleRootModel getRootModel(Module module) { + public ModuleRootModel getRootModel(@NotNull Module module) { return MavenBaseModifiableModelsProvider.this.getRootModel(module); } - public FacetModel getFacetModel(Module module) { + public FacetModel getFacetModel(@NotNull Module module) { return MavenBaseModifiableModelsProvider.this.getFacetModel(module); } } -- 2.11.4.GIT