Minor modifications to adapt to upstream changes
This commit is contained in:
@@ -2,12 +2,12 @@ package com.github.boukefalos.lirc;
|
|||||||
|
|
||||||
import java.util.Properties;
|
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.Local;
|
||||||
import com.github.boukefalos.lirc.implementation.Remote;
|
import com.github.boukefalos.lirc.implementation.Remote;
|
||||||
|
|
||||||
|
import base.exception.LoaderException;
|
||||||
|
import base.loader.AbstractLoader;
|
||||||
|
|
||||||
public class Loader extends AbstractLoader<Loader> {
|
public class Loader extends AbstractLoader<Loader> {
|
||||||
protected static final String PROPERTIES_FILE = "lirc.properties";
|
protected static final String PROPERTIES_FILE = "lirc.properties";
|
||||||
|
|
||||||
|
|||||||
@@ -77,4 +77,8 @@ public class Server extends Listen<Object> implements Control {
|
|||||||
logger.error("Failed to send command");
|
logger.error("Failed to send command");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void input(Object object) {
|
||||||
|
logger.debug("", object);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.github.boukefalos.lirc.button;
|
package com.github.boukefalos.lirc.button;
|
||||||
|
|
||||||
public interface RemoteButton {
|
import mimis.input.Button;
|
||||||
|
|
||||||
|
public interface RemoteButton extends Button {
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -27,6 +27,7 @@ import lirc.Lirc.Signal;
|
|||||||
import base.exception.worker.ActivateException;
|
import base.exception.worker.ActivateException;
|
||||||
import base.exception.worker.DeactivateException;
|
import base.exception.worker.DeactivateException;
|
||||||
import base.work.Listen;
|
import base.work.Listen;
|
||||||
|
import base.work.ReflectiveListen;
|
||||||
|
|
||||||
import com.github.boukefalos.lirc.Lirc;
|
import com.github.boukefalos.lirc.Lirc;
|
||||||
import com.github.boukefalos.lirc.LircButton;
|
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.Multiplexer;
|
||||||
import com.github.boukefalos.lirc.util.SignalObject;
|
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 ArrayList<Listen<Object>> listenList;
|
||||||
protected Multiplexer<String> multiplexer;
|
protected Multiplexer<String> multiplexer;
|
||||||
protected LircClient lircClient;
|
protected LircClient lircClient;
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
package test;
|
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.Lirc;
|
||||||
import com.github.boukefalos.lirc.LircButton;
|
import com.github.boukefalos.lirc.LircButton;
|
||||||
import com.github.boukefalos.lirc.implementation.Local;
|
import com.github.boukefalos.lirc.implementation.Local;
|
||||||
import com.github.boukefalos.lirc.util.SignalObject;
|
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) {
|
public static void main(String[] args) {
|
||||||
new TestLocal().start();
|
new TestLocal().start();
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -2,18 +2,18 @@ package test;
|
|||||||
|
|
||||||
import java.util.Properties;
|
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.Lirc;
|
||||||
import com.github.boukefalos.lirc.LircButton;
|
import com.github.boukefalos.lirc.LircButton;
|
||||||
import com.github.boukefalos.lirc.Loader;
|
import com.github.boukefalos.lirc.Loader;
|
||||||
import com.github.boukefalos.lirc.Server;
|
import com.github.boukefalos.lirc.Server;
|
||||||
import com.github.boukefalos.lirc.util.SignalObject;
|
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;
|
protected Lirc lirc;
|
||||||
|
|
||||||
public TestRemoteImplementation(Loader loader) {
|
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 localLoader = new Loader(localProperties);
|
||||||
Loader remoteLoader = new Loader(remoteProperties);
|
Loader remoteLoader = new Loader(remoteProperties);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user