From 33d61c50aa68e0a2d5c2e43473452f314c692388 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Tue, 10 Sep 2013 17:22:38 +0400
Subject: [PATCH] fixed layout in absence of icons

---
 .../src/com/intellij/ide/wizard/AbstractWizard.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
index 5ea80985af41..628840991b10 100644
--- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
+++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
@@ -280,13 +280,9 @@ public abstract class AbstractWizard<T extends Step> extends DialogWrapper {
   }
 
   protected JComponent createCenterPanel() {
-    final JPanel iconPanel = new JPanel(new BorderLayout());
-    iconPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
-    iconPanel.add(myIcon, BorderLayout.CENTER);
-
     final JPanel panel = new JPanel(new BorderLayout());
-    panel.add(iconPanel, BorderLayout.WEST);
     panel.add(myContentPanel, BorderLayout.CENTER);
+    panel.add(myIcon, BorderLayout.WEST);
     return panel;
   }
 
@@ -430,7 +426,11 @@ public abstract class AbstractWizard<T extends Step> extends DialogWrapper {
     LOG.assertTrue(myCurrentStepComponent != null);
     showStepComponent(myCurrentStepComponent);
 
-    myIcon.setIcon(step.getIcon());
+    Icon icon = step.getIcon();
+    if (icon != null) {
+      myIcon.setIcon(icon);
+      myIcon.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 8));
+    }
 
     updateButtons();