From bf861df33a8798325c948b0875f5cf8708ce7d30 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Thu, 14 Jul 2016 08:50:09 +0100
Subject: [PATCH] Minor modifications to adapt to upstream changes

---
 .../java/com/github/boukefalos/lirc/Loader.java    |  6 +++---
 .../java/com/github/boukefalos/lirc/Server.java    |  4 ++++
 .../boukefalos/lirc/button/RemoteButton.java       |  4 +++-
 .../boukefalos/lirc/implementation/Local.java      |  3 ++-
 src/test/java/test/TestLocal.java                  | 10 +++++-----
 src/test/java/test/TestRemoteImplementation.java   | 14 +++++++-------
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/github/boukefalos/lirc/Loader.java b/src/main/java/com/github/boukefalos/lirc/Loader.java
index d853908..2a64c5c 100644
--- a/src/main/java/com/github/boukefalos/lirc/Loader.java
+++ b/src/main/java/com/github/boukefalos/lirc/Loader.java
@@ -2,12 +2,12 @@ package com.github.boukefalos.lirc;
 
 import java.util.Properties;
 
-import base.exception.LoaderException;
-import base.loader.AbstractLoader;
-
 import com.github.boukefalos.lirc.implementation.Local;
 import com.github.boukefalos.lirc.implementation.Remote;
 
+import base.exception.LoaderException;
+import base.loader.AbstractLoader;
+
 public class Loader extends AbstractLoader<Loader> {
     protected static final String PROPERTIES_FILE = "lirc.properties";
 
diff --git a/src/main/java/com/github/boukefalos/lirc/Server.java b/src/main/java/com/github/boukefalos/lirc/Server.java
index 56a9641..fa9ac62 100644
--- a/src/main/java/com/github/boukefalos/lirc/Server.java
+++ b/src/main/java/com/github/boukefalos/lirc/Server.java
@@ -77,4 +77,8 @@ public class Server extends Listen<Object> implements Control {
             logger.error("Failed to send command");
         }        
     }
+
+	public void input(Object object) {
+		logger.debug("", object);		
+	}
 }
diff --git a/src/main/java/com/github/boukefalos/lirc/button/RemoteButton.java b/src/main/java/com/github/boukefalos/lirc/button/RemoteButton.java
index cbedb13..e14fa07 100644
--- a/src/main/java/com/github/boukefalos/lirc/button/RemoteButton.java
+++ b/src/main/java/com/github/boukefalos/lirc/button/RemoteButton.java
@@ -1,5 +1,7 @@
 package com.github.boukefalos.lirc.button;
 
-public interface RemoteButton {
+import mimis.input.Button;
+
+public interface RemoteButton extends Button {
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/boukefalos/lirc/implementation/Local.java b/src/main/java/com/github/boukefalos/lirc/implementation/Local.java
index f918a84..b9fdd39 100644
--- a/src/main/java/com/github/boukefalos/lirc/implementation/Local.java
+++ b/src/main/java/com/github/boukefalos/lirc/implementation/Local.java
@@ -27,6 +27,7 @@ import lirc.Lirc.Signal;
 import base.exception.worker.ActivateException;
 import base.exception.worker.DeactivateException;
 import base.work.Listen;
+import base.work.ReflectiveListen;
 
 import com.github.boukefalos.lirc.Lirc;
 import com.github.boukefalos.lirc.LircButton;
@@ -34,7 +35,7 @@ import com.github.boukefalos.lirc.LircClient;
 import com.github.boukefalos.lirc.util.Multiplexer;
 import com.github.boukefalos.lirc.util.SignalObject;
 
-public class Local extends Listen<Object> implements Lirc {
+public class Local extends ReflectiveListen implements Lirc {
     protected ArrayList<Listen<Object>> listenList;
     protected Multiplexer<String> multiplexer;
     protected LircClient lircClient;
diff --git a/src/test/java/test/TestLocal.java b/src/test/java/test/TestLocal.java
index abedf4b..7d8dbbc 100644
--- a/src/test/java/test/TestLocal.java
+++ b/src/test/java/test/TestLocal.java
@@ -1,15 +1,15 @@
 package test;
 
-import lirc.Lirc.Signal;
-import base.exception.worker.ActivateException;
-import base.work.Listen;
-
 import com.github.boukefalos.lirc.Lirc;
 import com.github.boukefalos.lirc.LircButton;
 import com.github.boukefalos.lirc.implementation.Local;
 import com.github.boukefalos.lirc.util.SignalObject;
 
-public class TestLocal extends Listen<Object> {    
+import base.exception.worker.ActivateException;
+import base.work.ReflectiveListen;
+import lirc.Lirc.Signal;
+
+public class TestLocal extends ReflectiveListen {    
     public static void main(String[] args) {
         new TestLocal().start();
         try {
diff --git a/src/test/java/test/TestRemoteImplementation.java b/src/test/java/test/TestRemoteImplementation.java
index c384967..d1e4e99 100644
--- a/src/test/java/test/TestRemoteImplementation.java
+++ b/src/test/java/test/TestRemoteImplementation.java
@@ -2,18 +2,18 @@ package test;
 
 import java.util.Properties;
 
-import lirc.Lirc.Signal;
-import base.exception.LoaderException;
-import base.exception.worker.ActivateException;
-import base.work.Listen;
-
 import com.github.boukefalos.lirc.Lirc;
 import com.github.boukefalos.lirc.LircButton;
 import com.github.boukefalos.lirc.Loader;
 import com.github.boukefalos.lirc.Server;
 import com.github.boukefalos.lirc.util.SignalObject;
 
-public class TestRemoteImplementation extends Listen<Object> {
+import base.exception.LoaderException;
+import base.exception.worker.ActivateException;
+import base.work.ReflectiveListen;
+import lirc.Lirc.Signal;
+
+public class TestRemoteImplementation extends ReflectiveListen {
     protected Lirc lirc;
 
     public TestRemoteImplementation(Loader loader) {
@@ -36,7 +36,7 @@ public class TestRemoteImplementation extends Listen<Object> {
         }
     }
     
-    public static void main(Properties localProperties, Properties remoteProperties) throws LoaderException {
+    public static void main(Properties localProperties, Properties remoteProperties) throws  LoaderException  {
         Loader localLoader = new Loader(localProperties);
         Loader remoteLoader = new Loader(remoteProperties);