4 files changed, 7 insertions, 26 deletions
diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
index 51296b6f41ac..e1d46ea35e30 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java
@@ -43,7 +43,6 @@ import com.intellij.ui.HideableDecorator;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.JBList;
-import com.intellij.util.containers.FactoryMap;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -94,13 +93,6 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep
   private final StepSequence mySequence;
   @Nullable
   private ModuleWizardStep mySettingsStep;
-  private FactoryMap<String, ModuleWizardStep> mySettingsSteps = new FactoryMap<String, ModuleWizardStep>() {
-    @Nullable
-    @Override
-    protected ModuleWizardStep create(String key) {
-      return myModuleBuilder.modifySettingsStep(SelectTemplateStep.this);
-    }
-  };
 
   private final ProjectTypesList myList;
 
@@ -160,9 +152,6 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep
   @Override
   public void disposeUIResources() {
     Disposer.dispose(myList);
-    for (ModuleWizardStep step : mySettingsSteps.values()) {
-      step.disposeUIResources();
-    }
   }
 
   @Override
@@ -184,7 +173,9 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep
     restorePanel(myNamePathComponent, 4);
     restorePanel(myModulePanel, myWizardContext.isCreatingNewProject() ? 8 : 6);
     restorePanel(myExpertPanel, myWizardContext.isCreatingNewProject() ? 1 : 0);
-    createSettingsStep();
+
+    if (mySettingsStep != null) mySettingsStep.disposeUIResources();
+    mySettingsStep = myModuleBuilder == null ? null : myModuleBuilder.modifySettingsStep(this);
 
     String description = null;
     if (template != null) {
@@ -208,15 +199,6 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep
     mySettingsPanel.repaint();
   }
 
-  private void createSettingsStep() {
-    if (myModuleBuilder == null) {
-      mySettingsStep = null;
-    }
-    else {
-      mySettingsStep = mySettingsSteps.get(myModuleBuilder.getBuilderId());
-    }
-  }
-
   private static int restorePanel(JPanel component, int i) {
     int removed = 0;
     while (component.getComponentCount() > i) {
diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java
index bbc9b21769f2..866bc7701394 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java
@@ -55,11 +55,10 @@ public class StepSequence {
 
   public void addStepsForBuilder(@NotNull AbstractModuleBuilder builder,
                                  @NotNull WizardContext wizardContext,
-                                 @NotNull ModulesProvider modulesProvider,
-                                 boolean forNewWizard) {
+                                 @NotNull ModulesProvider modulesProvider) {
     String id = builder.getBuilderId();
     if (!mySpecificSteps.containsKey(id)) {
-      mySpecificSteps.put(id, Arrays.asList(builder.createWizardSteps(wizardContext, modulesProvider, forNewWizard)));
+      mySpecificSteps.put(id, Arrays.asList(builder.createWizardSteps(wizardContext, modulesProvider)));
     }
   }
 
diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java
index bb631ec75ede..bc10c316e6d7 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java
@@ -63,7 +63,7 @@ public class CreateFromScratchMode extends WizardMode {
 
     StepSequence sequence = new StepSequence();
     for (ModuleBuilder builder : builders) {
-      sequence.addStepsForBuilder(builder, context, modulesProvider, false);
+      sequence.addStepsForBuilder(builder, context, modulesProvider);
     }
     return sequence;
   }
diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java
index acac1865a5aa..898e6243f7a5 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java
@@ -108,7 +108,7 @@ public class CreateFromTemplateMode extends WizardMode {
     MultiMap<TemplatesGroup, ProjectTemplate> map = getTemplatesMap(context, true);
     StepSequence sequence = new StepSequence();
     for (ProjectTemplate template : map.values()) {
-      sequence.addStepsForBuilder(template.createModuleBuilder(), context, modulesProvider, false);
+      sequence.addStepsForBuilder(template.createModuleBuilder(), context, modulesProvider);
     }
     mySelectTemplateStep = new SelectTemplateStep(context, sequence, map);
     sequence.addCommonStep(mySelectTemplateStep);