isTemplateMode() dropped

java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameStep.java

@@ -62,11 +62,6 @@ public class ProjectNameStep extends ModuleWizardStep {
     myPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
     myPanel.add(myNamePathComponent, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(10, 0, 20, 0), 0, 0));
 
-    if (myWizardContext.getProject() == null && !myWizardContext.isTemplateMode()) {
-      myNamePathComponent.add(new JLabel("Project format:"), new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-      myNamePathComponent.add(myFormatPanel.getStorageFormatComboBox(), new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
-    }
-
     myNamePathComponent.setVisible(isStepVisible());
     myAdditionalContentPanel = new JPanel(new GridBagLayout());
     myPanel.add(myAdditionalContentPanel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));

java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java

@@ -69,7 +69,6 @@ public class CreateFromScratchMode extends WizardMode {
       sequence.addCommonStep(new ProjectNameWithTypeStep(context, sequence, mode));
     }
     for (ModuleBuilder builder : builders) {
-      context.setTemplateMode(mode instanceof CreateFromTemplateMode);
       addStepsForBuilder(builder, context, modulesProvider, sequence);
     }
     return sequence;

java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java

@@ -17,13 +17,11 @@ package com.intellij.openapi.module;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.projectWizard.*;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectBundle;
-import com.intellij.openapi.projectRoots.*;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.SdkTypeId;
 import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.CommonClassNames;
@@ -83,17 +81,6 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
                                               final ModulesProvider modulesProvider) {
     final ProjectWizardStepFactory wizardFactory = ProjectWizardStepFactory.getInstance();
     ArrayList<ModuleWizardStep> steps = new ArrayList<ModuleWizardStep>();
-    if (!wizardContext.isTemplateMode()) {
-      steps.add(wizardFactory.createSourcePathsStep(wizardContext, moduleBuilder, getWizardIcon(), "reference.dialogs.new.project.fromScratch.source"));
-      steps.add(wizardFactory.createProjectJdkStep(wizardContext, JavaSdk.getInstance(), moduleBuilder, new Computable<Boolean>() {
-        @Override
-        public Boolean compute() {
-          //final Sdk projectJdk = wizardFactory.getNewProjectSdk(wizardContext);
-          //return projectJdk == null || projectJdk.getSdkType() != JavaSdk.getInstance() ? Boolean.TRUE : Boolean.FALSE;
-          return Boolean.TRUE;
-        }
-      }, getWizardIcon(), "reference.dialogs.new.project.fromScratch.sdk"));
-    }
     final ModuleWizardStep supportForFrameworksStep = wizardFactory.createSupportForFrameworksStep(wizardContext, moduleBuilder, modulesProvider);
     if (supportForFrameworksStep != null) {
       steps.add(supportForFrameworksStep);

platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java

@@ -183,18 +183,6 @@ public class WizardContext {
     return myProjectStorageFormat;
   }
 
-  private boolean myTemplateMode;
-
-  /** This will be removed shortly */
-  @Deprecated
-  public boolean isTemplateMode() {
-    return myTemplateMode;
-  }
-
-  public void setTemplateMode(boolean templateMode) {
-    myTemplateMode = templateMode;
-  }
-
   public ModuleBuilder[] getAllBuilders() {
     return myAllBuilders.getValue();
   }

platform/lang-impl/src/com/intellij/openapi/module/WebModuleType.java

@@ -1,10 +1,6 @@
 package com.intellij.openapi.module;
 
 import com.intellij.ide.util.projectWizard.ModuleBuilder;
-import com.intellij.ide.util.projectWizard.ModuleWizardStep;
-import com.intellij.ide.util.projectWizard.WebModuleGenerationStep;
-import com.intellij.ide.util.projectWizard.WizardContext;
-import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -16,17 +12,6 @@ public class WebModuleType extends WebModuleTypeBase<ModuleBuilder> {
     return (WebModuleType)ModuleTypeManager.getInstance().findByID(WEB_MODULE);
   }
 
-  @Override
-  public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModuleBuilder moduleBuilder, ModulesProvider modulesProvider) {
-    if (wizardContext.isTemplateMode()) return ModuleWizardStep.EMPTY_ARRAY;
-    WebModuleGenerationStep generationStep = new WebModuleGenerationStep(
-      moduleBuilder,
-      wizardContext.getStepIcon(),
-      "reference.dialogs.new.project.fromScratch.webModuleGeneration"
-    );
-    return new ModuleWizardStep[]{generationStep};
-  }
-
   @Override
   public ModuleBuilder createModuleBuilder() {
     return new WebModuleBuilder();

plugins/devkit/src/module/PluginModuleType.java

@@ -16,18 +16,12 @@
 package org.jetbrains.idea.devkit.module;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.ide.util.projectWizard.ModuleWizardStep;
-import com.intellij.ide.util.projectWizard.ProjectWizardStepFactory;
-import com.intellij.ide.util.projectWizard.WizardContext;
 import com.intellij.openapi.module.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.xml.XmlFile;
-import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.descriptors.ConfigFile;
 import org.jetbrains.annotations.NonNls;
@@ -60,23 +54,6 @@ public class PluginModuleType extends ModuleType<PluginModuleBuilder> {
     return get(module) instanceof PluginModuleType;
   }
 
-  public ModuleWizardStep[] createWizardSteps(final WizardContext wizardContext,
-                                              PluginModuleBuilder moduleBuilder,
-                                              ModulesProvider modulesProvider) {
-    if (wizardContext.isTemplateMode()) return ModuleWizardStep.EMPTY_ARRAY;
-    final ProjectWizardStepFactory stepFactory = ProjectWizardStepFactory.getInstance();
-    ArrayList<ModuleWizardStep> steps = new ArrayList<ModuleWizardStep>();
-    steps.add(stepFactory.createSourcePathsStep(wizardContext, moduleBuilder, ADD_PLUGIN_MODULE_ICON, "reference.dialogs.new.project.fromScratch.source"));
-    steps.add(stepFactory.createProjectJdkStep(wizardContext, IdeaJdk.getInstance(), moduleBuilder, new Computable<Boolean>() {
-      public Boolean compute() {
-        final Sdk projectJdk = wizardContext.getProjectJdk();
-        return IdeaJdk.findIdeaJdk(projectJdk) == null ? Boolean.TRUE : Boolean.FALSE;
-      }
-    }, ADD_PLUGIN_MODULE_ICON, "reference.dialogs.new.project.fromScratch.sdk"));
-    final ModuleWizardStep[] wizardSteps = steps.toArray(new ModuleWizardStep[steps.size()]);
-    return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider));
-  }
-
   public PluginModuleBuilder createModuleBuilder() {
     return new PluginModuleBuilder();
   }

plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java

@@ -16,7 +16,10 @@
 package org.jetbrains.idea.maven.wizards;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.ide.util.projectWizard.*;
+import com.intellij.ide.util.projectWizard.ModuleBuilder;
+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.module.JavaModuleType;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.module.StdModuleTypes;
@@ -31,7 +34,6 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.ArrayUtil;
 import org.jetbrains.idea.maven.model.MavenArchetype;
 import org.jetbrains.idea.maven.model.MavenId;
 import org.jetbrains.idea.maven.project.MavenEnvironmentForm;
@@ -112,11 +114,10 @@ public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuil
 
   @Override
   public ModuleWizardStep[] createWizardSteps(WizardContext wizardContext, ModulesProvider modulesProvider) {
-    ModuleWizardStep[] steps = {
+    return new ModuleWizardStep[]{
       new MavenModuleWizardStep(wizardContext.getProject(), this, wizardContext),
       new SelectPropertiesStep(wizardContext.getProject(), this)
     };
-    return wizardContext.isTemplateMode() ? steps : ArrayUtil.append(steps, ProjectWizardStepFactory.getInstance().createProjectJdkStep(wizardContext));
   }
 
   public MavenProject findPotentialParentProject(Project project) {