fix: make sure ApplicationsRootNode is properly disposed (#868)

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

src/main/java/org/jboss/tools/intellij/openshift/WindowToolFactory.java

@@ -38,28 +38,28 @@
 
 public class WindowToolFactory implements ToolWindowFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(WindowToolFactory.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(WindowToolFactory.class);
 
-    @Override
-    public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
-        ContentFactory contentFactory = IDEAContentFactory.getInstance();
-        JBPanel<JBPanel> panel = new JBPanel<>();
-        panel.setLayout(new BorderLayout());
-        Content content = contentFactory.createContent(panel, "", false);
-        ApplicationsTreeStructure structure = new ApplicationsTreeStructure(project);
-        StructureTreeModel<ApplicationsTreeStructure> model = new StructureTreeModel<>(structure, content);
-        content.setDisposer(structure);
-        new MutableModelSynchronizer<>(model, structure, structure);
-        Tree tree = new Tree(new AsyncTreeModel(model, content));
-        tree.putClientProperty(Constants.STRUCTURE_PROPERTY, structure);
-        tree.setCellRenderer(new NodeRenderer());
-        tree.setRootVisible(false);
-        PopupHandler.installPopupMenu(tree, "org.jboss.tools.intellij.tree", ActionPlaces.MAIN_MENU);
-        panel.add(new JBScrollPane(tree), BorderLayout.CENTER);
-        toolWindow.getContentManager().addContent(content);
-        ArrayList<AnAction> actions = new ArrayList<>();
-        actions.add(ActionManager.getInstance().getAction("org.jboss.tools.intellij.openshift.actions.toolwindow.FeedBackAction"));
-        toolWindow.setTitleActions(actions);
-        TreeHelper.addLinkSupport(tree);
-    }
+  @Override
+  public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
+    ContentFactory contentFactory = IDEAContentFactory.getInstance();
+    JBPanel<JBPanel> panel = new JBPanel<>();
+    panel.setLayout(new BorderLayout());
+    Content content = contentFactory.createContent(panel, "", false);
+    ApplicationsTreeStructure structure = new ApplicationsTreeStructure(project, content);
+    StructureTreeModel<ApplicationsTreeStructure> model = new StructureTreeModel<>(structure, content);
+    content.setDisposer(structure);
+    new MutableModelSynchronizer<>(model, structure, structure);
+    Tree tree = new Tree(new AsyncTreeModel(model, content));
+    tree.putClientProperty(Constants.STRUCTURE_PROPERTY, structure);
+    tree.setCellRenderer(new NodeRenderer());
+    tree.setRootVisible(false);
+    PopupHandler.installPopupMenu(tree, "org.jboss.tools.intellij.tree", ActionPlaces.MAIN_MENU);
+    panel.add(new JBScrollPane(tree), BorderLayout.CENTER);
+    toolWindow.getContentManager().addContent(content);
+    ArrayList<AnAction> actions = new ArrayList<>();
+    actions.add(ActionManager.getInstance().getAction("org.jboss.tools.intellij.openshift.actions.toolwindow.FeedBackAction"));
+    toolWindow.setTitleActions(actions);
+    TreeHelper.addLinkSupport(tree);
+  }
 }

src/main/java/org/jboss/tools/intellij/openshift/tree/application/ApplicationsRootNode.java

@@ -16,6 +16,7 @@
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.ModuleListener;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.messages.MessageBusConnection;
@@ -57,13 +58,14 @@ public class ApplicationsRootNode
     private Config config;
     private final OdoProcessHelper processHelper;
 
-  public ApplicationsRootNode(Project project, ApplicationsTreeStructure structure) {
+  public ApplicationsRootNode(Project project, ApplicationsTreeStructure structure, Disposable parent) {
     this.project = project;
     this.structure = structure;
     initConfigWatcher();
     this.config = loadConfig();
     registerProjectListener(project);
     this.processHelper = new OdoProcessHelper();
+    Disposer.register(parent, this);
   }
 
   private static boolean shouldLogMessage(String message) {

src/main/java/org/jboss/tools/intellij/openshift/tree/application/ApplicationsTreeStructure.java

@@ -15,6 +15,7 @@
 import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.ui.tree.LeafState;
 import com.redhat.devtools.intellij.common.tree.LabelAndIconDescriptor;
 import com.redhat.devtools.intellij.common.tree.MutableModel;
@@ -52,10 +53,11 @@ public class ApplicationsTreeStructure extends AbstractTreeStructure implements
   private final MutableModel<Object> mutableModelSupport = new MutableModelSupport<>();
   private final DevfileRegistriesNode registries;
 
-  public ApplicationsTreeStructure(Project project) {
+  public ApplicationsTreeStructure(Project project, Disposable parentDisposable) {
     this.project = project;
-    this.root = new ApplicationsRootNode(project, this);
+    this.root = new ApplicationsRootNode(project, this, parentDisposable);
     this.registries = new DevfileRegistriesNode(root);
+    Disposer.register(parentDisposable, this);
   }
 
   @Override

src/test/java/org/jboss/tools/intellij/openshift/tree/application/ApplicationTreeModelConfigUpdateTest.java

@@ -11,14 +11,14 @@
 package org.jboss.tools.intellij.openshift.tree.application;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import io.fabric8.kubernetes.api.model.AuthInfo;
 import io.fabric8.kubernetes.api.model.Config;
 import io.fabric8.kubernetes.api.model.Context;
 import io.fabric8.kubernetes.api.model.NamedAuthInfo;
 import io.fabric8.kubernetes.api.model.NamedContext;
-
 import java.util.Arrays;
 
 import static org.mockito.Mockito.doReturn;
@@ -116,7 +116,7 @@ public void testShouldRefreshIfContextUserLogout() {
     }
 
     protected ApplicationsRootNode createApplicationsRootNode(Project project, Config config) {
-        return spy(new ApplicationsRootNode(project, null) {
+        return spy(new ApplicationsRootNode(project, null, Disposer.newDisposable()) {
             @Override
             protected void initConfigWatcher() {
             }