From 2f0e1a14ce615f2a99cc0fc0a81f8259f3861e7e Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Thu, 1 Nov 2012 15:36:21 +0400
Subject: [PATCH] show Express Node.js app generator settings

---
 .../ide/util/newProjectWizard/SelectTemplateStep.java  |  8 ++++----
 .../intellij/ide/util/projectWizard/SettingsStep.java  | 10 ++++++----
 .../ide/util/projectWizard/WebProjectTemplate.java     |  6 +++++-
 3 files changed, 15 insertions(+), 9 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 163931be7130..b73465221202 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
@@ -511,7 +511,7 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep
   }
 
   @Override
-  public void addSettingsField(String label, JComponent field) {
+  public void addSettingsField(@NotNull String label, @NotNull JComponent field) {
 
     JPanel panel = myWizardContext.isCreatingNewProject() ? myNamePathComponent : myModulePanel;
     addField(label, field, panel);
@@ -527,19 +527,19 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep
   }
 
   @Override
-  public void addSettingsComponent(JComponent component) {
+  public void addSettingsComponent(@NotNull JComponent component) {
     myNamePathComponent.add(component, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0, GridBagConstraints.NORTHWEST,
                                                         GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
   }
 
   @Override
-  public void addExpertPanel(JComponent panel) {
+  public void addExpertPanel(@NotNull JComponent panel) {
     myExpertPanel.add(panel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0, GridBagConstraints.NORTHWEST,
                                                     GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
   }
 
   @Override
-  public void addExpertField(String label, JComponent field) {
+  public void addExpertField(@NotNull String label, @NotNull JComponent field) {
     JPanel panel = myWizardContext.isCreatingNewProject() ? myModulePanel : myExpertPanel;
     addField(label, field, panel);
   }
diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/SettingsStep.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/SettingsStep.java
index 3db4c11d6e16..ab493e977582 100644
--- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/SettingsStep.java
+++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/SettingsStep.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.ide.util.projectWizard;
 
+import org.jetbrains.annotations.NotNull;
+
 import javax.swing.*;
 
 /**
@@ -25,10 +27,10 @@ public interface SettingsStep {
 
   WizardContext getContext();
 
-  void addSettingsField(String label, JComponent field);
+  void addSettingsField(@NotNull String label, @NotNull JComponent field);
 
-  void addSettingsComponent(JComponent component);
+  void addSettingsComponent(@NotNull JComponent component);
 
-  void addExpertPanel(JComponent panel);
-  void addExpertField(String label, JComponent field);
+  void addExpertPanel(@NotNull JComponent panel);
+  void addExpertField(@NotNull String label, @NotNull JComponent field);
 }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebProjectTemplate.java b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebProjectTemplate.java
index 50c8846065f4..9d3fe871f174 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebProjectTemplate.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebProjectTemplate.java
@@ -76,10 +76,14 @@ public abstract class WebProjectTemplate<T> extends WebProjectGenerator<T> imple
       @Nullable
       @Override
       public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep) {
-        Pair<String, JComponent> pair = myPeer.getValue().getSettingsField();
+        GeneratorPeer<T> peer = myPeer.getValue();
+        Pair<String, JComponent> pair = peer.getSettingsField();
         if (pair != null) {
           settingsStep.addSettingsField(pair.first, pair.second);
         }
+        else {
+          settingsStep.addSettingsComponent(peer.getComponent());
+        }
         return new ModuleWizardStep() {
           @Override
           public JComponent getComponent() {