From 7a41f3595bcef73a771d4a66ab6e86c10c62d832 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 17 Oct 2012 17:16:05 +0400 Subject: [PATCH] do not show another template selection --- .../modes/CreateFromScratchMode.java | 13 +++++++------ .../ide/util/projectWizard/WizardContext.java | 12 ++++++++++++ .../com/intellij/openapi/module/WebModuleType.java | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) 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 14ca759786ee..c48e882a8d72 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 @@ -68,18 +68,19 @@ public class CreateFromScratchMode extends WizardMode { StepSequence sequence, List builders) { sequence.addCommonStep(new ProjectNameWithTypeStep(context, sequence, mode)); for (ModuleBuilder builder : builders) { - addModuleBuilder(builder, context, modulesProvider, sequence); + context.setTemplateMode(mode instanceof CreateFromTemplateMode); + addStepsForBuilder(builder, context, modulesProvider, sequence); } return sequence; } - private static void addModuleBuilder(ModuleBuilder builder, - WizardContext context, - ModulesProvider modulesProvider, - StepSequence myStepSequence) { + private static void addStepsForBuilder(ModuleBuilder builder, + WizardContext context, + ModulesProvider modulesProvider, + StepSequence sequence) { final String id = builder.getBuilderId(); for (ModuleWizardStep step : builder.createWizardSteps(context, modulesProvider)) { - myStepSequence.addSpecificStep(id, step); + sequence.addSpecificStep(id, step); } } 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 09a92245fc8b..e8fc24b1dac7 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 @@ -172,4 +172,16 @@ public class WizardContext { public StorageScheme getProjectStorageFormat() { return myProjectStorageFormat; } + + private boolean myTemplateMode; + + /** This will be removed shortly */ + @Deprecated + public boolean isTemplateMode() { + return myTemplateMode; + } + + public void setTemplateMode(boolean templateMode) { + myTemplateMode = templateMode; + } } diff --git a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java index cd048d659cf2..4b317ffcfac1 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java @@ -18,6 +18,7 @@ public class WebModuleType extends WebModuleTypeBase { @Override public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModuleBuilder moduleBuilder, ModulesProvider modulesProvider) { + if (wizardContext.isTemplateMode()) return ModuleWizardStep.EMPTY_ARRAY; WebModuleGenerationStep generationStep = new WebModuleGenerationStep( moduleBuilder, wizardContext.getStepIcon(),