Commit 58af520e authored by Ivan Migalev's avatar Ivan Migalev
Browse files

Make BrowseHierarchyActionBase responsible for component disposal

parent 29354033
Showing with 6 additions and 11 deletions
+6 -11
......@@ -10,6 +10,7 @@ import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.DumbUnawareHider;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.wm.ToolWindowId;
......@@ -74,7 +75,10 @@ public abstract class BrowseHierarchyActionBase extends AnAction {
if (selectedContent != null && !selectedContent.isPinned()) {
content = selectedContent;
final Component component = content.getComponent();
Component component = content.getComponent();
if (component instanceof DumbUnawareHider) {
component = ((DumbUnawareHider)component).getContent();
}
if (component instanceof Disposable) {
Disposer.dispose((Disposable)component);
}
......
......@@ -16,8 +16,6 @@
package com.intellij.openapi.project;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;
import com.intellij.ui.components.JBPanelWithEmptyText;
import org.jetbrains.annotations.NotNull;
......@@ -27,7 +25,7 @@ import java.awt.*;
/**
* @author peter
*/
public class DumbUnawareHider extends JBPanelWithEmptyText implements Disposable {
public class DumbUnawareHider extends JBPanelWithEmptyText {
private final JComponent myDumbUnawareContent;
......@@ -47,11 +45,4 @@ public class DumbUnawareHider extends JBPanelWithEmptyText implements Disposable
getComponent(i).setVisible(show);
}
}
@Override
public void dispose() {
if (myDumbUnawareContent instanceof Disposable) {
Disposer.dispose((Disposable) myDumbUnawareContent);
}
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment