From 903907ce4d622fbd4ddaa8e053cce2bf0722c99b Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Wed, 9 Feb 2011 18:39:07 +0000
Subject: [PATCH] Svn rollback gedaan.

---
 java/src/pm/Main.java                             |  2 +-
 java/src/pm/device/javainput/JavaInputButton.java | 15 ---------------
 java/src/pm/device/javainput/JavaInputDevice.java |  2 --
 .../javainput/rumblepad/RumblepadButton.java      |  1 -
 .../javainput/rumblepad/RumblepadDevice.java      |  4 +++-
 java/src/pm/listener/MacroListener.java           |  1 -
 java/src/pm/macro/Event.java                      |  4 ----
 7 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 java/src/pm/device/javainput/JavaInputButton.java

diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java
index fdec038..64ee917 100644
--- a/java/src/pm/Main.java
+++ b/java/src/pm/Main.java
@@ -52,7 +52,7 @@ public class Main {
 
     public void start() throws Exception {
         //add(new ExampleDevice());
-        //add(new RumblepadDevice());
+        add(new RumblepadDevice());
         //add(new Extreme3DDevice());
         add(new JIntellitypeDevice());
         //add(new WiimoteDevice());
diff --git a/java/src/pm/device/javainput/JavaInputButton.java b/java/src/pm/device/javainput/JavaInputButton.java
deleted file mode 100644
index 1ea59d6..0000000
--- a/java/src/pm/device/javainput/JavaInputButton.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package pm.device.javainput;
-
-import pm.Button;
-
-public class JavaInputButton implements Button {
-    protected int code;
-
-    public JavaInputButton(int button) {
-        code = button - 1;
-    }
-
-    public String toString() {
-        return String.valueOf(code + 1);
-    }
-}
diff --git a/java/src/pm/device/javainput/JavaInputDevice.java b/java/src/pm/device/javainput/JavaInputDevice.java
index 31b4945..db0a22f 100644
--- a/java/src/pm/device/javainput/JavaInputDevice.java
+++ b/java/src/pm/device/javainput/JavaInputDevice.java
@@ -53,9 +53,7 @@ public abstract class JavaInputDevice extends Device {
             add(new Press(button));
         } else {
             System.out.println("Release: " + button);
-            System.out.println(">" + new Release(button));
             add(new Release(button));
-            System.out.println("erna");
         }
     }
 
diff --git a/java/src/pm/device/javainput/rumblepad/RumblepadButton.java b/java/src/pm/device/javainput/rumblepad/RumblepadButton.java
index 86d5e8e..cf5fd90 100644
--- a/java/src/pm/device/javainput/rumblepad/RumblepadButton.java
+++ b/java/src/pm/device/javainput/rumblepad/RumblepadButton.java
@@ -2,7 +2,6 @@ package pm.device.javainput.rumblepad;
 
 import de.hardcode.jxinput.event.JXInputButtonEvent;
 import pm.Button;
-import pm.device.javainput.extreme3d.Extreme3DButton;
 import pm.exception.event.UnknownButtonException;
 
 public enum RumblepadButton implements Button {
diff --git a/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java b/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java
index 3ea206d..c230152 100644
--- a/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java
+++ b/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java
@@ -35,7 +35,9 @@ public class RumblepadDevice extends JavaInputDevice {
                 new Press(RumblepadButton.THREE),
                 Action.RESUME.setTarget(Target.APPLICATION));
             add(
-                new Press(RumblepadButton.NINE),
+                new Macro(
+                    new Press(RumblepadButton.NINE)
+                ),
                 Action.EXIT.setTarget(Target.MAIN));
         } catch (MacroException e) {
             e.printStackTrace();
diff --git a/java/src/pm/listener/MacroListener.java b/java/src/pm/listener/MacroListener.java
index 4e6e65a..b8de44d 100644
--- a/java/src/pm/listener/MacroListener.java
+++ b/java/src/pm/listener/MacroListener.java
@@ -30,7 +30,6 @@ public class MacroListener extends ActionListener {
     }
 
     public void add(Event event) {
-        System.out.println("]] binnen " + event);
         for (Macro macro : macroList) {
             activeList.add(new Active(macro));
         }
diff --git a/java/src/pm/macro/Event.java b/java/src/pm/macro/Event.java
index 792ced9..2db1643 100644
--- a/java/src/pm/macro/Event.java
+++ b/java/src/pm/macro/Event.java
@@ -14,10 +14,6 @@ public abstract class Event {
     }
 
     public boolean equals(Event event) {
-        System.out.println(getClass() + " " + event.getClass());
-        System.out.println(getButton() + " " + event.getButton());
-        System.out.println(getButton().getClass() + " " + event.getButton().getClass());
-        System.out.println(event.getButton().equals(button));
         return event.getClass().equals(getClass()) && event.getButton().equals(button);
     }
 }