Skip to content

Commit 4027fc0

Browse files
authored
Merge pull request #270 from Checkmarx/fix/benalvo/error-starting-ide
Change deprecated ActionUpdateThread func (AST-65497)
2 parents 77f0f28 + 49f4f27 commit 4027fc0

File tree

5 files changed

+33
-2
lines changed

5 files changed

+33
-2
lines changed

src/main/java/com/checkmarx/intellij/tool/window/actions/CancelScanAction.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.intellij.ide.ActivityTracker;
99
import com.intellij.ide.util.PropertiesComponent;
1010
import com.intellij.notification.NotificationType;
11+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1112
import com.intellij.openapi.actionSystem.AnAction;
1213
import com.intellij.openapi.actionSystem.AnActionEvent;
1314
import com.intellij.openapi.diagnostic.Logger;
@@ -62,8 +63,12 @@ public void update(@NotNull AnActionEvent e) {
6263
e.getPresentation().setEnabled(isScanRunning);
6364
}
6465
catch (Exception ex) {
65-
ex.printStackTrace();
6666
e.getPresentation().setEnabled(false);
6767
}
6868
}
69+
@Override
70+
public @NotNull ActionUpdateThread getActionUpdateThread() {
71+
return ActionUpdateThread.BGT;
72+
}
73+
6974
}

src/main/java/com/checkmarx/intellij/tool/window/actions/CollapseAllAction.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.checkmarx.intellij.Bundle;
44
import com.checkmarx.intellij.Resource;
55
import com.checkmarx.intellij.tool.window.CxToolWindowPanel;
6+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
67
import com.intellij.openapi.actionSystem.AnAction;
78
import com.intellij.openapi.actionSystem.AnActionEvent;
89
import org.jetbrains.annotations.NotNull;
@@ -28,4 +29,10 @@ public CollapseAllAction() {
2829
public void actionPerformed(@NotNull AnActionEvent e) {
2930
Optional.ofNullable(getCxToolWindowPanel(e)).ifPresent(CxToolWindowPanel::collapseAll);
3031
}
32+
33+
@Override
34+
public @NotNull ActionUpdateThread getActionUpdateThread() {
35+
return ActionUpdateThread.EDT;
36+
}
37+
3138
}

src/main/java/com/checkmarx/intellij/tool/window/actions/OpenSettingsAction.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.checkmarx.intellij.Bundle;
44
import com.checkmarx.intellij.Resource;
55
import com.checkmarx.intellij.settings.global.GlobalSettingsConfigurable;
6+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
67
import com.intellij.openapi.actionSystem.AnAction;
78
import com.intellij.openapi.actionSystem.AnActionEvent;
89
import com.intellij.openapi.options.ShowSettingsUtil;
@@ -27,4 +28,10 @@ public void actionPerformed(@NotNull AnActionEvent e) {
2728
ShowSettingsUtil.getInstance()
2829
.showSettingsDialog(e.getProject(), GlobalSettingsConfigurable.class);
2930
}
31+
32+
@Override
33+
public @NotNull ActionUpdateThread getActionUpdateThread() {
34+
return ActionUpdateThread.EDT;
35+
}
36+
3037
}

src/main/java/com/checkmarx/intellij/tool/window/actions/StartScanAction.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.intellij.ide.ActivityTracker;
1616
import com.intellij.ide.util.PropertiesComponent;
1717
import com.intellij.notification.*;
18+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1819
import com.intellij.openapi.actionSystem.AnAction;
1920
import com.intellij.openapi.actionSystem.AnActionEvent;
2021
import com.intellij.openapi.diagnostic.Logger;
@@ -289,7 +290,6 @@ public void update(@NotNull AnActionEvent e) {
289290
e.getPresentation().setEnabled(!isScanRunning && !isPollingScan && !scanTriggered && projectAndBranchSelected);
290291
}
291292
catch (Exception ex) {
292-
LOGGER.error(ex);
293293
e.getPresentation().setEnabled(false);
294294
}
295295
}
@@ -311,4 +311,10 @@ public static void cancelRunningScan() {
311311
private static String msg(Resource resource, Object... params) {
312312
return Bundle.message(resource, params);
313313
}
314+
315+
@Override
316+
public @NotNull ActionUpdateThread getActionUpdateThread() {
317+
return ActionUpdateThread.BGT;
318+
}
319+
314320
}

src/main/java/com/checkmarx/intellij/tool/window/actions/selection/ResetSelectionAction.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.checkmarx.intellij.Resource;
55
import com.checkmarx.intellij.tool.window.actions.CxToolWindowAction;
66
import com.intellij.icons.AllIcons;
7+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
78
import com.intellij.openapi.actionSystem.AnAction;
89
import com.intellij.openapi.actionSystem.AnActionEvent;
910
import lombok.Getter;
@@ -45,4 +46,9 @@ public void actionPerformed(@NotNull AnActionEvent e) {
4546
cxToolWindowPanel.resetPanel();
4647
});
4748
}
49+
@Override
50+
public @NotNull ActionUpdateThread getActionUpdateThread() {
51+
return ActionUpdateThread.EDT;
52+
}
53+
4854
}

0 commit comments

Comments
 (0)