Skip to content

Commit 393da88

Browse files
authored
Merge pull request #271 from Checkmarx/revert-270-fix/benalvo/error-starting-ide
Revert "Change deprecated ActionUpdateThread func (AST-65497)"
2 parents 4027fc0 + 0636b96 commit 393da88

File tree

5 files changed

+2
-33
lines changed

5 files changed

+2
-33
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
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;
1211
import com.intellij.openapi.actionSystem.AnAction;
1312
import com.intellij.openapi.actionSystem.AnActionEvent;
1413
import com.intellij.openapi.diagnostic.Logger;
@@ -63,12 +62,8 @@ public void update(@NotNull AnActionEvent e) {
6362
e.getPresentation().setEnabled(isScanRunning);
6463
}
6564
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-
7469
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
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;
76
import com.intellij.openapi.actionSystem.AnAction;
87
import com.intellij.openapi.actionSystem.AnActionEvent;
98
import org.jetbrains.annotations.NotNull;
@@ -29,10 +28,4 @@ public CollapseAllAction() {
2928
public void actionPerformed(@NotNull AnActionEvent e) {
3029
Optional.ofNullable(getCxToolWindowPanel(e)).ifPresent(CxToolWindowPanel::collapseAll);
3130
}
32-
33-
@Override
34-
public @NotNull ActionUpdateThread getActionUpdateThread() {
35-
return ActionUpdateThread.EDT;
36-
}
37-
3831
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
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;
76
import com.intellij.openapi.actionSystem.AnAction;
87
import com.intellij.openapi.actionSystem.AnActionEvent;
98
import com.intellij.openapi.options.ShowSettingsUtil;
@@ -28,10 +27,4 @@ public void actionPerformed(@NotNull AnActionEvent e) {
2827
ShowSettingsUtil.getInstance()
2928
.showSettingsDialog(e.getProject(), GlobalSettingsConfigurable.class);
3029
}
31-
32-
@Override
33-
public @NotNull ActionUpdateThread getActionUpdateThread() {
34-
return ActionUpdateThread.EDT;
35-
}
36-
3730
}

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
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;
1918
import com.intellij.openapi.actionSystem.AnAction;
2019
import com.intellij.openapi.actionSystem.AnActionEvent;
2120
import com.intellij.openapi.diagnostic.Logger;
@@ -290,6 +289,7 @@ public void update(@NotNull AnActionEvent e) {
290289
e.getPresentation().setEnabled(!isScanRunning && !isPollingScan && !scanTriggered && projectAndBranchSelected);
291290
}
292291
catch (Exception ex) {
292+
LOGGER.error(ex);
293293
e.getPresentation().setEnabled(false);
294294
}
295295
}
@@ -311,10 +311,4 @@ 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-
320314
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
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;
87
import com.intellij.openapi.actionSystem.AnAction;
98
import com.intellij.openapi.actionSystem.AnActionEvent;
109
import lombok.Getter;
@@ -46,9 +45,4 @@ public void actionPerformed(@NotNull AnActionEvent e) {
4645
cxToolWindowPanel.resetPanel();
4746
});
4847
}
49-
@Override
50-
public @NotNull ActionUpdateThread getActionUpdateThread() {
51-
return ActionUpdateThread.EDT;
52-
}
53-
5448
}

0 commit comments

Comments
 (0)