more threading fixes (ActionUpdateThread.OLD_EDT issue)

Evolveum · Apr 10, 2024 · fbd66d1 · fbd66d1
1 parent c2de0f3
commit fbd66d1
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 31 deletions.
diff --git a/...-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/browse/ComboQueryType.java b/...-idea-plugin/src/main/java/com/evolveum/midpoint/studio/action/browse/ComboQueryType.java
@@ -1,5 +1,6 @@
 package com.evolveum.midpoint.studio.action.browse;
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
@@ -72,6 +73,11 @@ protected DefaultActionGroup createPopupActionGroup(JComponent button) {
         return group;
     }
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
     private static class TypeAction extends AnAction implements DumbAware {
 
         private Type type;
@@ -94,5 +100,10 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             combo.setSelected(type);
             combo.update(e);
         }
+
+        @Override
+        public @NotNull ActionUpdateThread getActionUpdateThread() {
+            return ActionUpdateThread.EDT;
+        }
     }
 }
diff --git a/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/UiAction.java b/studio-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/UiAction.java
@@ -0,0 +1,36 @@
+package com.evolveum.midpoint.studio.ui;
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.util.NlsActions;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Consumer;
+
+public class UiAction extends AnAction {
+
+    private final Consumer<AnActionEvent> actionPerformedConsumer;
+
+    public UiAction(
+            @Nullable @NlsActions.ActionText String text,
+            @Nullable Consumer<AnActionEvent> actionPerformedConsumer) {
+
+        super(text);
+
+        this.actionPerformedConsumer = actionPerformedConsumer;
+    }
+
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
+
+    @Override
+    public void actionPerformed(@NotNull AnActionEvent e) {
+        if (actionPerformedConsumer != null) {
+            actionPerformedConsumer.accept(e);
+        }
+    }
+}
diff --git a/...io-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectsTreeTable.java b/...io-idea-plugin/src/main/java/com/evolveum/midpoint/studio/ui/browse/ObjectsTreeTable.java
@@ -1,15 +1,17 @@
 package com.evolveum.midpoint.studio.ui.browse;
 
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.studio.ui.UiAction;
 import com.evolveum.midpoint.studio.ui.treetable.DefaultTreeTable;
 import com.evolveum.midpoint.studio.util.MidPointUtils;
 import com.evolveum.midpoint.studio.util.Pair;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.ActionPopupMenu;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.ui.TreeTableSpeedSearch;
 import org.apache.commons.lang3.StringUtils;
 import org.jdesktop.swingx.UIAction;
-import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -49,20 +51,9 @@ public void actionPerformed(ActionEvent e) {
 
     private void setupPopupMenu() {
         DefaultActionGroup group = new DefaultActionGroup();
-        group.add(new AnAction("Copy oids") {
+        group.add(new UiAction("Copy oids", e -> copySelectedObjectOids()));
+        group.add(new UiAction("Copy names", e -> copySelectedObjectNames()));
 
-            @Override
-            public void actionPerformed(@NotNull AnActionEvent e) {
-                copySelectedObjectOids();
-            }
-        });
-        group.add(new AnAction("Copy names") {
-
-            @Override
-            public void actionPerformed(@NotNull AnActionEvent e) {
-                copySelectedObjectNames();
-            }
-        });
         ActionPopupMenu menu = ActionManager.getInstance().createActionPopupMenu("ObjectTreeTablePopupMenu", group);
         setComponentPopupMenu(menu.getComponent());
     }

diff --git a/...-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefObjectsTable.java b/...-plugin/src/main/java/com/evolveum/midpoint/studio/ui/cleanup/MissingRefObjectsTable.java
@@ -1,11 +1,13 @@
 package com.evolveum.midpoint.studio.ui.cleanup;
 
 import com.evolveum.midpoint.studio.impl.configuration.MissingRefAction;
+import com.evolveum.midpoint.studio.ui.UiAction;
 import com.evolveum.midpoint.studio.ui.treetable.DefaultTreeTable;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.ActionPopupMenu;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.ui.SpeedSearchComparator;
 import com.intellij.ui.TreeTableSpeedSearch;
-import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
@@ -31,20 +33,9 @@ private void setupComponent() {
 
     private void setupPopupMenu() {
         DefaultActionGroup group = new DefaultActionGroup();
-        group.add(new AnAction("Download") {
-
-            @Override
-            public void actionPerformed(@NotNull AnActionEvent e) {
-                getTableModel().markSelectedAction(MissingRefAction.DOWNLOAD);
-            }
-        });
-        group.add(new AnAction("Ignore") {
-
-            @Override
-            public void actionPerformed(@NotNull AnActionEvent e) {
-                getTableModel().markSelectedAction(MissingRefAction.IGNORE);
-            }
-        });
+        group.add(new UiAction("Download", e -> getTableModel().markSelectedAction(MissingRefAction.DOWNLOAD)));
+        group.add(new UiAction("Ignore", e -> getTableModel().markSelectedAction(MissingRefAction.IGNORE)));
+
         ActionPopupMenu menu = ActionManager.getInstance().createActionPopupMenu("ObjectTreeTablePopupMenu", group);
         setComponentPopupMenu(menu.getComponent());
     }