From 77592aeb1c0a7bd6e0ff75b034745ba98b80427e Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 21 Oct 2013 16:29:09 +0400 Subject: [PATCH] IDEA-115056 NewProjectWizard: for Flash module, no specific settings are available --- .../intellij/ide/util/projectWizard/JavaModuleBuilder.java | 6 ++++++ .../ide/util/projectWizard/AbstractModuleBuilder.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java index 655dc956c399..826f1a9dcd94 100644 --- a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java +++ b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java @@ -27,6 +27,7 @@ import com.intellij.openapi.roots.ModifiableRootModel; 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.ui.configuration.ModulesProvider; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -89,6 +90,11 @@ public class JavaModuleBuilder extends ModuleBuilder implements SourcePathsBuild return StdModuleTypes.JAVA.modifySettingsStep(settingsStep, this); } + @Override + public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) { + return forNewWizard ? ModuleWizardStep.EMPTY_ARRAY : super.createWizardSteps(wizardContext, modulesProvider); + } + public void setupRootModel(ModifiableRootModel rootModel) throws ConfigurationException { final CompilerModuleExtension compilerModuleExtension = rootModel.getModuleExtension(CompilerModuleExtension.class); compilerModuleExtension.setExcludeOutput(true); diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java index 26fd925e4c05..3301b72d42ec 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java @@ -35,7 +35,7 @@ public abstract class AbstractModuleBuilder extends ProjectBuilder { /** @deprecated Will be removed soon */ public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) { - return forNewWizard ? ModuleWizardStep.EMPTY_ARRAY : createWizardSteps(wizardContext, modulesProvider); + return createWizardSteps(wizardContext, modulesProvider); } @Nullable