diff --git a/java/build.gradle b/java/build.gradle index a81b2f9..f46c037 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,6 +1,9 @@ subprojects { + version = '0.1' + apply plugin: 'java' apply plugin: 'eclipse' + apply plugin: 'cpp-lib' repositories { mavenCentral() @@ -8,9 +11,4 @@ subprojects { dependencies { } - - version = '0.1' - - jar { - } } diff --git a/java/itunescontroller/build.gradle b/java/itunescontroller/build.gradle index 9c99f6a..541bd3b 100644 --- a/java/itunescontroller/build.gradle +++ b/java/itunescontroller/build.gradle @@ -1,3 +1,3 @@ dependencies { compile 'net.sf.jacob-project:jacob:1.+' -} +} \ No newline at end of file diff --git a/java/mimis/build.gradle b/java/mimis/build.gradle index 427e0f1..bcbae14 100644 --- a/java/mimis/build.gradle +++ b/java/mimis/build.gradle @@ -1,31 +1,17 @@ -import java.util.jar.JarEntry; - -apply plugin: 'java' -apply plugin: 'eclipse' -apply plugin: 'cpp-lib' - -version = '0.1' - -sourceCompatibility = 1.6 -targetCompatibility = 1.6 - def mainClass = 'mimis.Main' -repositories { - mavenCentral() -} - dependencies { compile project(':itunescontroller') compile project(':wiiusej') compile project(':wiigee') - compile 'commons-collections:commons-collections:3.+' - compile 'commons-logging:commons-logging:1.+' - compile 'log4j:log4j:1.2.17' - compile 'com.melloware:jintellitype:1.3.7' - + //compile files('lib/jxinput.jar') compile fileTree(dir: 'lib', include: '*.jar') + + compile 'commons-collections:commons-collections:3.+' + compile 'org.slf4j:slf4j-api:1.+' + compile 'org.slf4j:slf4j-log4j12:1.7.5' + compile 'com.melloware:jintellitype:1.+' } jar { diff --git a/java/mimis/build.xml b/java/mimis/build.xml deleted file mode 100644 index 4d47af4..0000000 --- a/java/mimis/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/mimis/client.jar b/java/mimis/client.jar deleted file mode 100644 index a16b1bd..0000000 Binary files a/java/mimis/client.jar and /dev/null differ diff --git a/java/mimis/launch4j.xml b/java/mimis/launch4j.xml deleted file mode 100644 index d3043f1..0000000 --- a/java/mimis/launch4j.xml +++ /dev/null @@ -1,22 +0,0 @@ - - false - gui - main.jar - mimis.exe - Mimis - - - normal - http://java.com/download - - true - false - - resource\M.ico - - - 1.6.0 - - preferJre - - \ No newline at end of file diff --git a/java/mimis/main.jar b/java/mimis/main.jar deleted file mode 100644 index ba79a74..0000000 Binary files a/java/mimis/main.jar and /dev/null differ diff --git a/java/mimis/src/main/java/mimis/Gui.java b/java/mimis/src/main/java/mimis/Gui.java index 193ecea..2b7513c 100644 --- a/java/mimis/src/main/java/mimis/Gui.java +++ b/java/mimis/src/main/java/mimis/Gui.java @@ -28,7 +28,7 @@ public class Gui extends Component { protected static final long serialVersionUID = 1L; protected void processWindowEvent(WindowEvent event) { if (event.getID() == WindowEvent.WINDOW_CLOSING) { - log.debug("Window closing"); + logger.debug("Window closing"); component.exit(); } } diff --git a/java/mimis/src/main/java/mimis/Main.java b/java/mimis/src/main/java/mimis/Main.java index fa2d92f..d3a93b3 100644 --- a/java/mimis/src/main/java/mimis/Main.java +++ b/java/mimis/src/main/java/mimis/Main.java @@ -70,7 +70,7 @@ public class Main extends Mimis { protected void deactivate() throws DeactivateException { super.deactivate(); - log.debug("Stop managers"); + logger.debug("Stop managers"); applicationManager.stop(); deviceManager.stop(); } @@ -78,7 +78,7 @@ public class Main extends Mimis { public void exit() { super.exit(); - log.debug("Exit managers"); + logger.debug("Exit managers"); applicationManager.exit(); deviceManager.exit(); } diff --git a/java/mimis/src/main/java/mimis/Mimis.java b/java/mimis/src/main/java/mimis/Mimis.java index 3185c4f..90d36af 100644 --- a/java/mimis/src/main/java/mimis/Mimis.java +++ b/java/mimis/src/main/java/mimis/Mimis.java @@ -64,11 +64,11 @@ public abstract class Mimis extends Component { route(new Feedback("Current component: " + componentCycle.current().getTitle())); break; case NEXT: - log.debug("Next component"); + logger.debug("Next component"); route(new Feedback("Next component: " + componentCycle.next().getTitle())); break; case PREVIOUS: - log.debug("Previous component"); + logger.debug("Previous component"); route(new Feedback("Previous component: " + componentCycle.previous().getTitle())); break; case EXIT: diff --git a/java/mimis/src/main/java/mimis/application/cmd/CMDApplication.java b/java/mimis/src/main/java/mimis/application/cmd/CMDApplication.java index bd518f3..70f742e 100644 --- a/java/mimis/src/main/java/mimis/application/cmd/CMDApplication.java +++ b/java/mimis/src/main/java/mimis/application/cmd/CMDApplication.java @@ -38,7 +38,7 @@ public abstract class CMDApplication extends Component implements Application { command = replaceVariables(command); process = Runtime.getRuntime().exec(command); } catch (IOException e) { - log.error(e); + logger.error(e.getMessage()); throw new ActivateException(); } } diff --git a/java/mimis/src/main/java/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java b/java/mimis/src/main/java/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java index 0ea28e0..04f5f36 100644 --- a/java/mimis/src/main/java/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java +++ b/java/mimis/src/main/java/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java @@ -37,7 +37,7 @@ public class GomPlayerApplication extends WindowsApplication { } public void begin(Action action) { - log.trace("GomPlayerApplication begin: " + action); + logger.trace("GomPlayerApplication begin: " + action); switch (action) { case VOLUME_UP: volumeWorker.start(); @@ -61,7 +61,7 @@ public class GomPlayerApplication extends WindowsApplication { } public void end(Action action) { - log.trace("GomPlayerApplication end: " + action); + logger.trace("GomPlayerApplication end: " + action); switch (action) { case PLAY: command(0x800C); diff --git a/java/mimis/src/main/java/mimis/application/cmd/windows/photoviewer/PhotoViewerApplication.java b/java/mimis/src/main/java/mimis/application/cmd/windows/photoviewer/PhotoViewerApplication.java index d59bd9c..cb2b9cb 100644 --- a/java/mimis/src/main/java/mimis/application/cmd/windows/photoviewer/PhotoViewerApplication.java +++ b/java/mimis/src/main/java/mimis/application/cmd/windows/photoviewer/PhotoViewerApplication.java @@ -45,7 +45,7 @@ public class PhotoViewerApplication extends WindowsApplication { } public void end(Action action) { - log.trace("PhotoViewerApplication end: " + action); + logger.trace("PhotoViewerApplication end: " + action); switch (action) { case VOLUME_UP: case VOLUME_DOWN: diff --git a/java/mimis/src/main/java/mimis/application/cmd/windows/winamp/WinampApplication.java b/java/mimis/src/main/java/mimis/application/cmd/windows/winamp/WinampApplication.java index 975c352..29f581a 100644 --- a/java/mimis/src/main/java/mimis/application/cmd/windows/winamp/WinampApplication.java +++ b/java/mimis/src/main/java/mimis/application/cmd/windows/winamp/WinampApplication.java @@ -62,7 +62,7 @@ public class WinampApplication extends WindowsApplication { } public void begin(Action action) { - log.trace("WinampApplication begin: " + action); + logger.trace("WinampApplication begin: " + action); switch (action) { case VOLUME_UP: volumeWorker.start(1); @@ -80,10 +80,10 @@ public class WinampApplication extends WindowsApplication { } public void end(Action action) { - log.trace("WinampApplication end: " + action); + logger.trace("WinampApplication end: " + action); switch (action) { case PLAY: - log.debug("play"); + logger.debug("play"); switch (user(0, IPC_ISPLAYING)) { case STATUS_STOPPED: command(WINAMP_BUTTON2); diff --git a/java/mimis/src/main/java/mimis/application/cmd/windows/wmp/WMPApplication.java b/java/mimis/src/main/java/mimis/application/cmd/windows/wmp/WMPApplication.java index 484d830..8b302ca 100644 --- a/java/mimis/src/main/java/mimis/application/cmd/windows/wmp/WMPApplication.java +++ b/java/mimis/src/main/java/mimis/application/cmd/windows/wmp/WMPApplication.java @@ -19,7 +19,7 @@ public class WMPApplication extends WindowsApplication { } public void begin(Action action) { - log.trace("WMPApplication begin: " + action); + logger.trace("WMPApplication begin: " + action); switch (action) { case PLAY: command(18808); @@ -55,7 +55,7 @@ public class WMPApplication extends WindowsApplication { } public void end(Action action) { - log.trace("WMPApplication end: " + action); + logger.trace("WMPApplication end: " + action); switch (action) { case FORWARD: command(18813); diff --git a/java/mimis/src/main/java/mimis/application/itunes/iTunesApplication.java b/java/mimis/src/main/java/mimis/application/itunes/iTunesApplication.java index 3b3de7f..06f2894 100644 --- a/java/mimis/src/main/java/mimis/application/itunes/iTunesApplication.java +++ b/java/mimis/src/main/java/mimis/application/itunes/iTunesApplication.java @@ -63,7 +63,7 @@ public class iTunesApplication extends Component implements Application, iTunesE try { iTunes.release(); } catch (Exception e) { - log.error(e); + logger.error("", e); throw new DeactivateException(); } } @@ -78,7 +78,7 @@ public class iTunesApplication extends Component implements Application, iTunesE } protected void begin(Action action) { - log.trace("iTunesApplication begin: " + action); + logger.trace("iTunesApplication begin: " + action); if (!active) return; switch (action) { case FORWARD: @@ -97,7 +97,7 @@ public class iTunesApplication extends Component implements Application, iTunesE } protected void end(Action action) { - log.trace("iTunesApplication end: " + action); + logger.trace("iTunesApplication end: " + action); if (!active) return; switch (action) { case PLAY: @@ -144,13 +144,13 @@ public class iTunesApplication extends Component implements Application, iTunesE public void onDatabaseChangedEvent(int[][] deletedObjectIDs, int[][] changedObjectIDs) {} public void onPlayerPlayEvent(ITTrack iTrack) { if (active) { - log.trace("iTunesEvent: play"); + logger.trace("iTunesEvent: play"); } } public void onPlayerStopEvent(ITTrack iTrack) { if (active) { - log.trace("iTunesEvent: stop"); + logger.trace("iTunesEvent: stop"); } } diff --git a/java/mimis/src/main/java/mimis/application/lirc/ipod/iPodApplication.java b/java/mimis/src/main/java/mimis/application/lirc/ipod/iPodApplication.java index 58b758f..065e443 100644 --- a/java/mimis/src/main/java/mimis/application/lirc/ipod/iPodApplication.java +++ b/java/mimis/src/main/java/mimis/application/lirc/ipod/iPodApplication.java @@ -29,28 +29,28 @@ public class iPodApplication extends LircApplication { } protected void begin(Action action) { - log.trace("iPodApplication begin: " + action); + logger.trace("iPodApplication begin: " + action); if (!active) return; switch (action) { case VOLUME_UP: try { volumeWorker.activate(1); } catch (ActivateException e) { - log.error(e); + logger.error("", e); } break; case VOLUME_DOWN: try { volumeWorker.activate(-1); } catch (ActivateException e) { - log.error(e); + logger.error("", e); } break; } } protected void end(Action action) { - log.trace("iPodApplication end: " + action); + logger.trace("iPodApplication end: " + action); if (!active) return; switch (action) { case PLAY: diff --git a/java/mimis/src/main/java/mimis/application/mpc/MPCApplication.java b/java/mimis/src/main/java/mimis/application/mpc/MPCApplication.java index be2b3c8..c8f5b82 100644 --- a/java/mimis/src/main/java/mimis/application/mpc/MPCApplication.java +++ b/java/mimis/src/main/java/mimis/application/mpc/MPCApplication.java @@ -22,7 +22,7 @@ public class MPCApplication extends WindowsApplication { } public void begin(Action action) { - log.trace("MPCApplication: " + action); + logger.trace("MPCApplication: " + action); switch (action) { case FORWARD: seekWorker.start(1); @@ -40,7 +40,7 @@ public class MPCApplication extends WindowsApplication { } public void end(Action action) { - log.trace("MPCApplication: " + action); + logger.trace("MPCApplication: " + action); switch (action) { case PLAY: command(889); diff --git a/java/mimis/src/main/java/mimis/application/robot/RobotApplication.java b/java/mimis/src/main/java/mimis/application/robot/RobotApplication.java index 5fa456b..f0c976f 100644 --- a/java/mimis/src/main/java/mimis/application/robot/RobotApplication.java +++ b/java/mimis/src/main/java/mimis/application/robot/RobotApplication.java @@ -15,7 +15,7 @@ public class RobotApplication extends Component { robot = new Robot(); robot.setAutoWaitForIdle(true); } catch (AWTException e) { - log.error(e); + logger.error("", e); throw new ActivateException(); } super.activate(); diff --git a/java/mimis/src/main/java/mimis/application/vlc/VLCApplication.java b/java/mimis/src/main/java/mimis/application/vlc/VLCApplication.java index e04c096..807fcf2 100644 --- a/java/mimis/src/main/java/mimis/application/vlc/VLCApplication.java +++ b/java/mimis/src/main/java/mimis/application/vlc/VLCApplication.java @@ -55,11 +55,11 @@ public class VLCApplication extends CMDApplication { URL url = new URL(request); HttpURLConnection httpUrlConnection = (HttpURLConnection) url.openConnection(); int response = httpUrlConnection.getResponseCode(); - log.trace("Response: " + response); + logger.trace("Response: " + response); } catch (MalformedURLException e) { - log.error(e); + logger.error("", e); } catch (IOException e) { - log.error(e); + logger.error("", e); } } @@ -77,7 +77,7 @@ public class VLCApplication extends CMDApplication { } public void begin(Action action) { - log.trace("VLCApplication begin: " + action); + logger.trace("VLCApplication begin: " + action); try { switch (action) { case VOLUME_UP: @@ -94,12 +94,12 @@ public class VLCApplication extends CMDApplication { break; } } catch (ActivateException e) { - log.error(e); + logger.error("", e); } } public void end(Action action) { - log.trace("VLCApplication end: " + action); + logger.trace("VLCApplication end: " + action); switch (action) { case PLAY: command("pl_pause"); diff --git a/java/mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java b/java/mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java index 8798ac8..6dfc78a 100644 --- a/java/mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java +++ b/java/mimis/src/main/java/mimis/device/javainput/JavaInputDevice.java @@ -32,7 +32,7 @@ public abstract class JavaInputDevice extends Component implements Device { super.activate(); try { JXInputDevice jxinputDevice = getDevice(name); - log.debug(jxinputDevice); + logger.debug(jxinputDevice.getName()); javaInputListener = new JavaInputListener(this, jxinputDevice); } catch (DeviceNotFoundException e) { active = false; diff --git a/java/mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java b/java/mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java index 92ae185..7ee3236 100644 --- a/java/mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java +++ b/java/mimis/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java @@ -45,7 +45,7 @@ public class JIntellitypeDevice extends Component implements Device, HotkeyListe route(new Press(commandButton)); route(new Release(commandButton)); } catch (UnknownButtonException e) { - log.error(e); + logger.error("", e); } } } diff --git a/java/mimis/src/main/java/mimis/device/lirc/LircDevice.java b/java/mimis/src/main/java/mimis/device/lirc/LircDevice.java index a09cb4e..a9f13a3 100644 --- a/java/mimis/src/main/java/mimis/device/lirc/LircDevice.java +++ b/java/mimis/src/main/java/mimis/device/lirc/LircDevice.java @@ -60,14 +60,14 @@ public class LircDevice extends CMDApplication implements Device, LircButtonList } protected void deactivate() throws DeactivateException { - log.debug("Deactivate LircDevice"); + logger.debug("Deactivate LircDevice"); super.deactivate(); lircService.stop(); multiplexer.stop(); } public void exit() { - log.debug("Exit LircDevice"); + logger.debug("Exit LircDevice"); super.exit(); lircService.exit(); multiplexer.exit(); diff --git a/java/mimis/src/main/java/mimis/device/lirc/LircService.java b/java/mimis/src/main/java/mimis/device/lirc/LircService.java index c28d1aa..0ef7691 100644 --- a/java/mimis/src/main/java/mimis/device/lirc/LircService.java +++ b/java/mimis/src/main/java/mimis/device/lirc/LircService.java @@ -62,7 +62,7 @@ public class LircService extends Worker { } public void activate() throws ActivateException { - log.trace("Activate LircService"); + logger.trace("Activate LircService"); try { socket = new Socket(ip, port); socket.setSoTimeout(SLEEP); @@ -73,10 +73,10 @@ public class LircService extends Worker { outputStream = socket.getOutputStream(); printWriter = new PrintWriter(outputStream); } catch (UnknownHostException e) { - log.error(e); + logger.error("", e); throw new ActivateException(); } catch (IOException e) { - log.error(e); + logger.error("", e); throw new ActivateException(); } super.activate(); @@ -90,14 +90,14 @@ public class LircService extends Worker { } public void deactivate() throws DeactivateException { - log.trace("Deactivate LircService"); + logger.trace("Deactivate LircService"); super.deactivate(); try { inputStream.close(); outputStream.close(); socket.close(); } catch (IOException e) { - log.error(e); + logger.error("", e); } } @@ -114,11 +114,11 @@ public class LircService extends Worker { lircbuttonListener.add(lircButton); } } catch (UnknownButtonException e) { - log.error(e); + logger.error("", e); } } catch (SocketTimeoutException e) { } catch (IOException e) { - log.error(e); + logger.error("", e); } } @@ -128,7 +128,7 @@ public class LircService extends Worker { scanner.next(); String code = scanner.next(); String remote = scanner.next(); - log.trace(String.format("%s: %s", remote, code)); + logger.trace(String.format("%s: %s", remote, code)); LircButton[] buttonArray = buttonMap.get(remote); if (buttonArray != null) { for (LircButton button : buttonArray) { @@ -138,9 +138,9 @@ public class LircService extends Worker { } } } catch (InputMismatchException e) { - log.error(e); + logger.error("", e); } catch (NoSuchElementException e) { - log.error(e); + logger.error("", e); } throw new UnknownButtonException(); } diff --git a/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java b/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java index d895c81..cde2b3b 100644 --- a/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java +++ b/java/mimis/src/main/java/mimis/device/network/NetworkDevice.java @@ -98,7 +98,7 @@ public class NetworkDevice extends Component implements Device { route(new Feedback("[NetworkDevice] Closing server socket")); serverSocket.close(); } catch (IOException e) { - log.error(e); + logger.error("", e); } finally { for (Client client : clientList) { client.stop(); @@ -114,7 +114,7 @@ public class NetworkDevice extends Component implements Device { client.start(); route(new Feedback("[NetworkDevice] Client connected: " + socket.getInetAddress())); } catch (IOException e) { - log.error(e); + logger.error("", e); } } @@ -152,15 +152,15 @@ public class NetworkDevice extends Component implements Device { do { object = objectInputStream.readObject(); if (object instanceof Input) { - log.trace(object); + logger.trace("", object); route((Input) object); } } while (object != null); } catch (IOException e) { - log.error(e); + logger.error("", e); stop(); } catch (ClassNotFoundException e) { - log.error(e); + logger.error("", e); } } @@ -173,7 +173,7 @@ public class NetworkDevice extends Component implements Device { outputStream.close(); socket.close(); } catch (IOException e) { - log.error(e); + logger.error("", e); } route(new Feedback("[NetworkDevice] Client disconnected: " + socket.getInetAddress())); } @@ -182,7 +182,7 @@ public class NetworkDevice extends Component implements Device { try { objectOutputStream.writeObject(object); } catch (IOException e) { - log.error(e); + logger.error("", e); } } } diff --git a/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDevice.java b/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDevice.java index d0bd711..62410ca 100644 --- a/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDevice.java +++ b/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDevice.java @@ -70,7 +70,7 @@ public class WiimoteDevice extends Component implements Device, GestureListener try { connect(); } catch (DeviceNotFoundException e) { - log.warn(e); + logger.warn("", e); } super.activate(); } @@ -82,7 +82,7 @@ public class WiimoteDevice extends Component implements Device, GestureListener try { wait(CONNECTED_TIMEOUT); } catch (InterruptedException e) { - log.error(e); + logger.error("", e); } if (!connected) { try { @@ -121,37 +121,37 @@ public class WiimoteDevice extends Component implements Device, GestureListener public void begin(Action action) { switch (action) { case SHIFT: - log.debug("Shift"); + logger.debug("Shift"); parser(Action.RESET, taskMapCycle.player); parser(Action.ADD, taskMapCycle.mimis); parser(Action.ADD, taskMapCycle.like); break; case UNSHIFT: - log.debug("Unshift"); + logger.debug("Unshift"); parser(Action.RESET, taskMapCycle.mimis); parser(Action.RESET, taskMapCycle.like); parser(Action.ADD, taskMapCycle.player); break; case RECOGNIZE: - log.debug("Gesture recognize press"); + logger.debug("Gesture recognize press"); gestureDevice.recognize(Signal.BEGIN); break; case TRAIN: - log.debug("Gesture train press"); + logger.debug("Gesture train press"); gestureDevice.train(Signal.BEGIN); break; case CLOSE: - log.debug("Gesture close press"); + logger.debug("Gesture close press"); gestureDevice.close(Signal.BEGIN); break; case SAVE: - log.debug("Gesture save"); + logger.debug("Gesture save"); gestureDevice.close(Signal.END); gestureDevice.saveGesture(gestureId, "tmp/gesture #" + gestureId); ++gestureId; break; case LOAD: - log.debug("Gesture load"); + logger.debug("Gesture load"); for (int i = 0; i < gestureId; ++i) { gestureDevice.loadGesture("tmp/gesture #" + gestureId); } @@ -162,15 +162,15 @@ public class WiimoteDevice extends Component implements Device, GestureListener public void end(Action action) { switch (action) { case RECOGNIZE: - log.debug("Gesture recognize release"); + logger.debug("Gesture recognize release"); gestureDevice.recognize(Signal.END); break; case TRAIN: - log.debug("Gesture train release"); + logger.debug("Gesture train release"); gestureDevice.train(Signal.END); break; case CLOSE: - log.debug("Gesture close release"); + logger.debug("Gesture close release"); gestureDevice.close(Signal.END); break; } @@ -178,7 +178,7 @@ public class WiimoteDevice extends Component implements Device, GestureListener public void feedback(Feedback feedback) { if (wiimote != null && active()) { - log.debug("Wiimote rumble feedback"); + logger.debug("Wiimote rumble feedback"); wiimote.rumble(RUMBLE); } } @@ -201,11 +201,11 @@ public class WiimoteDevice extends Component implements Device, GestureListener try { if (pressed != 0 && released == 0) { Button button = WiimoteButton.create(pressed); - log.trace("Press: " + button); + logger.trace("Press: " + button); route(new Press(button)); } else if (pressed == 0 && released != 0) { Button button = WiimoteButton.create(released); - log.trace("Release: " + button); + logger.trace("Release: " + button); route(new Release(button)); } } catch (UnknownButtonException e) {} @@ -224,7 +224,6 @@ public class WiimoteDevice extends Component implements Device, GestureListener } public void gestureReceived(GestureEvent event) { - log.debug(event.isValid()); if (event.isValid()) { System.out.printf("id #%d, prob %.0f%%, valid %b\n", event.getId(), 100 * event.getProbability(), event.isValid()); } diff --git a/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDiscovery.java b/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDiscovery.java index 5391a87..09f245d 100644 --- a/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDiscovery.java +++ b/java/mimis/src/main/java/mimis/device/wiimote/WiimoteDiscovery.java @@ -20,12 +20,12 @@ public class WiimoteDiscovery extends Worker { } protected boolean connect() { - log.debug("Connect"); + logger.debug("Connect"); return execute("-c nintendo"); // Nintendo RVL-CNT-01 RVL-WBC-01 } protected boolean disconnect() { - log.debug("Disconnect"); + logger.debug("Disconnect"); return execute("-d nintendo"); } @@ -44,7 +44,7 @@ public class WiimoteDiscovery extends Worker { } } } catch (IOException e) { - log.error(e); + logger.error("", e); } finally { process = null; } @@ -68,7 +68,7 @@ public class WiimoteDiscovery extends Worker { disconnect = false; } if (connect()) { - log.debug("Connected"); + logger.debug("Connected"); try { sleep(TIMEOUT); wiimoteDevice.connect(); diff --git a/java/mimis/src/main/java/mimis/device/wiimote/motion/MotionDevice.java b/java/mimis/src/main/java/mimis/device/wiimote/motion/MotionDevice.java index 85369ee..fb0fb98 100644 --- a/java/mimis/src/main/java/mimis/device/wiimote/motion/MotionDevice.java +++ b/java/mimis/src/main/java/mimis/device/wiimote/motion/MotionDevice.java @@ -60,7 +60,7 @@ public class MotionDevice extends Component { public void release(Button button) { if (button instanceof LircButton) { PhiliphsRCLE011Button lircButton = (PhiliphsRCLE011Button) button; - log.debug(lircButton); + logger.debug(lircButton.getName()); switch (lircButton) { case CLOCK: action = Action.TRAIN; @@ -84,24 +84,24 @@ public class MotionDevice extends Component { if (replay == false) { release(ColorButton.YELLOW); } else { - log.debug("Set file to #" + id); + logger.debug("Set file to #" + id); } } else if (button instanceof ColorButton) { ColorButton colorButton = (ColorButton) button; - log.debug(colorButton.name()); + logger.debug(colorButton.name()); synchronized (motionList) { switch (colorButton) { case GREEN: - log.debug("Start capturing motion"); + logger.debug("Start capturing motion"); motionList.clear(); start = System.currentTimeMillis(); break; case RED: if (replayWorker.active()) { - log.debug("Stop replaying motion"); + logger.debug("Stop replaying motion"); replayWorker.stop(); } else { - log.debug("Writing motion to file #" + id); + logger.debug("Writing motion to file #" + id); try { FileOutputStream fileOutputStream = new FileOutputStream(String.format("tmp/motion #%d.bin", id)); ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream); @@ -111,14 +111,14 @@ public class MotionDevice extends Component { } objectOutputStream.close(); } catch (IOException e) { - log.error(e); + logger.error("", e); } motionList.clear(); start = -1; } break; case YELLOW: - log.debug("Replaying motion from file #" + id); + logger.debug("Replaying motion from file #" + id); replay = true; replayWorker.start(); break; @@ -149,22 +149,22 @@ public class MotionDevice extends Component { super.activate(); return; } catch (FileNotFoundException e) { - log.error(e); + logger.error("", e); } catch (IOException e) { - log.error(e); + logger.error("", e); } catch (ClassNotFoundException e) { - log.error(e); + logger.error("", e); } } protected void deactivate() throws DeactivateException { - log.debug(String.format("Replay stopped (%d ms)", time)); + logger.debug(String.format("Replay stopped (%d ms)", time)); wiimoteDevice.end(action); replay = false; try { objectInputStream.close(); } catch (IOException e) { - log.debug(e); + logger.debug("", e); } super.deactivate(); } @@ -178,9 +178,9 @@ public class MotionDevice extends Component { time = motionData.getTime(); return; } catch (IOException e) { - log.error(e); + logger.error("", e); } catch (ClassNotFoundException e) { - log.error(e); + logger.error("", e); } } stop(); diff --git a/java/mimis/src/main/java/mimis/parser/Parser.java b/java/mimis/src/main/java/mimis/parser/Parser.java index 05f1437..0a29344 100644 --- a/java/mimis/src/main/java/mimis/parser/Parser.java +++ b/java/mimis/src/main/java/mimis/parser/Parser.java @@ -42,7 +42,7 @@ public class Parser extends Component { } public void input(ParserInput parserInput) { - log.trace("input(ParserInput)"); + logger.trace("input(ParserInput)"); Action action = parserInput.getAction(); try { switch (action) { @@ -57,7 +57,7 @@ public class Parser extends Component { return; } } catch (NullPointerException e) { - log.error("Illegal use of ParserInput"); + logger.error("Illegal use of ParserInput"); } } @@ -96,7 +96,7 @@ public class Parser extends Component { } protected void add(TaskMap taskMap) { - log.trace("add(TaskMap)"); + logger.trace("add(TaskMap)"); this.taskMap.putAll(taskMap); sequenceList.addAll(taskMap.keySet()); } diff --git a/java/mimis/src/main/java/mimis/router/GlobalRouter.java b/java/mimis/src/main/java/mimis/router/GlobalRouter.java index 212595e..a865f7f 100644 --- a/java/mimis/src/main/java/mimis/router/GlobalRouter.java +++ b/java/mimis/src/main/java/mimis/router/GlobalRouter.java @@ -25,7 +25,7 @@ public class GlobalRouter extends Router { try { client = new Client(ip, port); } catch (IOException e) { - log.error(e); + logger.error("", e); throw new ActivateException(); } super.activate(); @@ -40,7 +40,7 @@ public class GlobalRouter extends Router { try { client.send(task); } catch (IOException e) { - log.error(e); + logger.error("", e); } } @@ -65,9 +65,9 @@ public class GlobalRouter extends Router { } } while (object != null); } catch (IOException e) { - log.error(e); + logger.error("", e); } catch (ClassNotFoundException e) { - log.error(e); + logger.error("", e); } } @@ -78,7 +78,7 @@ public class GlobalRouter extends Router { objectOutputStream.close(); socket.close(); } catch (IOException e) { - log.error(e); + logger.error("", e); } } diff --git a/java/mimis/src/main/java/mimis/util/Ir.java b/java/mimis/src/main/java/mimis/util/Ir.java index 913ca8c..e246c62 100644 --- a/java/mimis/src/main/java/mimis/util/Ir.java +++ b/java/mimis/src/main/java/mimis/util/Ir.java @@ -95,7 +95,7 @@ public class Ir extends WiimoteDevice implements LircButtonListener { public void onIrEvent(IREvent event) { // log.debug(event); raw = new Point(event.getAx(), event.getAy()); - log.debug(String.format("%d %d", raw.x, raw.y)); + logger.debug(String.format("%d %d", raw.x, raw.y)); if (t != null && r != null && b != null && l != null) { double w = r.getX(raw.y) - l.getX(raw.y); double h = t.getY(raw.x) - b.getY(raw.x); diff --git a/java/mimis/src/main/java/mimis/worker/Component.java b/java/mimis/src/main/java/mimis/worker/Component.java index b84512e..cee3795 100644 --- a/java/mimis/src/main/java/mimis/worker/Component.java +++ b/java/mimis/src/main/java/mimis/worker/Component.java @@ -36,7 +36,7 @@ public abstract class Component extends Listener { public void listen(Class clazz) { if (router == null) { - log.error("Router not set"); + logger.error("Router not set"); } else { router.listen(this, clazz); } @@ -44,7 +44,7 @@ public abstract class Component extends Listener { public void ignore(Class clazz) { if (router == null) { - log.error("Router not set"); + logger.error("Router not set"); } else { router.ignore(this, clazz); } @@ -52,7 +52,7 @@ public abstract class Component extends Listener { public void route(Input input) { if (router == null) { - log.error("Router not set"); + logger.error("Router not set"); } else { if (input instanceof State) { State state = (State) input; diff --git a/java/mimis/src/main/java/mimis/worker/IntervalWorker.java b/java/mimis/src/main/java/mimis/worker/IntervalWorker.java index 7883a60..0fe2087 100644 --- a/java/mimis/src/main/java/mimis/worker/IntervalWorker.java +++ b/java/mimis/src/main/java/mimis/worker/IntervalWorker.java @@ -28,7 +28,7 @@ public class IntervalWorker extends Worker { wait(); } } catch (InterruptedException e) { - log.info(e); + logger.info("", e); } } } @@ -47,7 +47,7 @@ public class IntervalWorker extends Worker { try { super.activate(); } catch (ActivateException e) { - log.error(e); + logger.error("", e); } finally { activate = false; } @@ -55,7 +55,7 @@ public class IntervalWorker extends Worker { try { super.deactivate(); } catch (DeactivateException e) { - log.error(e); + logger.error("", e); } finally { deactivate = false; } diff --git a/java/mimis/src/main/java/mimis/worker/Listener.java b/java/mimis/src/main/java/mimis/worker/Listener.java index 24c5547..695d288 100644 --- a/java/mimis/src/main/java/mimis/worker/Listener.java +++ b/java/mimis/src/main/java/mimis/worker/Listener.java @@ -25,7 +25,7 @@ public abstract class Listener extends Worker { try { wait(); } catch (InterruptedException e) { - log.info(e); + logger.info("", e); } } } diff --git a/java/mimis/src/main/java/mimis/worker/Worker.java b/java/mimis/src/main/java/mimis/worker/Worker.java index 5919772..4b948e1 100644 --- a/java/mimis/src/main/java/mimis/worker/Worker.java +++ b/java/mimis/src/main/java/mimis/worker/Worker.java @@ -3,11 +3,11 @@ package mimis.worker; import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class Worker implements Runnable { - protected Log log = LogFactory.getLog(getClass()); + protected Logger logger = LoggerFactory.getLogger(getClass()); protected static final boolean THREAD = true; protected static final int SLEEP = 100; @@ -33,10 +33,10 @@ public abstract class Worker implements Runnable { if (!run) { run = true; if (thread) { - log.debug("Start thread"); + logger.debug("Start thread"); new Thread(this, getClass().getName()).start(); } else { - log.debug("Run directly"); + logger.debug("Run directly"); run(); } } else { @@ -66,7 +66,7 @@ public abstract class Worker implements Runnable { Thread.sleep(time); } } catch (InterruptedException e) { - log.info(e); + logger.info("", e); } } @@ -92,7 +92,7 @@ public abstract class Worker implements Runnable { try { activate(); } catch (ActivateException e) { - log.error(e); + logger.error("", e); } finally { activate = false; } @@ -100,7 +100,7 @@ public abstract class Worker implements Runnable { try { deactivate(); } catch (DeactivateException e) { - log.error(e); + logger.error("", e); } finally { deactivate = false; } @@ -113,7 +113,7 @@ public abstract class Worker implements Runnable { wait(); } } catch (InterruptedException e) { - log.info(e); + logger.info("", e); } } } diff --git a/java/wiigee/build.gradle b/java/wiigee/build.gradle index 7d82dc7..e69de29 100644 --- a/java/wiigee/build.gradle +++ b/java/wiigee/build.gradle @@ -1,2 +0,0 @@ -dependencies { -} diff --git a/java/wiiusej/build.gradle b/java/wiiusej/build.gradle index 29e600b..e69de29 100644 --- a/java/wiiusej/build.gradle +++ b/java/wiiusej/build.gradle @@ -1,3 +0,0 @@ -dependencies { - -}