frameworks support step suppressed for ruby and python

This commit is contained in:
Dmitry Avdeev
2013-10-22 16:12:15 +04:00
parent ae66327a2a
commit 3ab2bad21d
3 changed files with 19 additions and 9 deletions
@@ -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 {
@@ -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);
}
}
@@ -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()]);
}