Refactor: Move the move map into enum

Author: aizuddindeyn

src/com/aizuddindeyn/mouse/MouseInstance.java

@@ -4,8 +4,6 @@
  */
 package com.aizuddindeyn.mouse;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Timer;
 
 /**
@@ -16,17 +14,10 @@ class MouseInstance {
 
     private static final MouseInstance INSTANCE = new MouseInstance();
 
-    private static final Map<Integer, MouseMove> MOVE_MAP = new HashMap<>();
-
     private Timer timer;
 
     private boolean started = false;
 
-    static {
-        MOVE_MAP.put(1, new MouseMoveRandom());
-        MOVE_MAP.put(2, new MouseMoveEdge());
-    }
-
     private MouseInstance() {
         // Singleton
     }
@@ -51,11 +42,9 @@ synchronized void stop() {
 
     void execute() {
         try {
-            int type = MouseRandom.getSecureRandom().nextInt(MOVE_MAP.size()) + 1;
-            MouseMove move = MOVE_MAP.get(type);
-            if (move != null) {
-                move.move();
-            }
+            int index = MouseRandom.getSecureRandom().nextInt(MouseMoveEnum.getEnumMap().size());
+            MouseMoveEnum enums = MouseMoveEnum.values()[index];
+            MouseMoveEnum.getEnumMap().get(enums).move();
 
         } catch (Exception ex) {
             MouseUtils.logErr(ex.getMessage());

src/com/aizuddindeyn/mouse/MouseMoveEnum.java

@@ -0,0 +1,44 @@
+/*
+ * Owned by aizuddindeyn
+ * Visit https://gitlab.com/group-bear/mouse-automation
+ */
+package com.aizuddindeyn.mouse;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+/**
+ * @author aizuddindeyn
+ * @date 11/7/2020
+ */
+public enum MouseMoveEnum {
+
+    RANDOM(new MouseMoveRandom()),
+
+    EDGE(new MouseMoveEdge()),
+
+    CIRCLE(new MouseMoveCircular()),
+    ;
+
+    private static final Map<MouseMoveEnum, MouseMove> ENUM_MAP = new EnumMap<>(MouseMoveEnum.class);
+
+    private final MouseMove move;
+
+    static {
+        for (MouseMoveEnum e : MouseMoveEnum.values()) {
+            ENUM_MAP.put(e, e.getMove());
+        }
+    }
+
+    MouseMoveEnum(MouseMove move) {
+        this.move = move;
+    }
+
+    MouseMove getMove() {
+        return move;
+    }
+
+    static Map<MouseMoveEnum, MouseMove> getEnumMap() {
+        return ENUM_MAP;
+    }
+}