fix: removed PopupHandlerAdapter (#256)

Signed-off-by: Andre Dietisheim <[email protected]>
redhat-developer · Oct 8, 2024 · e5c438d · e5c438d
1 parent 2d84e21
commit e5c438d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/.github/workflows/IJ.yml b/.github/workflows/IJ.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
@@ -31,7 +31,7 @@ jobs:
       - name: Verify with Gradle
         run: ./gradlew runPluginVerifier -PideaVersion=${{ matrix.IJ }}
       - name: Upload report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: verifier-report

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
@@ -28,7 +28,7 @@ jobs:
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew build --continue --no-daemon
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ${{ matrix.os }}-test-reports
@@ -43,7 +43,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
@@ -60,7 +60,7 @@ jobs:
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew integrationTest
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: linux-integration-test-reports
           path: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'

diff --git a/src/main/java/com/redhat/devtools/intellij/knative/ui/toolwindow/KnBaseWindowTool.java b/src/main/java/com/redhat/devtools/intellij/knative/ui/toolwindow/KnBaseWindowTool.java
@@ -26,24 +26,16 @@
 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.listener.TreePopupMenuListener;
 import com.redhat.devtools.intellij.common.tree.MutableModelSynchronizer;
 import com.redhat.devtools.intellij.common.utils.IDEAContentFactory;
 import com.redhat.devtools.intellij.knative.Constants;
 import com.redhat.devtools.intellij.knative.listener.KnTreeDoubleClickListener;
 import com.redhat.devtools.intellij.knative.tree.AbstractKnTreeStructure;
 import com.redhat.devtools.intellij.knative.tree.KnNodeComparator;
-import com.redhat.devtools.intellij.knative.tree.KnTreeStructure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.Icon;
-
-import java.lang.reflect.InvocationTargetException;
-
-import static com.redhat.devtools.intellij.knative.Constants.FUNCTIONS_ACTION_GROUP_ID;
-import static com.redhat.devtools.intellij.knative.Constants.KNATIVE_TOOLBAR_ACTION_GROUP_ID;
+import javax.swing.*;
 
 public abstract class KnBaseWindowTool<T extends AbstractKnTreeStructure> {
 
@@ -82,11 +74,7 @@ protected void createToolWindowContent(ToolWindow toolWindow, T structure, Strin
         Content content = createContent(toolWindow, panel, toolbarActionGroup);
 
         Tree tree = createTree(content, structure, true);
-        try {
-            PopupHandlerAdapter.install(tree, actionGroup, ActionPlaces.MAIN_MENU);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            LOGGER.error(e.getMessage(), e);
-        }
+        PopupHandler.installPopupMenu(tree, actionGroup, ActionPlaces.MAIN_MENU);
         panel.setContent(new JBScrollPane(tree));
         new KnTreeDoubleClickListener(tree);
     }