From: Debayan Sutradhar <debayansutradhar3@gmail.com>
Date: Mon, 31 May 2021 19:54:30 +0530
Subject: [hotkeyaction] - Clean up, refactored to use new Action API
---
[hotkeyaction] - Clean up, refactored to use new Action API
---


--- 'a/hotkeyaction/.gitignore'
+++ b/hotkeyaction/.gitignore
@@ -1,5 +1,5 @@
 .idea/
-HotkeyAction.iml
+*.iml
 target/
 
 

--- 'a/hotkeyaction/pom.xml'
+++ b/hotkeyaction/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.stream-pi</groupId>
     <artifactId>hotkeyaction</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
 
     <build>
         <plugins>
@@ -39,15 +39,9 @@
     <properties>
         <ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>
         <UtilVersion>1.0.0-SNAPSHOT</UtilVersion>
-
-        <JavaFXVersion>16</JavaFXVersion>
-
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-
-        <IkonliVersion>11.5.0</IkonliVersion>
-        <IkonliFA5PackVersion>11.5.0</IkonliFA5PackVersion>
     </properties>
 
     <dependencies>
@@ -62,17 +56,5 @@
             <artifactId>action-api</artifactId>
             <version>${ActionAPIVersion}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.kordamp.ikonli</groupId>
-            <artifactId>ikonli-fontawesome5-pack</artifactId>
-            <version>${IkonliFA5PackVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.kordamp.ikonli</groupId>
-            <artifactId>ikonli-javafx</artifactId>
-            <version>${IkonliVersion}</version>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

--- 'a/hotkeyaction/src/main/java/com/stream_pi/hotkeyaction/HotkeyAction.java'
+++ b/hotkeyaction/src/main/java/com/stream_pi/hotkeyaction/HotkeyAction.java
@@ -23,11 +23,12 @@ public class HotkeyAction extends Normal
         setAuthor("rnayabed");
         setServerButtonGraphic("far-keyboard");
         setHelpLink("https://github.com/stream-pi/essentialactions/blob/master/hotkeyaction/README.md");
-        setVersion(new Version(2,0,0));
+        setVersion(new Version(2,0,1));
     }
 
     @Override
-    public void initProperties() throws Exception {
+    public void initProperties()
+    {
         Property keyCombination = new Property("key_comb", Type.STRING);
         keyCombination.setDisplayName("Key combination (Separate using comma)");
 
@@ -38,12 +39,13 @@ public class HotkeyAction extends Normal
     private Robot robot;
 
     @Override
-    public void initAction() throws Exception {
+    public void initAction()
+    {
         Platform.runLater(()->robot = new Robot());
     }
 
     @Override
-    public void onActionClicked() throws Exception
+    public void onActionClicked() throws MinorException
     {
         Property keyCombination = getClientProperties().getSingleProperty("key_comb");
 
@@ -52,15 +54,24 @@ public class HotkeyAction extends Normal
             throw new MinorException("No key specified");
         }
 
-        press(keyCombination.getStringValue()
-            .toUpperCase()
-            .replace("?","SHIFT,/")
-            .replace("|","SHIFT,\\")
-            .split(",")
-        );
+        try
+        {
+            press(keyCombination.getStringValue()
+                    .toUpperCase()
+                    .replace("?","SHIFT,/")
+                    .replace("|","SHIFT,\\")
+                    .split(",")
+            );
+        }
+        catch (InterruptedException e)
+        {
+            e.printStackTrace();
+            throw new MinorException("Interrupted while press called. \n"+e.getMessage());
+        }
     }
 
-    public void press(String[] characters) throws InterruptedException {
+    public void press(String[] characters) throws InterruptedException
+    {
 
         ArrayList<KeyCode> pressedChars = new ArrayList<>();
 
@@ -116,7 +127,9 @@ public class HotkeyAction extends Normal
             case "X": return X; 
             case "Y": return Y; 
             case "Z": return Z; 
-            case "`": return BACK_QUOTE; 
+            case "`":
+            case "~":
+                return BACK_QUOTE;
             case "0": return DIGIT0;
             case "1": return DIGIT1;
             case "2": return DIGIT2;
@@ -128,8 +141,7 @@ public class HotkeyAction extends Normal
             case "8": return DIGIT8;
             case "9": return DIGIT9;
             case "-": return MINUS; 
-            case "=": return EQUALS; 
-            case "~": return BACK_QUOTE; 
+            case "=": return EQUALS;
             case "!": return EXCLAMATION_MARK; 
             case "@": return AT; 
             case "#": return NUMBER_SIGN; 
@@ -142,10 +154,8 @@ public class HotkeyAction extends Normal
             case "_": return UNDERSCORE; 
             case "+": return PLUS; 
             case "TAB": return TAB;
-            case "[": return OPEN_BRACKET; 
-            case "]": return CLOSE_BRACKET; 
-            case "{": return OPEN_BRACKET; 
-            case "}": return CLOSE_BRACKET;
+            case "[": case "{" : return OPEN_BRACKET;
+            case "]": case "}" : return CLOSE_BRACKET;
             case ";": return SEMICOLON; 
             case ":": return COLON; 
             case "\\": return BACK_SLASH; 
@@ -305,11 +315,5 @@ public class HotkeyAction extends Normal
     {
         Platform.runLater(()->robot.keyRelease(keyCode));
     }
-
-    @Override
-    public void onShutDown() throws Exception {
-        // TODO Auto-generated method stub
-
-    }
 }