From cded14fe38582355c45afd1a388bcd54785d2816 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Thu, 7 Nov 2013 11:55:56 +0400
Subject: [PATCH] IDEA-115064 New Project Wizard: Spring page looks bad:
 preselected frameworks

---
 .../com/intellij/ide/projectWizard/ProjectCategory.java  | 4 ++++
 .../com/intellij/ide/projectWizard/ProjectTypeStep.java  | 4 +++-
 .../newProjectWizard/AddSupportForFrameworksPanel.java   | 9 +++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectCategory.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectCategory.java
index 0862c7379724..7ef2e82feab3 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectCategory.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectCategory.java
@@ -69,6 +69,10 @@ public abstract class ProjectCategory {
     return ArrayUtil.EMPTY_STRING_ARRAY;
   }
 
+  public String[] getPreselectedFrameworkIds() {
+    return ArrayUtil.EMPTY_STRING_ARRAY;
+  }
+
   @Override
   public String toString() {
     return getDisplayName();
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 ecca22158b85..67c6cff9c257 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
@@ -194,7 +194,9 @@ public class ProjectTypeStep extends ModuleWizardStep {
             }
           });
 
-        myFrameworksPanel.setProviders(matched, new HashSet<String>(Arrays.asList(projectCategory.getAssociatedFrameworkIds())));
+        myFrameworksPanel.setProviders(matched,
+                                       new HashSet<String>(Arrays.asList(projectCategory.getAssociatedFrameworkIds())),
+                                       new HashSet<String>(Arrays.asList(projectCategory.getPreselectedFrameworkIds())));
       }
     }
     else if (object instanceof TemplatesGroup) {
diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
index 845ff186f113..79cace7526cf 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
@@ -108,7 +108,7 @@ public class AddSupportForFrameworksPanel implements Disposable {
         ((DefaultTreeModel)myFrameworksTree.getModel()).nodeChanged(getSelectedNode());
       }
     }, this);
-    setProviders(providers, Collections.<String>emptySet());
+    setProviders(providers, Collections.<String>emptySet(), Collections.<String>emptySet());
 
     myFrameworksTree.addTreeSelectionListener(new TreeSelectionListener() {
       public void valueChanged(TreeSelectionEvent e) {
@@ -129,10 +129,15 @@ public class AddSupportForFrameworksPanel implements Disposable {
 
   }
 
-  public void setProviders(List<FrameworkSupportInModuleProvider> providers, Set<String> associated) {
+  public void setProviders(List<FrameworkSupportInModuleProvider> providers, Set<String> associated, Set<String> preselected) {
     myProviders = providers;
 
     myAssociatedFrameworks = createNodes(myProviders, associated);
+    for (FrameworkSupportNodeBase node : myRoots) {
+      if (preselected.contains(node.getId())) {
+        node.setChecked(true);
+      }
+    }
     setAssociatedFrameworks();
 
     myFrameworksTree.setRoots(myRoots);