From 40c45ca2acbafa1aba50b0572fb28aa0be2cf088 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 6 Mar 2014 17:46:18 +0400 Subject: [PATCH] do not add generic builder for "category" templates (e.g. Java FX) --- .../intellij/ide/projectWizard/ProjectTypeStep.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 2c8ac124a2f4..e2f706e42b6e 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java @@ -50,10 +50,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.platform.ProjectTemplate; import com.intellij.platform.ProjectTemplateEP; import com.intellij.platform.ProjectTemplatesFactory; -import com.intellij.platform.templates.ArchivedProjectTemplate; -import com.intellij.platform.templates.BuilderBasedTemplate; -import com.intellij.platform.templates.LocalArchivedTemplate; -import com.intellij.platform.templates.RemoteTemplatesFactory; +import com.intellij.platform.templates.*; import com.intellij.ui.*; import com.intellij.ui.SingleSelectionModel; import com.intellij.ui.components.JBList; @@ -377,8 +374,9 @@ public class ProjectTypeStep extends ModuleWizardStep implements Disposable { private void setTemplatesList(TemplatesGroup group, Collection templates, boolean preserveSelection) { List list = new ArrayList(templates); - if (group.getModuleBuilder() != null) { - list.add(0, new BuilderBasedTemplate(group.getModuleBuilder())); + ModuleBuilder moduleBuilder = group.getModuleBuilder(); + if (moduleBuilder != null && !(moduleBuilder instanceof TemplateModuleBuilder)) { + list.add(0, new BuilderBasedTemplate(moduleBuilder)); } if (group.getParentGroup() == null) { for (TemplatesGroup templatesGroup : myTemplatesMap.keySet()) {