diff options
author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java | |
parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java')
-rw-r--r-- | plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java | 11 |
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, |