From 8092b678cf5dc40091f35358e2230189afb7f32b Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sat, 12 Feb 2011 19:06:55 +0000
Subject: [PATCH] Continuous systeem afgemaakt, rollen van verschillende
 listeners en gatherers gecontroleerd en nutteloze exceptions verwijderd. Het
 nieuwe actions systeem moet nog worden doorgevoerd in de devices.

---
 java/src/pm/Action.java                       | 33 +++++++----------
 java/src/pm/Application.java                  | 14 ++++++-
 java/src/pm/Device.java                       | 37 ++++++++++++++-----
 java/src/pm/Macro.java                        |  4 ++
 java/src/pm/Main.java                         | 11 ++++--
 java/src/pm/Task.java                         |  4 +-
 .../jintellitype/JIntellitypeDevice.java      | 22 +++++------
 java/src/pm/exception/ActionException.java    |  5 ---
 .../action/InvokeActionException.java         |  7 ----
 .../action/NotImplementedActionException.java |  7 ----
 .../action/TargetNotSetException.java         |  7 ----
 .../action/UnknownTargetException.java        |  7 ----
 java/src/pm/macro/MacroListener.java          | 10 ++---
 java/src/pm/task/Continuous.java              | 36 ++++++++++++++++++
 java/src/pm/task/Stopper.java                 | 16 ++++++++
 java/src/pm/task/TaskGatherer.java            | 22 +++++++++++
 java/src/pm/task/TaskListener.java            |  4 +-
 java/src/pm/task/TaskProvider.java            | 17 ---------
 18 files changed, 158 insertions(+), 105 deletions(-)
 delete mode 100644 java/src/pm/exception/ActionException.java
 delete mode 100644 java/src/pm/exception/action/InvokeActionException.java
 delete mode 100644 java/src/pm/exception/action/NotImplementedActionException.java
 delete mode 100644 java/src/pm/exception/action/TargetNotSetException.java
 delete mode 100644 java/src/pm/exception/action/UnknownTargetException.java
 create mode 100644 java/src/pm/task/Continuous.java
 create mode 100644 java/src/pm/task/Stopper.java
 create mode 100644 java/src/pm/task/TaskGatherer.java
 delete mode 100644 java/src/pm/task/TaskProvider.java

diff --git a/java/src/pm/Action.java b/java/src/pm/Action.java
index 7b90c65..41f298f 100644
--- a/java/src/pm/Action.java
+++ b/java/src/pm/Action.java
@@ -1,23 +1,18 @@
 package pm;
 
 public enum Action {
-    START ("start"),
-    TEST ("test"),
-    EXIT ("exit"),
-    PLAY ("play"),
-    PAUSE ("pause"),
-    RESUME ("resume"),
-    NEXT ("next"),
-    PREVIOUS ("previous"),
-    FORWARD ("forward"),
-    REWIND ("rewind"),
-    MUTE ("mute"),
-    VOLUME_UP ("volumeUp"),
-    VOLUME_DOWN ("volumeDown");    
-
-    protected String action;
-
-    private Action(String action) {
-        this.action = action;
-    }
+    EXIT,
+    FORWARD,
+    MUTE,
+    NEXT,
+    PAUSE,
+    PLAY,
+    PREVIOUS,
+    REPEAT,
+    RESUME,
+    REWIND,
+    START,
+    TEST,
+    VOLUME_DOWN,
+    VOLUME_UP;
 }
diff --git a/java/src/pm/Application.java b/java/src/pm/Application.java
index 0b8367b..467bbf4 100644
--- a/java/src/pm/Application.java
+++ b/java/src/pm/Application.java
@@ -2,6 +2,7 @@ package pm;
 
 import pm.exception.application.ApplicationExitException;
 import pm.exception.application.ApplicationInitialiseException;
+import pm.task.Continuous;
 import pm.task.TaskListener;
 
 public abstract class Application extends TaskListener {  
@@ -21,7 +22,18 @@ public abstract class Application extends TaskListener {
     }
 
     protected void task(Task task) {
-        action(task.getAction());
+        Action action = task.getAction();
+        if (task instanceof Continuous) {
+            Continuous continuous = (Continuous) task;
+            int sleep = continuous.getSleep();
+            do {
+                action(action);
+                sleep(sleep);
+            } while (run && !continuous.getStop());
+            continuous.reset();
+        } else {
+            action(action);
+        }        
     }
 
     protected abstract void action(Action action);
diff --git a/java/src/pm/Device.java b/java/src/pm/Device.java
index 62e0c39..d2dcebb 100644
--- a/java/src/pm/Device.java
+++ b/java/src/pm/Device.java
@@ -1,11 +1,14 @@
 package pm;
 
-import pm.exception.MacroException;
 import pm.exception.device.DeviceExitException;
 import pm.exception.device.DeviceInitialiseException;
 import pm.macro.Event;
 import pm.macro.MacroListener;
-import pm.task.TaskProvider;
+import pm.macro.event.Hold;
+import pm.macro.event.Press;
+import pm.macro.event.Release;
+import pm.task.Continuous;
+import pm.task.Stopper;
 
 public abstract class Device {
     protected MacroListener macroListener;
@@ -14,22 +17,36 @@ public abstract class Device {
         macroListener = new MacroListener();
     }
 
-    public void add(Macro macro, Task task) {
+    /* Register macro's */
+    protected void add(Macro macro, Task task) {
         macroListener.add(macro, task);
     }
 
-    public void add(Event event, Task task) throws MacroException {
-        macroListener.add(event, task);
+    protected void add(Event event, Task task) {
+        add(new Macro(event), task);
     }
 
-    public void add(Event event) {
+    protected void add(Macro startMacro, Macro stopMacro, Continuous continuous) {
+        add(startMacro, continuous);
+        add(stopMacro, new Stopper(continuous));        
+    }
+
+    protected void add(Event startEvent, Event stopEvent, Continuous continuous) {
+        add(startEvent, continuous);
+        add(stopEvent, new Stopper(continuous));        
+    }
+
+    protected void add(Hold hold, Continuous continuous) {
+        Button button = hold.getButton();
+        add(new Press(button), new Release(button), continuous);
+    }
+
+    /* Recognize events */
+    protected void add(Event event) {
         macroListener.add(event);
     }
 
-    public void add(Task task) {
-        TaskProvider.add(task);
-    }
-
+    /* Device default methods */
     public void initialise() throws DeviceInitialiseException {}
     public void exit() throws DeviceExitException {}
 }
diff --git a/java/src/pm/Macro.java b/java/src/pm/Macro.java
index e1012e0..9b79d7e 100644
--- a/java/src/pm/Macro.java
+++ b/java/src/pm/Macro.java
@@ -12,6 +12,10 @@ import pm.macro.event.Release;
 public class Macro {
     protected Event[] eventArray;
 
+    public Macro(Event event) {
+        eventArray = new Event[]{event};
+    }
+
     public Macro(Event... eventArray) throws MacroException {
         ArrayList<Button> holdList = new ArrayList<Button>();
         ArrayList<Event> eventList = new ArrayList<Event>();
diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java
index fb82863..2ddd3d5 100644
--- a/java/src/pm/Main.java
+++ b/java/src/pm/Main.java
@@ -7,10 +7,10 @@ import pm.application.example.ExampleApplication;
 import pm.application.iTunes.iTunesApplication;
 import pm.device.gui.GUIDevice;
 import pm.device.jintellitype.JIntellitypeDevice;
-import pm.exception.action.TargetNotSetException;
 import pm.exception.application.ApplicationExitException;
 import pm.exception.device.DeviceExitException;
 import pm.exception.device.DeviceInitialiseException;
+import pm.task.TaskGatherer;
 import pm.task.TaskListener;
 import pm.util.ArrayCycle;
 
@@ -28,6 +28,7 @@ public class Main extends TaskListener {
             "pm.device.wiimote.WiimoteDevice"};*/
         applicationCycle = new ArrayCycle<Application>();
         deviceList = new ArrayList<Device>();
+        TaskGatherer.initialise(taskQueue);
     }
 
     public void initialise() throws DeviceInitialiseException {
@@ -66,11 +67,15 @@ public class Main extends TaskListener {
     protected void action(Action action) {
         System.out.println("Main: " + action);
         switch (action) {
+            case NEXT:
+                applicationCycle.next();
+                break;
+            case PREVIOUS:
+                applicationCycle.previous();
+                break;
             case EXIT:
                 exit();
                 break;
-            default:
-                break;
         }
     }
 
diff --git a/java/src/pm/Task.java b/java/src/pm/Task.java
index 6f450dd..5f0dbc4 100644
--- a/java/src/pm/Task.java
+++ b/java/src/pm/Task.java
@@ -1,8 +1,8 @@
 package pm;
 
 public class Task {
-    Action action;
-    Target target;
+    protected Action action;
+    protected Target target;
 
     public Task(Action action, Target target) {
         this.action = action;
diff --git a/java/src/pm/device/jintellitype/JIntellitypeDevice.java b/java/src/pm/device/jintellitype/JIntellitypeDevice.java
index d6f902d..1262d67 100644
--- a/java/src/pm/device/jintellitype/JIntellitypeDevice.java
+++ b/java/src/pm/device/jintellitype/JIntellitypeDevice.java
@@ -11,10 +11,10 @@ import pm.Device;
 import pm.Target;
 import pm.Task;
 import pm.exception.EventException;
-import pm.exception.MacroException;
 import pm.exception.device.DeviceInitialiseException;
 import pm.macro.event.Press;
 import pm.macro.event.Release;
+import pm.task.Continuous;
 
 public class JIntellitypeDevice extends Device implements HotkeyListener, IntellitypeListener {
     protected ArrayList<Hotkey> hotkeyList;
@@ -29,16 +29,16 @@ public class JIntellitypeDevice extends Device implements HotkeyListener, Intell
     public void initialise() throws DeviceInitialiseException {
         jit.addHotKeyListener(this);
         jit.addIntellitypeListener(this);
-        try {
-            add(
-                new Hotkey(HotkeyButton.CTRL | HotkeyButton.WIN, 'x'),
-                new Task(Action.EXIT, Target.MAIN));
-            add(
-                new Hotkey(HotkeyButton.CTRL | HotkeyButton.WIN, 't'),
-                new Task(Action.TEST, Target.MAIN));
-        } catch (MacroException e) {
-            e.printStackTrace();
-        }
+        add(
+            new Hotkey(HotkeyButton.CTRL | HotkeyButton.WIN, 'x'),
+            new Task(Action.EXIT, Target.MAIN));
+        add(
+            new Hotkey(HotkeyButton.CTRL | HotkeyButton.WIN, 't'),
+            new Task(Action.TEST, Target.MAIN));
+        add(
+            new Hotkey(HotkeyButton.CTRL | HotkeyButton.WIN, 'r'),
+            new Hotkey(HotkeyButton.CTRL | HotkeyButton.WIN, 's'),
+            new Continuous(Action.REPEAT, Target.APPLICATION, 500));
     }
 
     public void onIntellitype(int command) {
diff --git a/java/src/pm/exception/ActionException.java b/java/src/pm/exception/ActionException.java
deleted file mode 100644
index 307a368..0000000
--- a/java/src/pm/exception/ActionException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package pm.exception;
-
-public class ActionException extends Exception {
-    protected static final long serialVersionUID = 1L;
-}
diff --git a/java/src/pm/exception/action/InvokeActionException.java b/java/src/pm/exception/action/InvokeActionException.java
deleted file mode 100644
index f8ec384..0000000
--- a/java/src/pm/exception/action/InvokeActionException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pm.exception.action;
-
-import pm.exception.ActionException;
-
-public class InvokeActionException extends ActionException {
-    protected static final long serialVersionUID = 1L;
-}
diff --git a/java/src/pm/exception/action/NotImplementedActionException.java b/java/src/pm/exception/action/NotImplementedActionException.java
deleted file mode 100644
index 08f6890..0000000
--- a/java/src/pm/exception/action/NotImplementedActionException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pm.exception.action;
-
-import pm.exception.ActionException;
-
-public class NotImplementedActionException extends ActionException {
-    protected static final long serialVersionUID = 1L;
-}
diff --git a/java/src/pm/exception/action/TargetNotSetException.java b/java/src/pm/exception/action/TargetNotSetException.java
deleted file mode 100644
index 93dc81a..0000000
--- a/java/src/pm/exception/action/TargetNotSetException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pm.exception.action;
-
-import pm.exception.ActionException;
-
-public class TargetNotSetException extends ActionException {
-    protected static final long serialVersionUID = 1L;
-}
diff --git a/java/src/pm/exception/action/UnknownTargetException.java b/java/src/pm/exception/action/UnknownTargetException.java
deleted file mode 100644
index ba60810..0000000
--- a/java/src/pm/exception/action/UnknownTargetException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pm.exception.action;
-
-import pm.exception.ActionException;
-
-public class UnknownTargetException extends ActionException {
-    protected static final long serialVersionUID = 1L;
-}
diff --git a/java/src/pm/macro/MacroListener.java b/java/src/pm/macro/MacroListener.java
index 26d9b43..ecc6acc 100644
--- a/java/src/pm/macro/MacroListener.java
+++ b/java/src/pm/macro/MacroListener.java
@@ -5,8 +5,7 @@ import java.util.HashMap;
 
 import pm.Macro;
 import pm.Task;
-import pm.exception.MacroException;
-import pm.task.TaskProvider;
+import pm.task.TaskGatherer;
 
 public class MacroListener {
     public ArrayList<Macro> macroList;
@@ -24,10 +23,6 @@ public class MacroListener {
         taskMap.put(macro, task);
     }
 
-    public void add(Event event, Task task) throws MacroException {
-        add(new Macro(event), task);
-    }
-
     public void add(Event event) {
         for (Macro macro : macroList) {
             activeList.add(new Active(macro));
@@ -36,7 +31,8 @@ public class MacroListener {
         for (Active active : activeList) {
             if (active.next(event)) {
                 if (active.last()) {
-                    TaskProvider.add(taskMap.get(active.getMacro()));
+                    Task task = taskMap.get(active.getMacro());
+                    TaskGatherer.add(task);
                     removeList.add(active);
                 }
             } else {
diff --git a/java/src/pm/task/Continuous.java b/java/src/pm/task/Continuous.java
new file mode 100644
index 0000000..1ab641a
--- /dev/null
+++ b/java/src/pm/task/Continuous.java
@@ -0,0 +1,36 @@
+package pm.task;
+
+import pm.Action;
+import pm.Target;
+import pm.Task;
+
+public class Continuous extends Task {
+    protected int sleep;
+    protected boolean stop;
+
+    public Continuous(Action action, Target target, int sleep) {
+        super(action, target);
+        this.sleep = sleep;
+        reset();
+    }
+
+    public Continuous(Action action, Target target) {
+        this(action, target, 0);
+    }
+
+    public void stop() {
+        stop = true;
+    }
+
+    public void reset() {
+        stop = false;
+    }
+
+    public int getSleep() {
+        return sleep;
+    }
+
+    public boolean getStop() {
+        return stop;
+    }
+}
diff --git a/java/src/pm/task/Stopper.java b/java/src/pm/task/Stopper.java
new file mode 100644
index 0000000..52ce701
--- /dev/null
+++ b/java/src/pm/task/Stopper.java
@@ -0,0 +1,16 @@
+package pm.task;
+
+import pm.Task;
+
+public class Stopper extends Task {
+    protected Continuous continuous;
+
+    public Stopper(Continuous continuous) {
+        super(null, null);
+        this.continuous = continuous;
+    }
+
+    public void stop() {
+        continuous.stop(); // Todo: check if the task is really started?
+    }
+}
diff --git a/java/src/pm/task/TaskGatherer.java b/java/src/pm/task/TaskGatherer.java
new file mode 100644
index 0000000..c3702a5
--- /dev/null
+++ b/java/src/pm/task/TaskGatherer.java
@@ -0,0 +1,22 @@
+package pm.task;
+
+import java.util.Queue;
+
+import pm.Task;
+
+public class TaskGatherer {
+    protected static Queue<Task> taskQueue;
+
+    public static void initialise(Queue<Task> taskQueue) {
+        TaskGatherer.taskQueue = taskQueue;        
+    }
+
+    public static void add(Task task) {
+        if (task instanceof Stopper) {
+            Stopper stopper = (Stopper) task;
+            stopper.stop();
+        } else {
+            taskQueue.add(task);
+        }
+    }
+}
diff --git a/java/src/pm/task/TaskListener.java b/java/src/pm/task/TaskListener.java
index 5ef4f26..fbc9d73 100644
--- a/java/src/pm/task/TaskListener.java
+++ b/java/src/pm/task/TaskListener.java
@@ -13,8 +13,7 @@ public abstract class TaskListener implements Runnable {
 
     public TaskListener() {
         taskQueue = new ConcurrentLinkedQueue<Task>();
-        TaskProvider.initialise(taskQueue);
-        run = true;
+        run = false;
     }
 
     public void start() {
@@ -22,6 +21,7 @@ public abstract class TaskListener implements Runnable {
     }
 
     public void run() {
+        run = true;
         while (run) {
             if (taskQueue.isEmpty()) {
                 sleep(SLEEP);
diff --git a/java/src/pm/task/TaskProvider.java b/java/src/pm/task/TaskProvider.java
deleted file mode 100644
index 0f020b0..0000000
--- a/java/src/pm/task/TaskProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package pm.task;
-
-import java.util.Queue;
-
-import pm.Task;
-
-public class TaskProvider {
-    protected static Queue<Task> taskQueue;
-
-    public static void initialise(Queue<Task> taskQueue) {
-        TaskProvider.taskQueue = taskQueue;        
-    }
-
-    public static void add(Task task) {
-        taskQueue.add(task);
-    }
-}