From e41098c787ceb579fb9b294f3b963f9d19e7eafa Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Wed, 27 Aug 2014 16:45:38 +0400
Subject: [PATCH] CPP-613 Switch on welcome wizard for all users

---
 .../CustomizeFeaturedPluginsStepPanel.java    |  3 ++-
 .../customize/CustomizeIDEWizardDialog.java   | 20 ++++++++++++++-----
 .../CustomizeIDEWizardStepsProvider.java      |  4 ++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
index 1072fbc252a2..c4bb120bce09 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
@@ -18,6 +18,7 @@ package com.intellij.ide.customize;
 import com.intellij.CommonBundle;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.ide.plugins.PluginNode;
 import com.intellij.openapi.progress.util.ProgressIndicatorBase;
 import com.intellij.openapi.ui.VerticalFlowLayout;
@@ -78,7 +79,7 @@ public class CustomizeFeaturedPluginsStepPanel extends AbstractCustomizeWizardSt
       final String pluginId = s.substring(j + 1);
       IdeaPluginDescriptor foundDescriptor = null;
       for (IdeaPluginDescriptor descriptor : pluginsFromRepository) {
-        if (descriptor.getPluginId().getIdString().equals(pluginId)) {
+        if (descriptor.getPluginId().getIdString().equals(pluginId) && !PluginManagerCore.isBrokenPlugin(descriptor)) {
           foundDescriptor = descriptor;
           isEmptyOrOffline = false;
           break;
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
index 19aea68db7af..9ef8749674f2 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
@@ -80,6 +80,12 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis
       protected void initSteps() {
         provider.initSteps(this, mySteps);
       }
+
+      @Override
+      protected void createButtons(JPanel buttonPanel, GridBagConstraints gbc) {
+        provider.addButtons(this, buttonPanel, gbc);
+        super.createButtons(buttonPanel, gbc);
+      }
     }.show();
   }
 
@@ -131,6 +137,15 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis
     gbc.fill = GridBagConstraints.BOTH;
     gbc.gridx = 0;
     gbc.gridy = 0;
+    createButtons(buttonPanel, gbc);
+    buttonPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
+    myButtonWrapper.add(buttonPanel, BUTTONS);
+    myButtonWrapper.add(new JLabel(), NOBUTTONS);
+    myButtonWrapperLayout.show(myButtonWrapper, BUTTONS);
+    return myButtonWrapper;
+  }
+
+  protected void createButtons(JPanel buttonPanel, GridBagConstraints gbc) {
     buttonPanel.add(myBackButton, gbc);
     gbc.gridx++;
     gbc.weightx = 1;
@@ -140,11 +155,6 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis
     buttonPanel.add(myNextButton, gbc);
     gbc.gridx++;
     buttonPanel.add(myStartUsingButton, gbc);
-    buttonPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
-    myButtonWrapper.add(buttonPanel, BUTTONS);
-    myButtonWrapper.add(new JLabel(), NOBUTTONS);
-    myButtonWrapperLayout.show(myButtonWrapper, BUTTONS);
-    return myButtonWrapper;
   }
 
   void setButtonsVisible(boolean visible) {
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardStepsProvider.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardStepsProvider.java
index ceea34db05fd..4f44dae0ebc3 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardStepsProvider.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardStepsProvider.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.ide.customize;
 
+import javax.swing.*;
+import java.awt.*;
 import java.util.List;
 
 /**
@@ -22,4 +24,6 @@ import java.util.List;
  */
 public interface CustomizeIDEWizardStepsProvider {
   void initSteps(CustomizeIDEWizardDialog wizardDialog, List<AbstractCustomizeWizardStep> steps);
+
+  void addButtons(CustomizeIDEWizardDialog wizardDialog, JPanel buttonPanel, GridBagConstraints gbc);
 }
\ No newline at end of file