From d4e83980699e7130552d6c5a02bbba821e749441 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 19 Aug 2011 19:44:26 +0400 Subject: [PATCH] Module.getModuleType() -> ModuleType.get(Module) --- .../impl/javaCompiler/BackendCompilerWrapper.java | 2 +- .../compiler/options/ProcessedModulesTable.java | 3 ++- .../openapi/deployment/DeploymentUtilImpl.java | 5 +++-- .../artifacts/JarArtifactFromModulesDialog.java | 3 ++- .../impl/ui/ModuleElementPresentation.java | 5 +++-- .../execution/ui/ConfigurationModuleSelector.java | 5 +++-- .../frameworkSupport/FrameworkSupportUtil.java | 2 +- .../DefaultModuleEditorsProvider.java | 3 ++- .../sourceItems/ModuleSourceItemGroup.java | 5 +++-- .../AnalyzeDependenciesComponent.java | 3 ++- .../projectRoot/AddFacetOfTypeAction.java | 7 ++++--- .../projectRoot/FacetEditorFacadeImpl.java | 2 +- .../projectRoot/ModuleConfigurable.java | 5 +++-- .../projectRoot/ModuleStructureConfigurable.java | 2 +- .../daemon/UsageInModuleClasspath.java | 3 ++- .../ex/GlobalJavaInspectionContextImpl.java | 3 ++- .../psi/impl/JavaDirectoryIconProvider.java | 3 ++- java/openapi/src/com/intellij/ide/IconUtilEx.java | 3 ++- .../src/com/intellij/openapi/module/Module.java | 10 +++------- .../com/intellij/openapi/module/ModuleType.java | 4 ++++ .../com/intellij/openapi/module/ModuleUtil.java | 4 ++-- .../ui/util/OrderEntryCellAppearanceUtils.java | 5 +++-- .../codeInsight/hint/ElementLocationUtil.java | 3 ++- .../codeInspection/reference/RefModuleImpl.java | 3 ++- .../codeInspection/ui/InspectionModuleNode.java | 3 ++- .../src/com/intellij/facet/FacetManagerImpl.java | 2 +- .../statistics/ModuleTypeUsagesCollector.java | 3 ++- .../ide/navigationToolbar/NavBarPresentation.java | 5 +++-- .../impl/nodes/AbstractModuleNode.java | 7 ++++--- .../intellij/ide/todo/nodes/ModuleToDoNode.java | 5 +++-- .../ide/util/DirectoryChooserModuleTreeView.java | 3 ++- .../ide/util/PsiElementModuleRenderer.java | 3 ++- .../ModulesDependenciesPanel.java | 3 ++- .../components/impl/stores/ModuleStoreImpl.java | 2 +- .../intellij/openapi/module/impl/ModuleImpl.java | 15 --------------- .../openapi/module/impl/ModuleManagerImpl.java | 8 ++++---- .../ui/configuration/ChooseModulesDialog.java | 3 ++- .../roots/ui/configuration/ModulesCombobox.java | 3 ++- .../vcs/changes/ui/ChangesBrowserModuleNode.java | 3 ++- .../packageDependencies/ui/ModuleNode.java | 5 +++-- .../ui/classpath/ChooseLibrariesDialogBase.java | 5 +++-- .../src/com/intellij/mock/MockModule.java | 7 ------- .../usages/impl/rules/ModuleGroupingRule.java | 3 ++- .../exportSignedPackage/ChooseModuleStep.java | 3 ++- .../AndroidModuleConfigurationEditorProvider.java | 3 ++- .../newProject/AndroidModulesComboBox.java | 3 ++- .../src/actions/GeneratePluginClassAction.java | 3 ++- .../src/build/PluginBuildParticipantProvider.java | 3 ++- plugins/devkit/src/build/PluginBuildUtil.java | 3 ++- .../src/build/PrepareAllToDeployAction.java | 7 ++++--- .../devkit/src/build/PrepareToDeployAction.java | 5 +++-- .../src/module/PluginModuleEditorsProvider.java | 3 ++- plugins/devkit/src/module/PluginModuleType.java | 6 +++--- .../devkit/src/run/PluginRunConfiguration.java | 3 ++- .../src/run/PluginRunConfigurationEditor.java | 3 ++- plugins/devkit/src/util/ChooseModulesDialog.java | 3 ++- .../eclipse/conversion/DotProjectFileHelper.java | 3 ++- .../plugins/groovy/compiler/GroovyCompiler.java | 3 ++- .../groovy/compiler/GroovyCompilerBase.java | 3 ++- .../groovy/mvc/util/ModuleCellRenderer.java | 3 ++- .../runner/GroovyRunConfigurationEditor.java | 3 ++- .../plugins/groovy/util/GroovyUtils.java | 2 +- .../maven/importing/MavenProjectImporter.java | 9 +++------ .../xpath/xslt/run/XsltRunSettingsEditor.java | 3 ++- .../plugins/xpathView/search/ScopePanel.java | 3 ++- 65 files changed, 143 insertions(+), 118 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java index 08305785073f..033bec365cd4 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java @@ -345,7 +345,7 @@ public class BackendCompilerWrapper { return; // should not invoke javac with empty sources list } - ModuleType moduleType = chunk.getModules()[0].getModuleType(); + ModuleType moduleType = ModuleType.get(chunk.getModules()[0]); if (!(chunk.getJdk().getSdkType() instanceof JavaSdkType) && !(moduleType instanceof JavaModuleType || moduleType.createModuleBuilder() instanceof JavaModuleBuilder)) { // TODO diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java b/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java index 05e28ae826fb..2f9b75f8fa41 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java @@ -17,6 +17,7 @@ package com.intellij.compiler.options; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.ChooseModulesDialog; import com.intellij.openapi.util.Pair; @@ -420,7 +421,7 @@ public class ProcessedModulesTable extends JPanel { } component.setEnabled(ProcessedModulesTable.this.isEnabled()); if (component instanceof JLabel) { - final Icon icon = module != null ? module.getModuleType().getNodeIcon(false) : null; + final Icon icon = module != null ? ModuleType.get(module).getNodeIcon(false) : null; JLabel label = (JLabel)component; label.setIcon(icon); label.setDisabledIcon(icon); diff --git a/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java b/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java index 6804b5ccc8eb..9968fdbe3fb6 100644 --- a/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java +++ b/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java @@ -22,6 +22,7 @@ import com.intellij.openapi.compiler.CompilerMessageCategory; import com.intellij.openapi.compiler.make.BuildRecipe; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VfsUtil; @@ -119,7 +120,7 @@ public class DeploymentUtilImpl extends DeploymentUtil { } public void reportDeploymentDescriptorDoesNotExists(ConfigFile descriptor, CompileContext context, Module module) { - final String description = module.getModuleType().getName() + " '" + module.getName() + '\''; + final String description = ModuleType.get(module).getName() + " '" + module.getName() + '\''; String descriptorPath = VfsUtil.urlToPath(descriptor.getUrl()); final String message = CompilerBundle.message("message.text.compiling.item.deployment.descriptor.could.not.be.found", description, descriptorPath); @@ -130,7 +131,7 @@ public class DeploymentUtilImpl extends DeploymentUtil { if (new File(VfsUtil.urlToPath(descriptor.getUrl())).exists()) { String message = getConfigFileErrorMessage(descriptor); if (message != null) { - final String moduleDescription = module.getModuleType().getName() + " '" + module.getName() + '\''; + final String moduleDescription = ModuleType.get(module).getName() + " '" + module.getName() + '\''; compileContext.addMessage(CompilerMessageCategory.ERROR, CompilerBundle.message("message.text.compiling.module.message", moduleDescription, message), descriptor.getUrl(), -1, -1); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java index b2c377b0d160..a5e401eaabaa 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java @@ -17,6 +17,7 @@ package com.intellij.packaging.impl.artifacts; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.ModulesAlphaComparator; import com.intellij.openapi.ui.DialogWrapper; @@ -165,7 +166,7 @@ public class JarArtifactFromModulesDialog extends DialogWrapper { @Override public void customize(JList list, Module value, int index, boolean selected, boolean hasFocus) { if (value != null) { - setIcon(value.getModuleType().getNodeIcon(false)); + setIcon(ModuleType.get(value).getNodeIcon(false)); setText(value.getName()); } else { diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java b/java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java index 9b05f101f6fb..042329d9f2ac 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java @@ -20,6 +20,7 @@ import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModulePointer; +import com.intellij.openapi.module.ModuleType; import com.intellij.packaging.ui.ArtifactEditorContext; import com.intellij.packaging.ui.PackagingElementWeights; import com.intellij.packaging.ui.TreeNodePresentation; @@ -70,8 +71,8 @@ public class ModuleElementPresentation extends TreeNodePresentation { presentationData.setIcons(PlatformIcons.TEST_SOURCE_FOLDER); } else if (module != null) { - presentationData.setOpenIcon(module.getModuleType().getNodeIcon(true)); - presentationData.setClosedIcon(module.getModuleType().getNodeIcon(false)); + presentationData.setOpenIcon(ModuleType.get(module).getNodeIcon(true)); + presentationData.setClosedIcon(ModuleType.get(module).getNodeIcon(false)); } String moduleName; if (module != null) { diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java index f488a89cc32b..2d7dd2f7ca16 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java +++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java @@ -20,6 +20,7 @@ import com.intellij.execution.configurations.ModuleBasedConfiguration; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.ModuleTypeManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; @@ -66,7 +67,7 @@ public class ConfigurationModuleSelector { public void customize(final JList list, final Object value, final int index, final boolean selected, final boolean hasFocus) { if (value instanceof Module) { final Module module = (Module)value; - setIcon(module.getModuleType().getNodeIcon(true)); + setIcon(ModuleType.get(module).getNodeIcon(true)); setText(module.getName()); } else if (value == null) { @@ -91,7 +92,7 @@ public class ConfigurationModuleSelector { } public static boolean isModuleAccepted(final Module module) { - return ModuleTypeManager.getInstance().isClasspathProvider(module.getModuleType()); + return ModuleTypeManager.getInstance().isClasspathProvider(ModuleType.get(module)); } public Project getProject() { diff --git a/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java index 3993992f007a..0e6fb261fe63 100644 --- a/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java +++ b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java @@ -29,7 +29,7 @@ public class FrameworkSupportUtil { } public static List getProviders(@NotNull Module module) { - return getProviders(module.getModuleType(), module); + return getProviders(ModuleType.get(module), module); } private static List getProviders(@NotNull ModuleType moduleType, @Nullable Module module) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/DefaultModuleEditorsProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/DefaultModuleEditorsProvider.java index f365793da0d7..fe98d3db07a6 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/DefaultModuleEditorsProvider.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/DefaultModuleEditorsProvider.java @@ -18,6 +18,7 @@ package com.intellij.openapi.roots.ui.configuration; import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleConfigurationEditor; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.ModifiableRootModel; import java.util.ArrayList; @@ -27,7 +28,7 @@ public class DefaultModuleEditorsProvider implements ModuleConfigurationEditorPr public ModuleConfigurationEditor[] createEditors(ModuleConfigurationState state) { ModifiableRootModel rootModel = state.getRootModel(); Module module = rootModel.getModule(); - if (!(module.getModuleType() instanceof JavaModuleType)) { + if (!(ModuleType.get(module) instanceof JavaModuleType)) { return ModuleConfigurationEditor.EMPTY; } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java index aecfe28092cf..5b0d5a16fc82 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleSourceItemGroup.java @@ -17,6 +17,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems; import com.intellij.ide.projectView.PresentationData; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.DependencyScope; import com.intellij.openapi.roots.ModuleOrderEntry; import com.intellij.openapi.roots.OrderEntry; @@ -122,8 +123,8 @@ public class ModuleSourceItemGroup extends PackagingSourceItem { @Override public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes, SimpleTextAttributes commentAttributes) { - presentationData.setClosedIcon(myModule.getModuleType().getNodeIcon(false)); - presentationData.setOpenIcon(myModule.getModuleType().getNodeIcon(true)); + presentationData.setClosedIcon(ModuleType.get(myModule).getNodeIcon(false)); + presentationData.setOpenIcon(ModuleType.get(myModule).getNodeIcon(true)); presentationData.addText(myModule.getName(), mainAttributes); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java index bde56cba8bc7..f6e1386ff52a 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java @@ -20,6 +20,7 @@ import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.roots.ModuleRootEvent; @@ -617,7 +618,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent { return new CellAppearance() { @Override public void customize(SimpleColoredComponent component) { - component.setIcon(myModule.getModuleType().getNodeIcon(false)); + component.setIcon(ModuleType.get(myModule).getNodeIcon(false)); component.append("", SimpleTextAttributes.SYNTHETIC_ATTRIBUTES); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/AddFacetOfTypeAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/AddFacetOfTypeAction.java index 82a580cfdf52..dbc467adceed 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/AddFacetOfTypeAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/AddFacetOfTypeAction.java @@ -24,6 +24,7 @@ import com.intellij.ide.util.ChooseElementsDialog; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.ChooseModulesDialog; @@ -68,7 +69,7 @@ class AddFacetOfTypeAction extends DumbAwareAction { final ProjectFacetsConfigurator facetsConfigurator = myContext.getModulesConfigurator().getFacetsConfigurator(); List suitableParents = new ArrayList(); for (Module module : myContext.getModules()) { - if (type.isSuitableModuleType(module.getModuleType())) { + if (type.isSuitableModuleType(ModuleType.get(module))) { suitableParents.addAll(facetsConfigurator.getFacetsByType(module, underlyingType)); } } @@ -104,7 +105,7 @@ class AddFacetOfTypeAction extends DumbAwareAction { final Iterator iterator = suitableModules.iterator(); while (iterator.hasNext()) { Module module = iterator.next(); - if (!type.isSuitableModuleType(module.getModuleType()) || (type.isOnlyOneFacetAllowed() && facetsConfigurator.hasFacetOfType(module, null, type.getId()))) { + if (!type.isSuitableModuleType(ModuleType.get(module)) || (type.isOnlyOneFacetAllowed() && facetsConfigurator.hasFacetOfType(module, null, type.getId()))) { iterator.remove(); } } @@ -139,7 +140,7 @@ class AddFacetOfTypeAction extends DumbAwareAction { private static boolean hasSuitableModules(StructureConfigurableContext context, FacetType type) { for (Module module : context.getModules()) { - if (type.isSuitableModuleType(module.getModuleType())) { + if (type.isSuitableModuleType(ModuleType.get(module))) { return true; } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java index 6b6e3928d8d7..c160d90fcd14 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java @@ -181,7 +181,7 @@ public class FacetEditorFacadeImpl implements FacetEditorFacade { @Nullable public ModuleType getSelectedModuleType() { final Module module = getSelectedModule(); - return module != null ? module.getModuleType() : null; + return module != null ? ModuleType.get(module) : null; } @Nullable diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java index 3584e55b996a..26cbc73fb1e2 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleConfigurable.java @@ -18,6 +18,7 @@ package com.intellij.openapi.roots.ui.configuration.projectRoot; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.ModuleWithNameAlreadyExists; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.ProjectBundle; @@ -91,11 +92,11 @@ public class ModuleConfigurable extends ProjectStructureElementConfigurableVirtualFile for the module .iml file. * @@ -51,13 +54,6 @@ public interface Module extends ComponentManager, AreaInstance, Disposable { */ @NotNull String getModuleFilePath(); - /** - * Returns the type of this module. - * - * @return the module type. - */ - @NotNull ModuleType getModuleType(); - /** * Returns the project to which this module belongs. * diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java index 93ce3b0c5364..a35b82298679 100644 --- a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java +++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java @@ -83,4 +83,8 @@ public abstract class ModuleType { public boolean isValidSdk(final Module module, final Sdk projectSdk) { return true; } + + public static ModuleType get(Module module) { + return ModuleTypeManager.getInstance().findByID(module.getOptionValue(Module.ELEMENT_TYPE)); + } } diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java index 67b3386aabe4..6f78c4cbb31e 100644 --- a/platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java +++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java @@ -80,7 +80,7 @@ public class ModuleUtil { @Nullable public static Module getParentModuleOfType(ModuleType expectedModuleType, Module module) { if (module == null) return null; - if (expectedModuleType.equals(module.getModuleType())) return module; + if (expectedModuleType.equals(ModuleType.get(module))) return module; final List parents = getParentModulesOfType(expectedModuleType, module); return parents.isEmpty() ? null : parents.get(0); } @@ -90,7 +90,7 @@ public class ModuleUtil { final List parents = ModuleManager.getInstance(module.getProject()).getModuleDependentModules(module); ArrayList modules = new ArrayList(); for (Module parent : parents) { - if (expectedModuleType.equals(parent.getModuleType())) { + if (expectedModuleType.equals(ModuleType.get(parent))) { modules.add(parent); } } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java index 2dfb0a1e34c0..ebafb3a04e29 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java @@ -17,6 +17,7 @@ package com.intellij.openapi.roots.ui.util; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.projectRoots.Sdk; @@ -74,7 +75,7 @@ public class OrderEntryCellAppearanceUtils { return new SimpleTextCellAppearance(presentableName, icon, SimpleTextAttributes.SYNTHETIC_ATTRIBUTES); } else if (orderEntry instanceof ModuleOrderEntry) { - final Icon icon = ((ModuleOrderEntry)orderEntry).getModule().getModuleType().getNodeIcon(false); + final Icon icon = ModuleType.get(((ModuleOrderEntry)orderEntry).getModule()).getNodeIcon(false); return SimpleTextCellAppearance.normal(orderEntry.getPresentableName(), icon); } else return CompositeAppearance.single(orderEntry.getPresentableName()); @@ -158,7 +159,7 @@ public class OrderEntryCellAppearanceUtils { } public static CellAppearance forModule(Module module) { - return SimpleTextCellAppearance.normal(module.getName(), module.getModuleType().getNodeIcon(false)); + return SimpleTextCellAppearance.normal(module.getName(), ModuleType.get(module).getNodeIcon(false)); } public static CellAppearance forContentEntry(ContentEntry contentEntry) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java index bd89680967ca..6349077970d8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java @@ -16,6 +16,7 @@ package com.intellij.codeInsight.hint; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.roots.*; @@ -49,7 +50,7 @@ public class ElementLocationUtil { if (module != null) { label.setText(module.getName()); - label.setIcon(module.getModuleType().getNodeIcon(false)); + label.setIcon(ModuleType.get(module).getNodeIcon(false)); } else { final List entries = fileIndex.getOrderEntriesForFile(vfile); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefModuleImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefModuleImpl.java index 455c4490e6da..89ab7b9e7ab4 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/reference/RefModuleImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/reference/RefModuleImpl.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection.reference; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -57,7 +58,7 @@ public class RefModuleImpl extends RefEntityImpl implements RefModule { } public Icon getIcon(final boolean expanded) { - return getModule().getModuleType().getNodeIcon(expanded); + return ModuleType.get(getModule()).getNodeIcon(expanded); } @Nullable diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java index eb355303165c..ff16feef19b2 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionModuleNode.java @@ -1,6 +1,7 @@ package com.intellij.codeInspection.ui; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import javax.swing.*; @@ -16,7 +17,7 @@ public class InspectionModuleNode extends InspectionTreeNode{ } public Icon getIcon(boolean expanded) { - return myModule.getModuleType().getNodeIcon(expanded); + return ModuleType.get(myModule).getNodeIcon(expanded); } public String getName(){ diff --git a/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java b/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java index 451c3a505bed..4cb3f4e56fb9 100644 --- a/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java @@ -169,7 +169,7 @@ public class FacetManagerImpl extends FacetManager implements ModuleComponent, P continue; } - ModuleType moduleType = myModule.getModuleType(); + ModuleType moduleType = ModuleType.get(myModule); if (!type.isSuitableModuleType(moduleType)) { addInvalidFacet(child, model, underlyingFacet, ProjectBundle.message("error.message.0.facets.are.not.allowed.in.1", type.getPresentableName(), moduleType.getName())); diff --git a/platform/lang-impl/src/com/intellij/facet/impl/statistics/ModuleTypeUsagesCollector.java b/platform/lang-impl/src/com/intellij/facet/impl/statistics/ModuleTypeUsagesCollector.java index 397fd724c1ec..1f14356d9968 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/statistics/ModuleTypeUsagesCollector.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/statistics/ModuleTypeUsagesCollector.java @@ -20,6 +20,7 @@ import com.intellij.internal.statistic.beans.GroupDescriptor; import com.intellij.internal.statistic.beans.UsageDescriptor; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; @@ -42,7 +43,7 @@ public class ModuleTypeUsagesCollector extends AbstractApplicationUsagesCollecto public Set getProjectUsages(@NotNull Project project) { Set modulesTypes = new HashSet(); for (Module module : ModuleManager.getInstance(project).getModules()) { - modulesTypes.add(module.getModuleType().getId()); + modulesTypes.add(ModuleType.get(module).getId()); } return ContainerUtil.map2Set(modulesTypes, new Function() { @Override diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java index 22978bfc0569..cac639843895 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java @@ -21,6 +21,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; @@ -64,7 +65,7 @@ public class NavBarPresentation { public static Icon getIcon(final Object object, final boolean open) { if (!NavBarModel.isValid(object)) return null; if (object instanceof Project) return PROJECT_ICON; - if (object instanceof Module) return ((Module)object).getModuleType().getNodeIcon(false); + if (object instanceof Module) return ModuleType.get(((Module)object)).getNodeIcon(false); try { if (object instanceof PsiElement) { return ApplicationManager.getApplication().runReadAction(new Computable() { @@ -80,7 +81,7 @@ public class NavBarPresentation { } if (object instanceof JdkOrderEntry) return ((JdkOrderEntry)object).getJdk().getSdkType().getIcon(); if (object instanceof LibraryOrderEntry) return IconLoader.getIcon("/nodes/ppLibClosed.png"); - if (object instanceof ModuleOrderEntry) return ((ModuleOrderEntry)object).getModule().getModuleType().getNodeIcon(false); + if (object instanceof ModuleOrderEntry) return ModuleType.get(((ModuleOrderEntry)object).getModule()).getNodeIcon(false); return null; } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java index 7dbc52abe646..db02417b443c 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java @@ -19,6 +19,7 @@ import com.intellij.ide.projectView.PresentationData; import com.intellij.ide.projectView.ProjectViewNode; import com.intellij.ide.projectView.ViewSettings; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService; @@ -47,8 +48,8 @@ public abstract class AbstractModuleNode extends ProjectViewNode impleme presentation.addText(getValue().getName(), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); } - presentation.setOpenIcon(getValue().getModuleType().getNodeIcon(true)); - presentation.setClosedIcon(getValue().getModuleType().getNodeIcon(false)); + presentation.setOpenIcon(ModuleType.get(getValue()).getNodeIcon(true)); + presentation.setClosedIcon(ModuleType.get(getValue()).getNodeIcon(false)); } protected boolean showModuleNameInBold() { @@ -86,7 +87,7 @@ public abstract class AbstractModuleNode extends ProjectViewNode impleme public String getToolTip() { final Module module = getValue(); - return module.getModuleType().getName(); + return ModuleType.get(module).getName(); } public void navigate(final boolean requestFocus) { diff --git a/platform/lang-impl/src/com/intellij/ide/todo/nodes/ModuleToDoNode.java b/platform/lang-impl/src/com/intellij/ide/todo/nodes/ModuleToDoNode.java index b732a6950f4c..75f60b3b5e05 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/nodes/ModuleToDoNode.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/nodes/ModuleToDoNode.java @@ -27,6 +27,7 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.util.Computable; @@ -96,8 +97,8 @@ public class ModuleToDoNode extends BaseToDoNode implements HighlightedR EditorColorsScheme colorsScheme = UsageTreeColorsScheme.getInstance().getScheme(); myHighlightedRegions.add( new HighlightedRegion(nameEndOffset, newName.length(), colorsScheme.getAttributes(UsageTreeColors.NUMBER_OF_USAGES))); - presentation.setOpenIcon(getValue().getModuleType().getNodeIcon(true)); - presentation.setClosedIcon(getValue().getModuleType().getNodeIcon(false)); + presentation.setOpenIcon(ModuleType.get(getValue()).getNodeIcon(true)); + presentation.setClosedIcon(ModuleType.get(getValue()).getNodeIcon(false)); presentation.setPresentableText(newName); } diff --git a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java index 83409382bfbc..d7b6944174a9 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserModuleTreeView.java @@ -21,6 +21,7 @@ import com.intellij.ide.projectView.impl.ModuleGroupUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; @@ -240,7 +241,7 @@ public class DirectoryChooserModuleTreeView implements DirectoryChooserView { final Module module = (Module)value; append(module.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES); int flags1 = expanded ? Iconable.ICON_FLAG_OPEN : Iconable.ICON_FLAG_CLOSED; - setIcon(module.getModuleType().getNodeIcon((flags1 & Iconable.ICON_FLAG_OPEN) != 0)); + setIcon(ModuleType.get(module).getNodeIcon((flags1 & Iconable.ICON_FLAG_OPEN) != 0)); } else if (value instanceof ModuleGroup) { append(value.toString(), SimpleTextAttributes.REGULAR_ATTRIBUTES); setIcon(expanded ? PlatformIcons.OPENED_MODULE_GROUP_ICON : PlatformIcons.CLOSED_MODULE_GROUP_ICON); diff --git a/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java index 4a5c108b5744..3271e723cbc6 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java @@ -17,6 +17,7 @@ package com.intellij.ide.util; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.roots.*; import com.intellij.openapi.util.IconLoader; @@ -77,7 +78,7 @@ public class PsiElementModuleRenderer extends DefaultListCellRenderer{ setIcon(TEST_ICON); } else { - setIcon(module.getModuleType().getNodeIcon(false)); + setIcon(ModuleType.get(module).getNodeIcon(false)); } } else { if (psiFile != null) { diff --git a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java index 53564cc8c009..0f074ee65eae 100644 --- a/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java +++ b/platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java @@ -27,6 +27,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; @@ -530,7 +531,7 @@ public class ModulesDependenciesPanel extends JPanel implements ModuleRootListen } MyUserObject node = (MyUserObject)userObject; Module module = node.getModule(); - setIcon(module.getModuleType().getNodeIcon(expanded)); + setIcon(ModuleType.get(module).getNodeIcon(expanded)); if (node.isInCycle()){ append(module.getName(), SimpleTextAttributes.ERROR_ATTRIBUTES); } else { diff --git a/platform/lang-impl/src/com/intellij/openapi/components/impl/stores/ModuleStoreImpl.java b/platform/lang-impl/src/com/intellij/openapi/components/impl/stores/ModuleStoreImpl.java index 74bf0470155a..5d0e994a317c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/components/impl/stores/ModuleStoreImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/components/impl/stores/ModuleStoreImpl.java @@ -70,7 +70,7 @@ public class ModuleStoreImpl extends BaseFileConfigurableStoreImpl implements IM final ModuleFileData storageData = getMainStorageData(); final String moduleTypeId = storageData.myOptions.get(ModuleImpl.ELEMENT_TYPE); - myModule.setModuleType(ModuleTypeManager.getInstance().findByID(moduleTypeId)); + myModule.setOption(Module.ELEMENT_TYPE, ModuleTypeManager.getInstance().findByID(moduleTypeId).getId()); if (ApplicationManager.getApplication().isHeadlessEnvironment() || ApplicationManager.getApplication().isUnitTestMode()) return; diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java index 58adea10b78f..1c2078e06d2e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java @@ -24,7 +24,6 @@ import com.intellij.openapi.components.impl.ComponentManagerImpl; import com.intellij.openapi.components.impl.ModulePathMacroManager; import com.intellij.openapi.components.impl.stores.IComponentStore; import com.intellij.openapi.components.impl.stores.IModuleStore; -import com.intellij.openapi.components.impl.stores.IProjectStore; import com.intellij.openapi.components.impl.stores.ModuleStoreImpl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.AreaInstance; @@ -32,7 +31,6 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleComponent; -import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.impl.scopes.ModuleWithDependenciesScope; import com.intellij.openapi.module.impl.scopes.ModuleWithDependentsScope; import com.intellij.openapi.project.Project; @@ -61,11 +59,9 @@ public class ModuleImpl extends ComponentManagerImpl implements Module { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.module.impl.ModuleImpl"); @NotNull private final Project myProject; - private ModuleType myModuleType = null; private boolean isModuleAdded; @NonNls private static final String OPTION_WORKSPACE = "workspace"; - @NonNls public static final String ELEMENT_TYPE = "type"; private final Map myScopeCache = new StripedLockConcurrentHashMap(); @@ -209,12 +205,6 @@ public class ModuleImpl extends ComponentManagerImpl implements Module { } } - @NotNull - public ModuleType getModuleType() { - LOG.assertTrue(myModuleType != null, "Module type not initialized yet"); - return myModuleType; - } - @NotNull public Project getProject() { return myProject; @@ -236,11 +226,6 @@ public class ModuleImpl extends ComponentManagerImpl implements Module { } } - public void setModuleType(ModuleType type) { - myModuleType = type; - setOption(ELEMENT_TYPE, type.getId()); - } - public void setOption(@NotNull String optionName, @NotNull String optionValue) { getStateStore().setOption(optionName, optionValue); } diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java index 4bc2d0496d0e..250d6862a41e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java @@ -244,7 +244,7 @@ public class ModuleManagerImpl extends ModuleManager implements ProjectComponent for (final ModulePath modulePath : myModulePaths) { try { final Module module = moduleModel.loadModuleInternal(modulePath.getPath()); - if (module.getModuleType() instanceof UnknownModuleType) { + if (ModuleType.get(module) instanceof UnknownModuleType) { modulesWithUnknownTypes.add(module); } final String groupPathString = modulePath.getModuleGroup(); @@ -273,13 +273,13 @@ public class ModuleManagerImpl extends ModuleManager implements ProjectComponent String message; if (modulesWithUnknownTypes.size() == 1) { message = ProjectBundle.message("module.unknown.type.single.error", modulesWithUnknownTypes.get(0).getName(), - modulesWithUnknownTypes.get(0).getModuleType().getId()); + ModuleType.get(modulesWithUnknownTypes.get(0)).getId()); } else { StringBuilder modulesBuilder = new StringBuilder(); for (final Module module : modulesWithUnknownTypes) { modulesBuilder.append("
\""); - modulesBuilder.append(module.getName()).append("\" (type '").append(module.getModuleType().getId()).append("')"); + modulesBuilder.append(module.getName()).append("\" (type '").append(ModuleType.get(module).getId()).append("')"); } modulesBuilder.append("
"); message = ProjectBundle.message("module.unknown.type.multiple.error", modulesBuilder.toString()); @@ -684,7 +684,7 @@ public class ModuleManagerImpl extends ModuleManager implements ProjectComponent ModuleImpl module = getModuleByFilePath(filePath); if (module == null) { module = new ModuleImpl(filePath, myProject); - module.setModuleType(moduleType); + module.setOption(Module.ELEMENT_TYPE, moduleType.getId()); if (options != null) { for ( Map.Entry option : options.entrySet()) { module.setOption(option.getKey(),option.getValue()); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java index e26799d7fc67..279fa8c76a0c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java @@ -23,6 +23,7 @@ package com.intellij.openapi.roots.ui.configuration; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.ide.util.ChooseElementsDialog; import org.jetbrains.annotations.Nullable; @@ -50,7 +51,7 @@ public class ChooseModulesDialog extends ChooseElementsDialog { } protected Icon getItemIcon(final Module item) { - return item.getModuleType().getNodeIcon(false); + return ModuleType.get(item).getNodeIcon(false); } protected String getItemText(final Module item) { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java index 64a0aa6e69ea..36d6b70a1840 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesCombobox.java @@ -18,6 +18,7 @@ package com.intellij.openapi.roots.ui.configuration; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComboBox; import com.intellij.ui.SortedComboBoxModel; @@ -45,7 +46,7 @@ public class ModulesCombobox extends ComboBox { public void customize(JList list, Module value, int index, boolean selected, boolean hasFocus) { if (value != null) { setText(value.getName()); - setIcon(value.getModuleType().getNodeIcon(false)); + setIcon(ModuleType.get(value).getNodeIcon(false)); } else { setText("[none]"); diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserModuleNode.java b/platform/lang-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserModuleNode.java index 8965746c2ecd..00fb025f7cd2 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserModuleNode.java +++ b/platform/lang-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserModuleNode.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes.ui; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.FilePathImpl; import com.intellij.openapi.vfs.VirtualFile; @@ -37,7 +38,7 @@ public class ChangesBrowserModuleNode extends ChangesBrowserNode { renderer.append(module.isDisposed() ? "" : module.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES); appendCount(renderer); - renderer.setIcon(module.getModuleType().getNodeIcon(expanded)); + renderer.setIcon(ModuleType.get(module).getNodeIcon(expanded)); } @Override diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java index cef04e9d092a..1db1b4d5d04e 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleNode.java @@ -18,6 +18,7 @@ package com.intellij.packageDependencies.ui; import com.intellij.analysis.AnalysisScopeBundle; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService; import com.intellij.openapi.util.Comparing; import com.intellij.pom.NavigatableWithText; @@ -59,11 +60,11 @@ public class ModuleNode extends PackageDependenciesNode implements NavigatableWi } public Icon getOpenIcon() { - return myModule == null ? null : myModule.getModuleType().getNodeIcon(true); + return myModule == null ? null : ModuleType.get(myModule).getNodeIcon(true); } public Icon getClosedIcon() { - return myModule == null ? null : myModule.getModuleType().getNodeIcon(false); + return myModule == null ? null : ModuleType.get(myModule).getNodeIcon(false); } public String toString() { diff --git a/platform/lang-impl/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java b/platform/lang-impl/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java index fbea5193613e..02bcb475c29c 100644 --- a/platform/lang-impl/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java +++ b/platform/lang-impl/src/com/intellij/util/ui/classpath/ChooseLibrariesDialogBase.java @@ -14,6 +14,7 @@ import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.roots.LibraryOrderEntry; @@ -271,8 +272,8 @@ public abstract class ChooseLibrariesDialogBase extends DialogWrapper { protected ModuleDescriptor(final Project project, final NodeDescriptor parentDescriptor, final Module element) { super(project, parentDescriptor, element); final PresentationData templatePresentation = getTemplatePresentation(); - templatePresentation.setClosedIcon(element.getModuleType().getNodeIcon(false)); - templatePresentation.setOpenIcon(element.getModuleType().getNodeIcon(true)); + templatePresentation.setClosedIcon(ModuleType.get(element).getNodeIcon(false)); + templatePresentation.setOpenIcon(ModuleType.get(element).getNodeIcon(true)); templatePresentation.addText(notEmpty(element.getName()), SimpleTextAttributes.REGULAR_ATTRIBUTES); } diff --git a/platform/testFramework/src/com/intellij/mock/MockModule.java b/platform/testFramework/src/com/intellij/mock/MockModule.java index c900ec975d69..c0cee8e54384 100644 --- a/platform/testFramework/src/com/intellij/mock/MockModule.java +++ b/platform/testFramework/src/com/intellij/mock/MockModule.java @@ -4,7 +4,6 @@ package com.intellij.mock; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; @@ -57,12 +56,6 @@ public class MockModule extends MockComponentManager implements Module { return new MockGlobalSearchScope(); } - @Override - @NotNull - public ModuleType getModuleType() { - throw new UnsupportedOperationException("Method getModuleType is not yet implemented in " + getClass().getName()); - } - @Override public GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(final boolean includeTests) { return new MockGlobalSearchScope(); diff --git a/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java b/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java index 0978ab0e03bb..d57d36db645e 100644 --- a/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java +++ b/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java @@ -20,6 +20,7 @@ import com.intellij.openapi.actionSystem.DataSink; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.TypeSafeDataProvider; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.OrderEntry; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.FileStatus; @@ -137,7 +138,7 @@ public class ModuleGroupingRule implements UsageGroupingRule { } public Icon getIcon(boolean isOpen) { - return myModule.getModuleType().getNodeIcon(isOpen); + return ModuleType.get(myModule).getNodeIcon(isOpen); } @NotNull diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java index ccb5f9cf58a7..2244913de37e 100644 --- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java +++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ChooseModuleStep.java @@ -20,6 +20,7 @@ import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.ide.util.PropertiesComponent; import com.intellij.ide.wizard.CommitStepException; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.ui.CollectionComboBoxModel; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.util.AndroidBundle; @@ -62,7 +63,7 @@ class ChooseModuleStep extends ExportSignedPackageWizardStep { public void customize(JList list, AndroidFacet value, int index, boolean selected, boolean hasFocus) { final Module module = value.getModule(); setText(module.getName()); - setIcon(module.getModuleType().getNodeIcon(false)); + setIcon(ModuleType.get(module).getNodeIcon(false)); } }); myModuleCombo.addActionListener(new ActionListener() { diff --git a/plugins/android/src/org/jetbrains/android/newProject/AndroidModuleConfigurationEditorProvider.java b/plugins/android/src/org/jetbrains/android/newProject/AndroidModuleConfigurationEditorProvider.java index 0025a08aa9a2..98b77903d7be 100644 --- a/plugins/android/src/org/jetbrains/android/newProject/AndroidModuleConfigurationEditorProvider.java +++ b/plugins/android/src/org/jetbrains/android/newProject/AndroidModuleConfigurationEditorProvider.java @@ -16,6 +16,7 @@ package org.jetbrains.android.newProject; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.ui.configuration.ModuleConfigurationEditorProvider; import com.intellij.openapi.roots.ui.configuration.ModuleConfigurationState; import com.intellij.openapi.roots.ui.configuration.DefaultModuleConfigurationEditorFactory; @@ -35,7 +36,7 @@ import java.util.ArrayList; public class AndroidModuleConfigurationEditorProvider implements ModuleConfigurationEditorProvider { public ModuleConfigurationEditor[] createEditors(ModuleConfigurationState state) { final Module module = state.getRootModel().getModule(); - if (module.getModuleType() != AndroidModuleType.getInstance()) { + if (ModuleType.get(module) != AndroidModuleType.getInstance()) { return ModuleConfigurationEditor.EMPTY; } diff --git a/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java b/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java index 44b8c5f15bde..3c7dc4cb8f6e 100644 --- a/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java +++ b/plugins/android/src/org/jetbrains/android/newProject/AndroidModulesComboBox.java @@ -18,6 +18,7 @@ package org.jetbrains.android.newProject; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.annotations.NotNull; @@ -37,7 +38,7 @@ public class AndroidModulesComboBox extends JComboBox { if (value instanceof Module) { final Module module = (Module)value; setText(module.getName()); - setIcon(module.getModuleType().getNodeIcon(false)); + setIcon(ModuleType.get(module).getNodeIcon(false)); } else { setText("[none]"); diff --git a/plugins/devkit/src/actions/GeneratePluginClassAction.java b/plugins/devkit/src/actions/GeneratePluginClassAction.java index 24e066ee5014..db5e55e00c38 100644 --- a/plugins/devkit/src/actions/GeneratePluginClassAction.java +++ b/plugins/devkit/src/actions/GeneratePluginClassAction.java @@ -20,6 +20,7 @@ import com.intellij.ide.actions.CreateElementActionBase; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.OrderEntry; import com.intellij.openapi.roots.ProjectFileIndex; @@ -77,7 +78,7 @@ public abstract class GeneratePluginClassAction extends CreateElementActionBase final Module module = getModule(directory); if (module != null) { - if (module.getModuleType() == PluginModuleType.getInstance()) { + if (ModuleType.get(module) == PluginModuleType.getInstance()) { addPluginModule(module); } else { final List candidateModules = PluginModuleType.getCandidateModules(module); diff --git a/plugins/devkit/src/build/PluginBuildParticipantProvider.java b/plugins/devkit/src/build/PluginBuildParticipantProvider.java index 7064ce720196..b8a35d377a96 100644 --- a/plugins/devkit/src/build/PluginBuildParticipantProvider.java +++ b/plugins/devkit/src/build/PluginBuildParticipantProvider.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.devkit.build; import com.intellij.openapi.compiler.make.BuildParticipantProvider; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import org.jetbrains.idea.devkit.module.PluginModuleType; import java.util.Collection; @@ -28,7 +29,7 @@ import java.util.Collections; */ public class PluginBuildParticipantProvider extends BuildParticipantProvider { public Collection getParticipants(final Module module) { - if (module.getModuleType() != PluginModuleType.getInstance()) { + if (ModuleType.get(module) != PluginModuleType.getInstance()) { return Collections.emptyList(); } diff --git a/plugins/devkit/src/build/PluginBuildUtil.java b/plugins/devkit/src/build/PluginBuildUtil.java index c173fdc50fcc..157d31cd0cfa 100644 --- a/plugins/devkit/src/build/PluginBuildUtil.java +++ b/plugins/devkit/src/build/PluginBuildUtil.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.devkit.build; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.*; @@ -63,7 +64,7 @@ public class PluginBuildUtil { productionRuntimeDependencies(module).forEachModule(new Processor() { @Override public boolean process(Module dep) { - if (dep.getModuleType() == StdModuleTypes.JAVA && !modules.contains(dep)) { + if (ModuleType.get(dep) == StdModuleTypes.JAVA && !modules.contains(dep)) { modules.add(dep); getDependencies(dep, modules); } diff --git a/plugins/devkit/src/build/PrepareAllToDeployAction.java b/plugins/devkit/src/build/PrepareAllToDeployAction.java index b9cf49fa938d..da57a7d1fbd3 100644 --- a/plugins/devkit/src/build/PrepareAllToDeployAction.java +++ b/plugins/devkit/src/build/PrepareAllToDeployAction.java @@ -20,6 +20,7 @@ import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import org.jetbrains.idea.devkit.DevKitBundle; import org.jetbrains.idea.devkit.module.PluginModuleType; @@ -36,7 +37,7 @@ public class PrepareAllToDeployAction extends PrepareToDeployAction { List pluginModules = new ArrayList(); for (Module aModule : ModuleManager.getInstance(project).getModules()) { - if (aModule.getModuleType() instanceof PluginModuleType) { + if (ModuleType.get(aModule) instanceof PluginModuleType) { pluginModules.add(aModule); } } @@ -55,7 +56,7 @@ public class PrepareAllToDeployAction extends PrepareToDeployAction { final Project project = e.getData(PlatformDataKeys.PROJECT); if (project != null) { for (Module aModule : (ModuleManager.getInstance(project).getModules())) { - if (aModule.getModuleType() instanceof PluginModuleType) { + if (ModuleType.get(aModule) instanceof PluginModuleType) { moduleCount++; } } @@ -66,7 +67,7 @@ public class PrepareAllToDeployAction extends PrepareToDeployAction { } else if (moduleCount > 0) { final Module module = e.getData(LangDataKeys.MODULE); - if (module == null || !(module.getModuleType() instanceof PluginModuleType)) { + if (module == null || !(ModuleType.get(module) instanceof PluginModuleType)) { enabled = true; } } diff --git a/plugins/devkit/src/build/PrepareToDeployAction.java b/plugins/devkit/src/build/PrepareToDeployAction.java index c141f3723d4d..9739ef0dbc74 100644 --- a/plugins/devkit/src/build/PrepareToDeployAction.java +++ b/plugins/devkit/src/build/PrepareToDeployAction.java @@ -25,6 +25,7 @@ import com.intellij.openapi.compiler.CompilerManager; import com.intellij.openapi.compiler.make.ManifestBuilder; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; @@ -67,7 +68,7 @@ public class PrepareToDeployAction extends AnAction { public void actionPerformed(final AnActionEvent e) { final Module module = LangDataKeys.MODULE.getData(e.getDataContext()); - if (module != null && module.getModuleType() instanceof PluginModuleType) { + if (module != null && ModuleType.get(module) instanceof PluginModuleType) { doPrepare(Arrays.asList(module), LangDataKeys.PROJECT.getData(e.getDataContext())); } } @@ -343,7 +344,7 @@ public class PrepareToDeployAction extends AnAction { public void update(AnActionEvent e) { final Module module = LangDataKeys.MODULE.getData(e.getDataContext()); - boolean enabled = module != null && module.getModuleType() instanceof PluginModuleType; + boolean enabled = module != null && ModuleType.get(module) instanceof PluginModuleType; e.getPresentation().setVisible(enabled); e.getPresentation().setEnabled(enabled); if (enabled) { diff --git a/plugins/devkit/src/module/PluginModuleEditorsProvider.java b/plugins/devkit/src/module/PluginModuleEditorsProvider.java index c2b5d0a5cf6f..2e91b570e8bb 100644 --- a/plugins/devkit/src/module/PluginModuleEditorsProvider.java +++ b/plugins/devkit/src/module/PluginModuleEditorsProvider.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.devkit.module; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleConfigurationEditor; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.ui.configuration.DefaultModuleConfigurationEditorFactory; import com.intellij.openapi.roots.ui.configuration.ModuleConfigurationEditorProvider; import com.intellij.openapi.roots.ui.configuration.ModuleConfigurationState; @@ -29,7 +30,7 @@ public class PluginModuleEditorsProvider implements ModuleConfigurationEditorPro public ModuleConfigurationEditor[] createEditors(ModuleConfigurationState state) { final Module module = state.getRootModel().getModule(); - if (module.getModuleType() != PluginModuleType.getInstance()) return ModuleConfigurationEditor.EMPTY; + if (ModuleType.get(module) != PluginModuleType.getInstance()) return ModuleConfigurationEditor.EMPTY; final DefaultModuleConfigurationEditorFactory editorFactory = DefaultModuleConfigurationEditorFactory.getInstance(); List editors = new ArrayList(); diff --git a/plugins/devkit/src/module/PluginModuleType.java b/plugins/devkit/src/module/PluginModuleType.java index 315295f71bfa..b1637ec0e643 100644 --- a/plugins/devkit/src/module/PluginModuleType.java +++ b/plugins/devkit/src/module/PluginModuleType.java @@ -60,7 +60,7 @@ public class PluginModuleType extends ModuleType { } public static boolean isOfType(Module module) { - return module.getModuleType() instanceof PluginModuleType; + return get(module) instanceof PluginModuleType; } public ModuleWizardStep[] createWizardSteps(final WizardContext wizardContext, @@ -107,7 +107,7 @@ public class PluginModuleType extends ModuleType { @Nullable public static XmlFile getPluginXml(Module module, boolean initialize) { if (module == null) return null; - if (!(module.getModuleType() instanceof PluginModuleType)) return null; + if (!(get(module) instanceof PluginModuleType)) return null; final PluginBuildConfiguration buildConfiguration = PluginBuildConfiguration.getInstance(module); if (buildConfiguration == null) return null; @@ -137,7 +137,7 @@ public class PluginModuleType extends ModuleType { final List candidates = new ArrayList(modules.length); final Set deps = new HashSet(modules.length); for (Module m : modules) { - if (m.getModuleType() == getInstance()) { + if (get(m) == getInstance()) { deps.clear(); PluginBuildUtil.getDependencies(m, deps); diff --git a/plugins/devkit/src/run/PluginRunConfiguration.java b/plugins/devkit/src/run/PluginRunConfiguration.java index 301459f68afc..dc0da164deb5 100644 --- a/plugins/devkit/src/run/PluginRunConfiguration.java +++ b/plugins/devkit/src/run/PluginRunConfiguration.java @@ -25,6 +25,7 @@ import com.intellij.execution.runners.ProgramRunner; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.JavaSdkType; @@ -207,7 +208,7 @@ public class PluginRunConfiguration extends RunConfigurationBase implements Modu List modules = new ArrayList(); Module[] allModules = ModuleManager.getInstance(getProject()).getModules(); for (Module module : allModules) { - if (module.getModuleType() == PluginModuleType.getInstance()) { + if (ModuleType.get(module) == PluginModuleType.getInstance()) { modules.add(module); } } diff --git a/plugins/devkit/src/run/PluginRunConfigurationEditor.java b/plugins/devkit/src/run/PluginRunConfigurationEditor.java index ae1da5511c7d..e583397b813d 100644 --- a/plugins/devkit/src/run/PluginRunConfigurationEditor.java +++ b/plugins/devkit/src/run/PluginRunConfigurationEditor.java @@ -19,6 +19,7 @@ import com.intellij.execution.configurations.LogFileOptions; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.projectRoots.Sdk; @@ -126,7 +127,7 @@ public class PluginRunConfigurationEditor extends SettingsEditor nojdkModules = new HashSet(); for (Module module : modules) { - if(!GroovyUtils.isAcceptableModuleType(module.getModuleType())) continue; + if(!GroovyUtils.isAcceptableModuleType(ModuleType.get(module))) continue; final Sdk sdk = ModuleRootManager.getInstance(module).getSdk(); if (sdk == null || !(sdk.getSdkType() instanceof JavaSdkType)) { nojdkModules.add(module); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java index 6e8982a2003c..924d785d4a6f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java @@ -36,6 +36,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; @@ -383,7 +384,7 @@ public abstract class GroovyCompilerBase implements TranslatingCompiler { final CompilerConfiguration configuration = CompilerConfiguration.getInstance(myProject); final PsiManager psiManager = PsiManager.getInstance(myProject); - if (GroovyUtils.isAcceptableModuleType(module.getModuleType())) { + if (GroovyUtils.isAcceptableModuleType(ModuleType.get(module))) { for (final VirtualFile file : moduleFiles) { if (shouldCompile(file, configuration, psiManager)) { (index.isInTestSourceContent(file) ? toCompileTests : toCompile).add(file); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java index a483b060ccfd..8cea320dc95e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/util/ModuleCellRenderer.java @@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.mvc.util; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import javax.swing.*; @@ -31,7 +32,7 @@ public class ModuleCellRenderer extends ListCellRendererWrapper { @Override public void customize(JList list, Module module, int index, boolean selected, boolean hasFocus) { if (module != null) { - setIcon(module.getModuleType().getNodeIcon(false)); + setIcon(ModuleType.get(module).getNodeIcon(false)); setText(module.getName()); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java index a46e50b107cf..7eb93093acc3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java @@ -21,6 +21,7 @@ import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.ide.util.BrowseFilesListener; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.roots.ui.configuration.ModulesAlphaComparator; @@ -119,7 +120,7 @@ public class GroovyRunConfigurationEditor extends SettingsEditor each) { MavenProject project = each.first; Module module = each.second; - return module.getModuleType().getName() + + return ModuleType.get(module).getName() + " '" + module.getName() + "' for Maven project '" + diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java index a90e2a5cb26d..7cf3a0e245bf 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java @@ -25,6 +25,7 @@ import com.intellij.openapi.fileTypes.*; import com.intellij.openapi.fileTypes.impl.FileTypeRenderer; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; @@ -277,7 +278,7 @@ class XsltRunSettingsEditor extends SettingsEditor { return module.getName(); } })); - setIcon(module.getModuleType().getNodeIcon(true)); + setIcon(ModuleType.get(module).getNodeIcon(true)); } else if (value instanceof String) { setText((String)value); } diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java index ab813d6e8d35..2d79e7571fad 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/ScopePanel.java @@ -21,6 +21,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.TextFieldWithBrowseButton; @@ -95,7 +96,7 @@ public class ScopePanel extends JPanel implements Disposable{ @Override public void customize(JList list, Module m, int index, boolean selected, boolean hasFocus) { if (m != null) { - setIcon(m.getModuleType().getNodeIcon(true)); + setIcon(ModuleType.get(m).getNodeIcon(true)); setText(m.getName()); } }