Merge pull request #51 from SergejT34/fix-old_edt-deprecation

Fix #50 ActionUpdateThread.OLD_EDT deprecation
siarheiburliayeu · Feb 20, 2024 · df995c0 · df995c0
2 parents 46f2f6f + bec9421
commit df995c0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/src/main/java/com/sburlyaev/cmd/plugin/CommandBuilder.java b/src/main/java/com/sburlyaev/cmd/plugin/CommandBuilder.java
@@ -93,6 +93,7 @@ public static Command createCommand(@NotNull Environment env,
             }
 
             case MAC_OS -> {
+                //noinspection SwitchStatementWithTooFewBranches
                 return switch (terminal) {
                     case ALACRITTY ->
                         new Command("open", "-n", "-a", command, "--args", "--working-directory", projectDirectory);

diff --git a/src/main/java/com/sburlyaev/cmd/plugin/JustForTroubleshooting.java b/src/main/java/com/sburlyaev/cmd/plugin/JustForTroubleshooting.java
@@ -1,16 +1,16 @@
 package com.sburlyaev.cmd.plugin;
 
 import com.sburlyaev.cmd.plugin.model.Command;
+
 import java.io.File;
-import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class JustForTroubleshooting {
 
     private static final Pattern OS_VERSION_PATTERN = Pattern.compile("^(\\d+\\.\\d+).*");
 
-    public static void main(String[] args) throws IOException {
+    public static void main(String[] args) {
         String osName = System.getProperty("os.name");
         String osVersion = System.getProperty("os.version");
         String gui = System.getProperty("sun.desktop");

diff --git a/src/main/java/com/sburlyaev/cmd/plugin/actions/OpenSelectedDirectoryAction.java b/src/main/java/com/sburlyaev/cmd/plugin/actions/OpenSelectedDirectoryAction.java
@@ -1,6 +1,7 @@
 package com.sburlyaev.cmd.plugin.actions;
 
 import com.intellij.ide.actions.RevealFileAction;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.project.Project;
@@ -41,4 +42,8 @@ private VirtualFile getSelectedDirectory(@NotNull AnActionEvent event) {
                 : null;
     }
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/sburlyaev/cmd/plugin/actions/SetAsDefaultDirectoryAction.java b/src/main/java/com/sburlyaev/cmd/plugin/actions/SetAsDefaultDirectoryAction.java
@@ -2,6 +2,7 @@
 
 import com.intellij.ide.actions.RevealFileAction;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.diagnostic.Logger;
@@ -50,4 +51,8 @@ private VirtualFile getSelectedDirectory(@NotNull AnActionEvent event) {
                 : null;
     }
 
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.EDT;
+    }
 }
diff --git a/src/main/java/com/sburlyaev/cmd/plugin/settings/PluginSettingsConfigurable.java b/src/main/java/com/sburlyaev/cmd/plugin/settings/PluginSettingsConfigurable.java
@@ -18,10 +18,10 @@
 
 public class PluginSettingsConfigurable implements Configurable {
 
-    private PluginSettingsForm pluginSettingsForm;
-    private PluginSettings pluginSettings;
+    private final PluginSettingsForm pluginSettingsForm;
+    private final PluginSettings pluginSettings;
 
-    private FileChooserDescriptor terminalChooserDescriptor;
+    private final FileChooserDescriptor terminalChooserDescriptor;
     private final Project project;
     private VirtualFile selectedTerminal;
 
@@ -105,8 +105,4 @@ public void reset() {
             pluginSettingsForm.setSettingsState(pluginSettings.getState());
         }
     }
-
-    @Override
-    public void disposeUIResources() {
-    }
 }