fix: removed usage of PopupHandlerAdapter (#872)

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

Author: adietish

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

@@ -17,55 +17,49 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowFactory;
+import com.intellij.ui.PopupHandler;
 import com.intellij.ui.components.JBPanel;
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentFactory;
 import com.intellij.ui.tree.AsyncTreeModel;
 import com.intellij.ui.tree.StructureTreeModel;
 import com.intellij.ui.treeStructure.Tree;
-import com.redhat.devtools.intellij.common.compat.PopupHandlerAdapter;
 import com.redhat.devtools.intellij.common.tree.MutableModelSynchronizer;
 import com.redhat.devtools.intellij.common.tree.TreeHelper;
 import com.redhat.devtools.intellij.common.utils.IDEAContentFactory;
+import java.awt.BorderLayout;
+import java.util.ArrayList;
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsTreeStructure;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.awt.*;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
 
 public class WindowToolFactory implements ToolWindowFactory {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WindowToolFactory.class);
 
     @Override
     public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
-        try {
-            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);
-            PopupHandlerAdapter.install(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);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            LOGGER.error(e.getMessage(), e);
-        }
+        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);
     }
 }