From 1a3235d19c098cac10f803ddf5b378bf381f39d2 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Thu, 14 Jul 2016 08:54:38 +0100 Subject: [PATCH] Minor tweaks to get exec.connected working --- java/build.gradle | 3 +++ .../mimis/device/javainput/JavaInputDevice.java | 5 ++--- .../src/main/java/base/work/Listen.java | 4 +--- .../src/test/java/worker/dummy/DummyListen.java | 6 ++++++ java/exec.connected/build.gradle | 5 +++-- .../src/main/java/connected/TestFromYaml.java | 8 ++------ .../main/java/connected/TestTcpCommunication.java | 3 ++- .../exec.connected/src/main/java/dummy/Dummy.java | 15 +++++++-------- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/java/build.gradle b/java/build.gradle index 7cf1618..485e502 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -45,6 +45,9 @@ subprojects { maven { url 'https://github.com/Boukefalos/jlibwinapi/raw/mvn-repo/' } + maven { + url 'https://github.com/Boukefalos/jlibusb/raw/mvn-repo/' + } mavenCentral() } diff --git a/java/core.input/src/main/java/mimis/device/javainput/JavaInputDevice.java b/java/core.input/src/main/java/mimis/device/javainput/JavaInputDevice.java index bd3aff3..eadd57b 100644 --- a/java/core.input/src/main/java/mimis/device/javainput/JavaInputDevice.java +++ b/java/core.input/src/main/java/mimis/device/javainput/JavaInputDevice.java @@ -36,15 +36,14 @@ import de.hardcode.jxinput.event.JXInputDirectionalEvent; public abstract class JavaInputDevice extends Component implements Device { protected String name; + protected JavaInputListener javaInputListener; + protected Button previousDirectionalButton; public JavaInputDevice(String title, String name) { super(title); this.name = name; } - protected JavaInputListener javaInputListener; - protected Button previousDirectionalButton; - public void activate() throws ActivateException { try { JXInputDevice jxinputDevice = getDevice(name); diff --git a/java/core.worker/src/main/java/base/work/Listen.java b/java/core.worker/src/main/java/base/work/Listen.java index 0de6e16..4855f35 100644 --- a/java/core.worker/src/main/java/base/work/Listen.java +++ b/java/core.worker/src/main/java/base/work/Listen.java @@ -106,7 +106,5 @@ public abstract class Listen extends Work implements Listener { } } - public void input(E element) { - System.err.println(element); - } + public abstract void input(E element); } diff --git a/java/core.worker/src/test/java/worker/dummy/DummyListen.java b/java/core.worker/src/test/java/worker/dummy/DummyListen.java index 6fe7a93..5d1e1c7 100644 --- a/java/core.worker/src/test/java/worker/dummy/DummyListen.java +++ b/java/core.worker/src/test/java/worker/dummy/DummyListen.java @@ -23,4 +23,10 @@ public class DummyListen extends Listen { public void input(byte[] input) { System.out.println("#" + id + ", input = " + new String(input).trim()); } + + @Override + public void input(T element) { + // TODO Auto-generated method stub + + } } diff --git a/java/exec.connected/build.gradle b/java/exec.connected/build.gradle index 8d619e9..7ab2103 100644 --- a/java/exec.connected/build.gradle +++ b/java/exec.connected/build.gradle @@ -7,6 +7,7 @@ dependencies { compile 'com.esotericsoftware.yamlbeans:yamlbeans:1.09' - // compile 'com.github.boukefalos:jlibibuddy:1.1' - // compile 'com.github.boukefalos:jliblirc:1.1' + compile 'com.github.boukefalos:jlibibuddy:1.1' + compile 'com.github.boukefalos:jliblirc:1.1' + compile 'com.github.boukefalos:jlibusb:0.5.7' } \ No newline at end of file diff --git a/java/exec.connected/src/main/java/connected/TestFromYaml.java b/java/exec.connected/src/main/java/connected/TestFromYaml.java index d1d7453..908a7e1 100644 --- a/java/exec.connected/src/main/java/connected/TestFromYaml.java +++ b/java/exec.connected/src/main/java/connected/TestFromYaml.java @@ -20,19 +20,15 @@ import java.io.FileReader; import java.io.OutputStreamWriter; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; import java.util.Collection; import java.util.Map; -import yaml.Contact; - import com.esotericsoftware.yamlbeans.YamlReader; import com.esotericsoftware.yamlbeans.YamlWriter; +import yaml.Contact; + public class TestFromYaml { - - - public static void main(String[] args) throws Exception { YamlReader reader = new YamlReader(new FileReader("test.yml")); diff --git a/java/exec.connected/src/main/java/connected/TestTcpCommunication.java b/java/exec.connected/src/main/java/connected/TestTcpCommunication.java index 1c8628a..b8f868e 100644 --- a/java/exec.connected/src/main/java/connected/TestTcpCommunication.java +++ b/java/exec.connected/src/main/java/connected/TestTcpCommunication.java @@ -48,7 +48,8 @@ public class TestTcpCommunication { Properties iBuddyProperties = new Properties(); iBuddyProperties.setProperty("implementation", "local"); - iBuddy iBuddy = new com.github.boukefalos.ibuddy.Loader(iBuddyProperties).getiBuddy(); + iBuddy iBuddy = new com.github.boukefalos.ibuddy.Loader(iBuddyProperties).getiBuddy(); + Dummy dummy = new Dummy(localLirc, iBuddy); Control server = localLoader.getServer(); diff --git a/java/exec.connected/src/main/java/dummy/Dummy.java b/java/exec.connected/src/main/java/dummy/Dummy.java index b149c8b..4bc89db 100644 --- a/java/exec.connected/src/main/java/dummy/Dummy.java +++ b/java/exec.connected/src/main/java/dummy/Dummy.java @@ -16,18 +16,18 @@ */ package dummy; -import lirc.Lirc.Color; -import lirc.Lirc.Direction; -import lirc.Lirc.Number; -import lirc.Lirc.Signal; -import base.work.Listen; - import com.github.boukefalos.ibuddy.iBuddy; import com.github.boukefalos.lirc.Lirc; import com.github.boukefalos.lirc.LircButton; import com.github.boukefalos.lirc.util.SignalObject; -public class Dummy extends Listen { +import base.work.ReflectiveListen; +import lirc.Lirc.Color; +import lirc.Lirc.Direction; +import lirc.Lirc.Number; +import lirc.Lirc.Signal; + +public class Dummy extends ReflectiveListen { protected Lirc lirc; protected iBuddy iBuddy; @@ -45,7 +45,6 @@ public class Dummy extends Listen { public void input(SignalObject signalObject) { Signal signal = signalObject.signal; Object object = signalObject.object; - System.out.println(object); try { // Move these mappings to config file? if (object instanceof LircButton) {