Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 6 insertions, 5 deletions

diff --git a/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java
index ae14d96e0248..3fddf66eaad6 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java
@@ -17,6 +17,7 @@ package com.intellij.designer.palette;
 
 import com.intellij.designer.AbstractToolWindowManager;
 import com.intellij.designer.DesignerCustomizations;
+import com.intellij.designer.DesignerEditorPanelFacade;
 import com.intellij.designer.LightToolWindow;
 import com.intellij.designer.designSurface.DesignerEditorPanel;
 import com.intellij.icons.AllIcons;
@@ -85,10 +86,10 @@ public class PaletteToolWindowManager extends AbstractToolWindowManager {
   }
 
   @Override
-  protected void updateToolWindow(@Nullable DesignerEditorPanel designer) {
-    myToolWindowPanel.loadPalette(designer);
+  protected void updateToolWindow(@Nullable DesignerEditorPanelFacade designer) {
+    myToolWindowPanel.loadPalette((DesignerEditorPanel)designer);
 
-    if (myToolWindowPanel.isEmpty()) {
+    if (designer == null) {
       myToolWindow.setAvailable(false, null);
     }
     else {
@@ -115,9 +116,9 @@ public class PaletteToolWindowManager extends AbstractToolWindowManager {
   //////////////////////////////////////////////////////////////////////////////////////////
 
   @Override
-  protected LightToolWindow createContent(DesignerEditorPanel designer) {
+  protected LightToolWindow createContent(@NotNull DesignerEditorPanelFacade designer) {
     PalettePanel palettePanel = new PalettePanel();
-    palettePanel.loadPalette(designer);
+    palettePanel.loadPalette((DesignerEditorPanel)designer);
 
     return createContent(designer,
                          palettePanel,