From 86ad4d8cee1d16d82f0e77282c2c222bb4798ceb Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Tue, 22 Oct 2013 12:32:42 +0400
Subject: [PATCH] old wizard fixed

---
 .../src/com/intellij/openapi/module/JavaModuleType.java     | 2 +-
 .../intellij/ide/util/projectWizard/JavaModuleBuilder.java  | 6 +++++-
 .../src/com/intellij/openapi/module/ModuleType.java         | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
index af508e2d7be4..0ad4e7c99309 100644
--- a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
+++ b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
@@ -94,7 +94,7 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
       }
     }
     final ModuleWizardStep[] wizardSteps = steps.toArray(new ModuleWizardStep[steps.size()]);
-    return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider));
+    return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider, forNewWizard));
   }
 
   @Nullable
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 826f1a9dcd94..3940663ee712 100644
--- a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
+++ b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
@@ -92,7 +92,11 @@ public class JavaModuleBuilder extends ModuleBuilder implements SourcePathsBuild
 
   @Override
   public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) {
-    return forNewWizard ? ModuleWizardStep.EMPTY_ARRAY : super.createWizardSteps(wizardContext, modulesProvider);
+    if (forNewWizard) return ModuleWizardStep.EMPTY_ARRAY;
+    ModuleType moduleType = getModuleType();
+    return moduleType == null
+           ? ModuleWizardStep.EMPTY_ARRAY
+           : moduleType.createWizardSteps(wizardContext, this, modulesProvider, false);
   }
 
   public void setupRootModel(ModifiableRootModel rootModel) throws ConfigurationException {
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 30d624a233b9..7cdb65f62f99 100644
--- a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java
+++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java
@@ -58,11 +58,11 @@ public abstract class ModuleType<T extends ModuleBuilder> {
 
   @NotNull
   public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull T moduleBuilder, @NotNull ModulesProvider modulesProvider) {
-    return ModuleWizardStep.EMPTY_ARRAY;
+    return createWizardSteps(wizardContext, moduleBuilder, modulesProvider, false);
   }
 
   public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull T moduleBuilder, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) {
-    return createWizardSteps(wizardContext, moduleBuilder, modulesProvider);
+    return ModuleWizardStep.EMPTY_ARRAY;
   }
 
   @Nullable