MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEADEV-41146: Clicked into artifact settings for an EAR - happens every time

Browse Source
This commit is contained in:
nik
2009-11-02 16:34:16 +03:00
parent baf666cf1b
commit ed7ca73319
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactUtil.java
+8 -6
View File
@@ -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);
}
}
}
}
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
+3 -2
View File
@@ -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);
}