From a470da4acd12f4a5a38d20b087c0c13bdaf4b166 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Tue, 16 Oct 2012 10:23:03 +0400
Subject: [PATCH] IDEA-92964 Unable to create new module

---
 .../newProjectWizard/ProjectNameWithTypeStep.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.java
index c002951d4551..d353cb9319ce 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.java
@@ -88,7 +88,7 @@ public class ProjectNameWithTypeStep extends ProjectNameStep {
     myAdditionalContentPanel.add(myModulePanel,
                                  new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1, 1, GridBagConstraints.NORTHWEST,
                                                         GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-    myHeader.setVisible(myWizardContext.isCreatingNewProject());
+    myHeader.setVisible(myWizardContext.isCreatingNewProject() && !isCreateFromTemplateMode());
     myCreateModuleCb.addActionListener(new ActionListener() {
       public void actionPerformed(final ActionEvent e) {
         UIUtil.setEnabled(myInternalPanel, myCreateModuleCb.isSelected(), true);
@@ -275,9 +275,8 @@ public class ProjectNameWithTypeStep extends ProjectNameStep {
     }
 
 
-    if (mode instanceof CreateFromTemplateMode) {
+    if (isCreateFromTemplateMode()) {
       replaceModuleTypeOptions(new JPanel());
-      myHeader.setVisible(false);
     }
     else {
       final AnAction arrow = new AnAction() {
@@ -303,6 +302,10 @@ public class ProjectNameWithTypeStep extends ProjectNameStep {
     }
   }
 
+  private boolean isCreateFromTemplateMode() {
+    return myMode instanceof CreateFromTemplateMode;
+  }
+
   private Dimension calcTypeListPreferredSize(final List<ModuleBuilder> allModuleTypes) {
     int width = 0;
     int height = 0;
@@ -356,7 +359,7 @@ public class ProjectNameWithTypeStep extends ProjectNameStep {
 
   public void updateStep() {
     super.updateStep();
-    if (myHeader.isVisible()) {
+    if (!isCreateFromTemplateMode()) {
       if (myCreateModuleCb.isSelected()) {
         mySequence.setType(getSelectedBuilderId());
       } else {
@@ -367,12 +370,12 @@ public class ProjectNameWithTypeStep extends ProjectNameStep {
 
   public void updateDataModel() {
 
-    if (myHeader.isVisible()) {
+    if (!isCreateFromTemplateMode()) {
       mySequence.setType(myCreateModuleCb.isSelected() ? getSelectedBuilderId() : null);
     }
     super.updateDataModel();
 
-    if (myHeader.isVisible() && myCreateModuleCb.isSelected()) {
+    if (!isCreateFromTemplateMode() && myCreateModuleCb.isSelected()) {
       final ModuleBuilder builder = (ModuleBuilder)myMode.getModuleBuilder();
       assert builder != null;
       final String moduleName = getModuleName();