From b8197a7dc5afab02ede688fc2f01d6d7c80a7460 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Mon, 28 Apr 2014 18:39:57 +0400
Subject: [PATCH] OC-9621

---
 .../designSurface/DesignerEditorPanel.java    | 56 +++++++++++--------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
index 235cdf2078e1..2389daa8c299 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
@@ -100,7 +100,7 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
   private final CardLayout myLayout = new CardLayout();
   private final ThreeComponentsSplitter myContentSplitter = new ThreeComponentsSplitter();
   private final JPanel myPanel = new JPanel(myLayout);
-  private JPanel myDesignerCard;
+  private JComponent myDesignerCard;
 
   protected DesignerActionPanel myActionPanel;
 
@@ -194,6 +194,28 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
     myInplaceEditingLayer = createInplaceEditingLayer();
     myLayeredPane.add(myInplaceEditingLayer, LAYER_INPLACE_EDITING);
 
+    myScrollPane = createScrollPane(myLayeredPane);
+
+    myQuickFixManager = new QuickFixManager(this, myGlassLayer, myScrollPane.getViewport());
+
+    myActionPanel = createActionPanel();
+    myWarnAction = new FixableMessageAction();
+
+    panel.add(myActionPanel.getToolbarComponent());
+    panel.add(myPanel);
+
+    myDesignerCard = createDesignerCardPanel();
+    myPanel.add(myDesignerCard, DESIGNER_CARD);
+
+    mySurfaceArea.addSelectionListener(new ComponentSelectionListener() {
+      @Override
+      public void selectionChanged(EditableArea area) {
+        storeSourceSelectionState();
+      }
+    });
+  }
+
+  protected JComponent createDesignerCardPanel() {
     JPanel content = new JPanel(new GridBagLayout());
 
     GridBagConstraints gbc = new GridBagConstraints();
@@ -218,29 +240,12 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
     gbc.weighty = 1;
     gbc.fill = GridBagConstraints.BOTH;
 
-    myScrollPane = createScrollPane(myLayeredPane);
     content.add(myScrollPane, gbc);
 
     myHorizontalCaption.attachToScrollPane(myScrollPane);
     myVerticalCaption.attachToScrollPane(myScrollPane);
 
-    myQuickFixManager = new QuickFixManager(this, myGlassLayer, myScrollPane.getViewport());
-
-    myActionPanel = createActionPanel();
-    myWarnAction = new FixableMessageAction();
-
-    panel.add(myActionPanel.getToolbarComponent());
-    panel.add(myPanel);
-
-    myDesignerCard = content;
-    myPanel.add(myDesignerCard, DESIGNER_CARD);
-
-    mySurfaceArea.addSelectionListener(new ComponentSelectionListener() {
-      @Override
-      public void selectionChanged(EditableArea area) {
-        storeSourceSelectionState();
-      }
-    });
+    return content;
   }
 
   public final ThreeComponentsSplitter getContentSplitter() {
@@ -300,8 +305,14 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
     myErrorMessages.removeAll();
     myErrorStack.setText(null);
     myLayeredPane.revalidate();
-    myHorizontalCaption.update();
-    myVerticalCaption.update();
+
+    if (myHorizontalCaption != null) {
+      myHorizontalCaption.update();
+    }
+    if (myVerticalCaption != null) {
+      myVerticalCaption.update();
+    }
+
     myLayout.show(myPanel, DESIGNER_CARD);
   }
 
@@ -458,7 +469,8 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
     myProgressPanel = new JPanel(new GridBagLayout());
     myProgressPanel.add(progressBlock,
                         new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0),
-                                               0, 0));
+                                               0, 0)
+    );
     myProgressPanel.setOpaque(false);
   }