diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectWizard.java b/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectWizard.java index 5ecda308c122..290d3cd65f8f 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectWizard.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectWizard.java @@ -35,6 +35,7 @@ public class NewProjectWizard extends AbstractProjectWizard { super("New Project", project, defaultPath); // addStep(); // addStep(new ProjectSummaryStep(myWizardContext)); + myWizardContext.setNewWizard(true); mySequence = new StepSequence(); mySequence.addCommonStep(new ProjectTypeStep(myWizardContext, this, modulesProvider)); mySequence.addCommonFinishingStep(new ProjectSettingsStep(myWizardContext), null); diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java index 2003d991dc64..3efa81829db1 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java @@ -141,7 +141,7 @@ public class ProjectTypeStep extends ModuleWizardStep { }); for (ProjectCategory category : map.values()) { - myWizard.getSequence().addStepsForBuilder(myBuilders.get(category), context, modulesProvider, true); + myWizard.getSequence().addStepsForBuilder(myBuilders.get(category), context, modulesProvider); } myFrameworksPanel = new AddSupportForFrameworksPanel(Collections.emptyList(), model, true); @@ -218,7 +218,7 @@ public class ProjectTypeStep extends ModuleWizardStep { public void updateDataModel() { ModuleBuilder builder = getSelectedBuilder(); assert builder != null; - myWizard.getSequence().addStepsForBuilder(builder, myContext, myModulesProvider, true); + myWizard.getSequence().addStepsForBuilder(builder, myContext, myModulesProvider); } @Override 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 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); diff --git a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java index 0ad4e7c99309..ade31f9e3f2d 100644 --- a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java +++ b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java @@ -84,17 +84,17 @@ public class JavaModuleType extends ModuleType { @NotNull @Override public ModuleWizardStep[] createWizardSteps(@NotNull final WizardContext wizardContext, @NotNull final JavaModuleBuilder moduleBuilder, - @NotNull final ModulesProvider modulesProvider, boolean forNewWizard) { + @NotNull final ModulesProvider modulesProvider) { final ProjectWizardStepFactory wizardFactory = ProjectWizardStepFactory.getInstance(); ArrayList steps = new ArrayList(); - if (!forNewWizard) { + if (!wizardContext.isNewWizard()) { final ModuleWizardStep supportForFrameworksStep = wizardFactory.createSupportForFrameworksStep(wizardContext, moduleBuilder, modulesProvider); if (supportForFrameworksStep != null) { steps.add(supportForFrameworksStep); } } final ModuleWizardStep[] wizardSteps = steps.toArray(new ModuleWizardStep[steps.size()]); - return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider, forNewWizard)); + return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider)); } @Nullable 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 d20b1bac8bc0..3184488e0a33 100644 --- a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java +++ b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java @@ -91,8 +91,8 @@ public class JavaModuleBuilder extends ModuleBuilder implements SourcePathsBuild } @Override - public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) { - return getModuleType().createWizardSteps(wizardContext, this, modulesProvider, forNewWizard); + public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) { + return getModuleType().createWizardSteps(wizardContext, this, modulesProvider); } public void setupRootModel(ModifiableRootModel rootModel) throws ConfigurationException { diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java index 3301b72d42ec..665b59337c61 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java @@ -33,11 +33,6 @@ public abstract class AbstractModuleBuilder extends ProjectBuilder { public abstract ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider); - /** @deprecated Will be removed soon */ - public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) { - return createWizardSteps(wizardContext, modulesProvider); - } - @Nullable public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep) { return null; diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java index 71347be40d7d..fde32d08f71d 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java @@ -48,11 +48,20 @@ public class WizardContext extends UserDataHolderBase { private ProjectBuilder myProjectBuilder; private final List myListeners = ContainerUtil.createLockFreeCopyOnWriteList(); private StorageScheme myProjectStorageFormat = StorageScheme.DIRECTORY_BASED; + private boolean myNewWizard; public void setProjectStorageFormat(StorageScheme format) { myProjectStorageFormat = format; } + public boolean isNewWizard() { + return myNewWizard; + } + + public void setNewWizard(boolean newWizard) { + myNewWizard = newWizard; + } + public interface Listener { void buttonsUpdateRequested(); void nextStepRequested(); diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java index 7cdb65f62f99..3e098021b82e 100644 --- a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java +++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java @@ -58,10 +58,6 @@ public abstract class ModuleType { @NotNull public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull T moduleBuilder, @NotNull ModulesProvider modulesProvider) { - return createWizardSteps(wizardContext, moduleBuilder, modulesProvider, false); - } - - public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull T moduleBuilder, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) { return ModuleWizardStep.EMPTY_ARRAY; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java index 7d4e31a7fe95..db1e1a65234d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java @@ -125,15 +125,7 @@ public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuil @Override public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) { return new ModuleWizardStep[]{ - new MavenModuleWizardStep(this, wizardContext, true), - new SelectPropertiesStep(wizardContext.getProject(), this) - }; - } - - @Override - public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) { - return new ModuleWizardStep[]{ - new MavenModuleWizardStep(this, wizardContext, !forNewWizard), + new MavenModuleWizardStep(this, wizardContext, !wizardContext.isNewWizard()), new SelectPropertiesStep(wizardContext.getProject(), this) }; } diff --git a/python/pluginSrc/com/jetbrains/python/module/PythonModuleBuilder.java b/python/pluginSrc/com/jetbrains/python/module/PythonModuleBuilder.java index eec3b745107f..c86f89d034d2 100644 --- a/python/pluginSrc/com/jetbrains/python/module/PythonModuleBuilder.java +++ b/python/pluginSrc/com/jetbrains/python/module/PythonModuleBuilder.java @@ -48,8 +48,7 @@ public class PythonModuleBuilder extends PythonModuleBuilderBase implements Sour @Override public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, - @NotNull ModulesProvider modulesProvider, - boolean forNewWizard) { - return getModuleType().createWizardSteps(wizardContext, this, modulesProvider, forNewWizard); + @NotNull ModulesProvider modulesProvider) { + return getModuleType().createWizardSteps(wizardContext, this, modulesProvider); } } diff --git a/python/pluginSrc/com/jetbrains/python/module/PythonModuleType.java b/python/pluginSrc/com/jetbrains/python/module/PythonModuleType.java index 3cc4f7a26b2c..22de18026fbf 100644 --- a/python/pluginSrc/com/jetbrains/python/module/PythonModuleType.java +++ b/python/pluginSrc/com/jetbrains/python/module/PythonModuleType.java @@ -39,12 +39,11 @@ public class PythonModuleType extends PythonModuleTypeBase steps = new ArrayList(); final Project project = getProject(wizardContext); steps.add(new PythonSdkSelectStep(moduleBuilder, "reference.project.structure.sdk.python", project)); - if (!forNewWizard) { + if (!wizardContext.isNewWizard()) { final List providers = FrameworkSupportUtil.getProviders(getInstance(), DefaultFacetsProvider.INSTANCE); if (!providers.isEmpty()) { steps.add(new SupportForFrameworksStep(wizardContext, moduleBuilder, LibrariesContainerFactory.createContainer(project)));