From 3ab2bad21d29a9849385d49b6e1174f1fc36c749 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Tue, 22 Oct 2013 16:10:33 +0400
Subject: [PATCH] frameworks support step suppressed for ruby and python

---
 .../ide/util/projectWizard/JavaModuleBuilder.java     |  6 +-----
 .../jetbrains/python/module/PythonModuleBuilder.java  | 11 +++++++++++
 .../com/jetbrains/python/module/PythonModuleType.java | 11 +++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

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 3940663ee712..d20b1bac8bc0 100644
--- a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
+++ b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
@@ -92,11 +92,7 @@ public class JavaModuleBuilder extends ModuleBuilder implements SourcePathsBuild
 
   @Override
   public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) {
-    if (forNewWizard) return ModuleWizardStep.EMPTY_ARRAY;
-    ModuleType moduleType = getModuleType();
-    return moduleType == null
-           ? ModuleWizardStep.EMPTY_ARRAY
-           : moduleType.createWizardSteps(wizardContext, this, modulesProvider, false);
+    return getModuleType().createWizardSteps(wizardContext, this, modulesProvider, forNewWizard);
   }
 
   public void setupRootModel(ModifiableRootModel rootModel) throws ConfigurationException {
diff --git a/python/pluginSrc/com/jetbrains/python/module/PythonModuleBuilder.java b/python/pluginSrc/com/jetbrains/python/module/PythonModuleBuilder.java
index 5f01a9e33f6b..eec3b745107f 100644
--- a/python/pluginSrc/com/jetbrains/python/module/PythonModuleBuilder.java
+++ b/python/pluginSrc/com/jetbrains/python/module/PythonModuleBuilder.java
@@ -15,8 +15,12 @@
  */
 package com.jetbrains.python.module;
 
+import com.intellij.ide.util.projectWizard.ModuleWizardStep;
 import com.intellij.ide.util.projectWizard.SourcePathsBuilder;
+import com.intellij.ide.util.projectWizard.WizardContext;
+import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import com.intellij.openapi.util.Pair;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,4 +45,11 @@ public class PythonModuleBuilder extends PythonModuleBuilderBase implements Sour
     }
     mySourcePaths.add(sourcePathInfo);
   }
+
+  @Override
+  public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext,
+                                              @NotNull ModulesProvider modulesProvider,
+                                              boolean forNewWizard) {
+    return getModuleType().createWizardSteps(wizardContext, this, modulesProvider, forNewWizard);
+  }
 }
diff --git a/python/pluginSrc/com/jetbrains/python/module/PythonModuleType.java b/python/pluginSrc/com/jetbrains/python/module/PythonModuleType.java
index b167e42741d2..3cc4f7a26b2c 100644
--- a/python/pluginSrc/com/jetbrains/python/module/PythonModuleType.java
+++ b/python/pluginSrc/com/jetbrains/python/module/PythonModuleType.java
@@ -39,13 +39,16 @@ public class PythonModuleType extends PythonModuleTypeBase<PythonModuleBuilderBa
   @Override
   public ModuleWizardStep[] createWizardSteps(@NotNull final WizardContext wizardContext,
                                               @NotNull final PythonModuleBuilderBase moduleBuilder,
-                                              @NotNull final ModulesProvider modulesProvider) {
+                                              @NotNull final ModulesProvider modulesProvider,
+                                              boolean forNewWizard) {
     ArrayList<ModuleWizardStep> steps = new ArrayList<ModuleWizardStep>();
     final Project project = getProject(wizardContext);
     steps.add(new PythonSdkSelectStep(moduleBuilder, "reference.project.structure.sdk.python", project));
-    final List<FrameworkSupportInModuleProvider> providers = FrameworkSupportUtil.getProviders(getInstance(), DefaultFacetsProvider.INSTANCE);
-    if (!providers.isEmpty()) {
-      steps.add(new SupportForFrameworksStep(wizardContext, moduleBuilder, LibrariesContainerFactory.createContainer(project)));
+    if (!forNewWizard) {
+      final List<FrameworkSupportInModuleProvider> providers = FrameworkSupportUtil.getProviders(getInstance(), DefaultFacetsProvider.INSTANCE);
+      if (!providers.isEmpty()) {
+        steps.add(new SupportForFrameworksStep(wizardContext, moduleBuilder, LibrariesContainerFactory.createContainer(project)));
+      }
     }
     return steps.toArray(new ModuleWizardStep[steps.size()]);
   }