MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Test fix

Browse Source
This commit is contained in:
Alexander Lobas
2016-01-14 14:17:51 +03:00
parent fe28d3d31b
commit ad5d26fc8e
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindowManager.java
+8 -3
View File
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
* @author Alexander Lobas
*/
public final class DesignerToolWindowManager extends AbstractToolWindowManager {
private final DesignerToolWindow myToolWindowContent;
private DesignerToolWindow myToolWindowContent;
//////////////////////////////////////////////////////////////////////////////////////////
//
@@ -43,7 +43,6 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager {
public DesignerToolWindowManager(Project project, FileEditorManager fileEditorManager) {
super(project, fileEditorManager);
myToolWindowContent = new DesignerToolWindow(project, true);
}
public static DesignerToolWindow getInstance(DesignerEditorPanel designer) {
@@ -67,6 +66,10 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager {
@Override
protected void initToolWindow() {
if (myToolWindowContent == null) {
myToolWindowContent = new DesignerToolWindow(myProject, true);
}
myToolWindow = ToolWindowManager.getInstance(myProject).registerToolWindow(DesignerBundle.message("designer.toolwindow.name"),
false, getAnchor(), myProject, true);
myToolWindow.setIcon(UIDesignerNewIcons.ToolWindow);
@@ -110,7 +113,9 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager {
@Override
public void disposeComponent() {
myToolWindowContent.dispose();
if (myToolWindowContent != null) {
myToolWindowContent.dispose();
}
}
@NotNull
plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java
+8 -2
View File
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable;
* @author Alexander Lobas
*/
public class PaletteToolWindowManager extends AbstractToolWindowManager {
private final PalettePanel myToolWindowPanel = new PalettePanel();
private PalettePanel myToolWindowPanel;
//////////////////////////////////////////////////////////////////////////////////////////
//
@@ -66,6 +66,10 @@ public class PaletteToolWindowManager extends AbstractToolWindowManager {
@Override
protected void initToolWindow() {
if (myToolWindowPanel == null) {
myToolWindowPanel = new PalettePanel();
}
myToolWindow = ToolWindowManager.getInstance(myProject).registerToolWindow("Palette\t", false, getAnchor(), myProject, true);
myToolWindow.setIcon(AllIcons.Toolwindows.ToolWindowPalette);
initGearActions();
@@ -100,7 +104,9 @@ public class PaletteToolWindowManager extends AbstractToolWindowManager {
@Override
public void disposeComponent() {
myToolWindowPanel.dispose();
if (myToolWindowPanel != null) {
myToolWindowPanel.dispose();
}
}
@NotNull