From 12467a043e10f7c76f7af89b043f5b35731cbb95 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Mon, 25 Apr 2011 14:39:12 +0000
Subject: [PATCH] Miniscule aanpassingen

---
 java/src/pm/Device.java                             |  8 ++++----
 java/src/pm/Main.java                               |  4 +---
 .../pm/device/jintellitype/JIntellitypeDevice.java  |  1 -
 java/src/pm/event/EventListener.java                |  1 -
 java/src/pm/event/EventManager.java                 | 13 ++++++-------
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/java/src/pm/Device.java b/java/src/pm/Device.java
index 61b5c68..2205c40 100644
--- a/java/src/pm/Device.java
+++ b/java/src/pm/Device.java
@@ -17,12 +17,12 @@ import pm.macro.state.Release;
 
 public abstract class Device extends EventListener {
     protected SequenceListener sequenceListener;
-    protected InterruptListener interruptListener;
+    //protected InterruptListener interruptListener;
 
     public Device() {
         super();
         sequenceListener = new SequenceListener(this);
-        interruptListener = new InterruptListener(this);
+        //interruptListener = new InterruptListener(this);
     }
 
     /* Register macro's */
@@ -72,10 +72,10 @@ public abstract class Device extends EventListener {
         add(new Press(button), new Release(button), continuous);
     }
     
-    /* Register interruptibles */
+    /* Register interruptibles *
     protected void add(Interruptible interruptible) {
         interruptListener.add(interruptible);
-    }
+    }*/
 
     /* Recognize events */
     protected void add(State state) {
diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java
index 7b4f11f..596b5a3 100644
--- a/java/src/pm/Main.java
+++ b/java/src/pm/Main.java
@@ -117,9 +117,7 @@ public class Main extends EventListener {
         for (Application application : applicationCycle) {
             try {
                 application.exit();
-            } catch (ApplicationExitException e) {
-                e.printStackTrace();
-            }
+            } catch (ApplicationExitException e) {}
         }        
         System.out.println("Exit main...");
         stop();
diff --git a/java/src/pm/device/jintellitype/JIntellitypeDevice.java b/java/src/pm/device/jintellitype/JIntellitypeDevice.java
index 6a6db37..5063a47 100644
--- a/java/src/pm/device/jintellitype/JIntellitypeDevice.java
+++ b/java/src/pm/device/jintellitype/JIntellitypeDevice.java
@@ -85,6 +85,5 @@ public class JIntellitypeDevice extends Device implements HotkeyListener, Intell
         jit.removeHotKeyListener(this);
         jit.removeIntellitypeListener(this);
         jit.cleanUp();
-        System.out.println("klaar" + run);
     }
 }
diff --git a/java/src/pm/event/EventListener.java b/java/src/pm/event/EventListener.java
index 9c216ca..94db51c 100644
--- a/java/src/pm/event/EventListener.java
+++ b/java/src/pm/event/EventListener.java
@@ -16,7 +16,6 @@ public abstract class EventListener extends Listener implements Runnable {
     }
 
     public final void run() {
-        System.out.println(this);
         while (run) {
             if (eventQueue.isEmpty()) {
                 sleep();
diff --git a/java/src/pm/event/EventManager.java b/java/src/pm/event/EventManager.java
index ad85adb..d731c38 100644
--- a/java/src/pm/event/EventManager.java
+++ b/java/src/pm/event/EventManager.java
@@ -10,20 +10,20 @@ import pm.event.task.Stopper;
 import pm.value.Target;
 
 public class EventManager {
-    protected static ArrayList<EventListener> taskListenerList;
+    protected static ArrayList<EventListener> eventListenerList;
     protected static ApplicationCycle applicationCycle;
 
     public static void initialise(ApplicationCycle applicationCycle) {
-        taskListenerList = new ArrayList<EventListener>();
+        eventListenerList = new ArrayList<EventListener>();
         EventManager.applicationCycle = applicationCycle;
     }
 
     public static void add(EventListener eventListener) {
-        taskListenerList.add(eventListener);
+        eventListenerList.add(eventListener);
     }
 
     public static void add(Feedback feedback) {
-        for (EventListener eventListener : taskListenerList) {
+        for (EventListener eventListener : eventListenerList) {
             eventListener.add(feedback);
         }
     }
@@ -44,7 +44,7 @@ public class EventManager {
                     }
                     break;
                 default:
-                    for (EventListener eventListener : taskListenerList) {
+                    for (EventListener eventListener : eventListenerList) {
                         switch (target) {
                             case ALL:
                                 eventListener.add(task);
@@ -65,7 +65,6 @@ public class EventManager {
                                 } 
                                 break;
                         }
-                        break;
                     }
             }
         }
@@ -78,6 +77,6 @@ public class EventManager {
     }
 
     public static void remove(EventListener eventListener) {
-        taskListenerList.remove(eventListener);
+        eventListenerList.remove(eventListener);
     }
 }
\ No newline at end of file