Actions en targets netter gemaakt.

java/src/pm/device/Device.java

@@ -1,27 +1,19 @@
 package pm.device;
 
-import java.util.Queue;
+import pm.Action;
+import pm.Macro;
+import pm.listener.ActionListener;
+import pm.listener.MacroListener;
 
-import pm.action.Actions;
-import pm.action.Targets;
-import pm.macro.MacroListener;
-
-public abstract class Device {
-    protected static Queue<Actions> actionQueue;
+public abstract class Device extends ActionListener {
     protected MacroListener macroListener;
 
     public Device() {
         macroListener = new MacroListener();
-        macroListener.start();
     }
 
-    public void addAction(Actions action, Targets target) {
-        action.setTarget(target);
-        actionQueue.add(action);
-    }
-
-    public static void initialise(Queue<Actions> actionQueue) {
-        Device.actionQueue = actionQueue;        
+    public void add(Macro macro, Action action) {
+        macroListener.add(macro, action);
     }
 
     public void start() {}

java/src/pm/device/example/ExampleDevice.java

@@ -1,7 +1,7 @@
 package pm.device.example;
 
-import pm.action.Actions;
-import pm.action.Targets;
+import pm.Action;
+import pm.Target;
 import pm.device.Device;
 
 public class ExampleDevice extends Device {

java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java

@@ -1,8 +1,8 @@
 package pm.device.javainput.extreme3d;
 
+import pm.Action;
 import pm.Macro;
-import pm.action.Actions;
-import pm.action.Targets;
+import pm.Target;
 import pm.device.javainput.JavaInputDevice;
 import pm.exception.DeviceException;
 import pm.exception.MacroException;
@@ -11,7 +11,6 @@ import pm.macro.event.Press;
 import pm.macro.event.Release;
 
 public class Extreme3DDevice extends JavaInputDevice {
-
     protected static final String NAME = "Logitech Extreme 3D";
 
     public Extreme3DDevice() throws DeviceException {
@@ -21,14 +20,13 @@ public class Extreme3DDevice extends JavaInputDevice {
     public void start() {
         super.start();
         try {
-            macroListener.add(
+            add(
                 new Macro(
                     new Hold(Extreme3DButton.ONE),
                     new Press(Extreme3DButton.TWO),
                     new Press(Extreme3DButton.ELEVEN),
                     new Release(Extreme3DButton.ONE)),
-                Actions.EXIT,
-                Targets.MAIN);
+                Action.EXIT.setTarget(Target.MAIN));
         } catch (MacroException e) {
             e.printStackTrace();
         }