diff --git a/java/client.bat b/java/client.bat index 8c54659..d157b2c 100644 --- a/java/client.bat +++ b/java/client.bat @@ -1,4 +1,4 @@ @echo off -set path=%path%;native +set path="C:\Program Files (x86)\Java\jdk1.6.0_24\bin";%path%;native java -cp bin;cfg;resource;lib/commons-logging-1.1.1.jar;lib/jacob-1.15-M3.jar;lib/TableLayout.jar;lib/nativecall-0.4.1.jar;lib/nativeloader-200505172341.jar mimis.Client pause \ No newline at end of file diff --git a/java/src/com/dt/iTunesController/ITTrack.java b/java/src/com/dt/iTunesController/ITTrack.java index 0046c7e..57bb11b 100644 --- a/java/src/com/dt/iTunesController/ITTrack.java +++ b/java/src/com/dt/iTunesController/ITTrack.java @@ -1,7 +1,8 @@ package com.dt.iTunesController; -import com.jacob.com.*; import java.util.Date; +import com.jacob.com.Dispatch; + /** * Represents a track. * diff --git a/java/src/com/dt/iTunesController/iTunes.java b/java/src/com/dt/iTunesController/iTunes.java index f9b6f53..42e018c 100644 --- a/java/src/com/dt/iTunesController/iTunes.java +++ b/java/src/com/dt/iTunesController/iTunes.java @@ -1,6 +1,6 @@ package com.dt.iTunesController; -import com.jacob.activeX.*; +import com.jacob.activeX.ActiveXComponent; import com.jacob.com.Dispatch; import com.jacob.com.DispatchEvents; diff --git a/java/src/mimis/Application.java b/java/src/mimis/Application.java index 201990a..dd1a99b 100644 --- a/java/src/mimis/Application.java +++ b/java/src/mimis/Application.java @@ -47,7 +47,7 @@ public abstract class Application extends EventHandler implements Titled, Exitab super.event(event); } - public void stop() throws DeactivateException { + public void stop() { super.stop(); if (active()) { try { diff --git a/java/src/mimis/Client.java b/java/src/mimis/Client.java index c416f4d..df1ff2e 100644 --- a/java/src/mimis/Client.java +++ b/java/src/mimis/Client.java @@ -10,7 +10,6 @@ import mimis.device.wiimote.WiimoteDevice; import mimis.event.EventRouter; import mimis.event.router.GlobalRouter; import mimis.exception.worker.ActivateException; -import mimis.exception.worker.DeactivateException; import mimis.util.swing.Dialog; import org.apache.commons.logging.Log; @@ -45,11 +44,7 @@ public class Client { } catch (ActivateException e) { log.fatal(e); } - try { - mimis.stop(); - } catch (DeactivateException e) { - log.fatal(e); - } + mimis.stop(); } public static void main(String[] args) { diff --git a/java/src/mimis/Device.java b/java/src/mimis/Device.java index 8eb1d11..f99fc08 100644 --- a/java/src/mimis/Device.java +++ b/java/src/mimis/Device.java @@ -27,7 +27,7 @@ public abstract class Device extends EventHandler implements Titled, Exitable { sequenceParser.reset(); } - public void stop() throws DeactivateException { + public void stop() { if (active()) { try { deactivate(); diff --git a/java/src/mimis/Event.java b/java/src/mimis/Event.java index d7eb0d7..2aa9d98 100644 --- a/java/src/mimis/Event.java +++ b/java/src/mimis/Event.java @@ -1,9 +1,11 @@ package mimis; +import java.io.Serializable; + import mimis.event.EventListener; import mimis.value.Target; -public class Event { +public class Event implements Serializable { protected static final long serialVersionUID = 1L; protected Target target; diff --git a/java/src/mimis/GUI.java b/java/src/mimis/GUI.java index 1395db6..7df73ea 100644 --- a/java/src/mimis/GUI.java +++ b/java/src/mimis/GUI.java @@ -11,7 +11,6 @@ import javax.swing.JToggleButton; import javax.swing.SwingConstants; import javax.swing.WindowConstants; -import mimis.exception.worker.DeactivateException; import mimis.util.Swing; import org.apache.commons.logging.Log; @@ -80,11 +79,7 @@ public class GUI extends JFrame { protected void processWindowEvent(WindowEvent event) { if (event.getID() == WindowEvent.WINDOW_CLOSING) { log.debug("Window closing"); - try { - mimis.stop(); - } catch (DeactivateException e) { - log.error(e); - } + mimis.stop(); } } diff --git a/java/src/mimis/Manager.java b/java/src/mimis/Manager.java index 305579e..9188c67 100644 --- a/java/src/mimis/Manager.java +++ b/java/src/mimis/Manager.java @@ -6,7 +6,6 @@ import java.util.Map; import javax.swing.JToggleButton; -import mimis.exception.worker.DeactivateException; import mimis.manager.Exitable; import mimis.manager.ManageButton; import mimis.manager.Titled; @@ -27,7 +26,7 @@ public class Manager extends Worker { createButtons(); } - public void stop() throws DeactivateException { + public void stop() { super.stop(); for (T manageable : manageableArray) { manageable.stop(); diff --git a/java/src/mimis/Worker.java b/java/src/mimis/Worker.java index c4e1516..5c83b6e 100644 --- a/java/src/mimis/Worker.java +++ b/java/src/mimis/Worker.java @@ -30,11 +30,13 @@ public abstract class Worker implements Runnable { start(THREAD); } - public void stop() throws DeactivateException { + public void stop() { if (active()) { - log.debug("stop deact"); - deactivate(); - log.debug("stop na deact"); + try { + deactivate(); + } catch (DeactivateException e) { + log.error(e); + } } run = false; synchronized (this) { diff --git a/java/src/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java b/java/src/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java index f1bc489..d9a58f1 100644 --- a/java/src/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java +++ b/java/src/mimis/application/cmd/windows/gomplayer/GomPlayerApplication.java @@ -24,7 +24,7 @@ public class GomPlayerApplication extends WindowsApplication { seekWorker = new SeekWorker(); } - public void stop() throws DeactivateException { + public void stop() { super.stop(); volumeWorker.stop(); seekWorker.stop(); diff --git a/java/src/mimis/application/cmd/windows/winamp/WinampApplication.java b/java/src/mimis/application/cmd/windows/winamp/WinampApplication.java index 0d19ace..81a5501 100644 --- a/java/src/mimis/application/cmd/windows/winamp/WinampApplication.java +++ b/java/src/mimis/application/cmd/windows/winamp/WinampApplication.java @@ -49,7 +49,7 @@ public class WinampApplication extends WindowsApplication { seekWorker = new SeekWorker(); } - public void stop() throws DeactivateException { + public void stop() { super.stop(); volumeWorker.stop(); seekWorker.stop(); diff --git a/java/src/mimis/application/itunes/iTunesApplication.java b/java/src/mimis/application/itunes/iTunesApplication.java index c4e6505..9bc04e3 100644 --- a/java/src/mimis/application/itunes/iTunesApplication.java +++ b/java/src/mimis/application/itunes/iTunesApplication.java @@ -84,7 +84,7 @@ public class iTunesApplication extends Application implements iTunesEventsInterf } } - public void stop() throws DeactivateException { + public void stop() { super.stop(); volumeWorker.stop(); } diff --git a/java/src/mimis/application/vlc/VLCApplication.java b/java/src/mimis/application/vlc/VLCApplication.java index 8798454..c30af3b 100644 --- a/java/src/mimis/application/vlc/VLCApplication.java +++ b/java/src/mimis/application/vlc/VLCApplication.java @@ -61,7 +61,7 @@ public class VLCApplication extends CMDApplication { } } - public void stop() throws DeactivateException { + public void stop() { super.stop(); volumeWorker.stop(); seekWorker.stop(); diff --git a/java/src/mimis/device/jintellitype/JIntellitypeDevice.java b/java/src/mimis/device/jintellitype/JIntellitypeDevice.java index afd52ff..b97e40b 100644 --- a/java/src/mimis/device/jintellitype/JIntellitypeDevice.java +++ b/java/src/mimis/device/jintellitype/JIntellitypeDevice.java @@ -62,7 +62,7 @@ public class JIntellitypeDevice extends Device implements HotkeyListener, Intell jit.removeIntellitypeListener(this); } - public void stop() throws DeactivateException { + public void stop() { super.stop(); jit.cleanUp(); } diff --git a/java/src/mimis/device/lirc/LircDevice.java b/java/src/mimis/device/lirc/LircDevice.java index 36dfdfd..af494a9 100644 --- a/java/src/mimis/device/lirc/LircDevice.java +++ b/java/src/mimis/device/lirc/LircDevice.java @@ -49,7 +49,6 @@ public class LircDevice extends Device implements LircButtonListener, SignalList } public boolean active() { - log.trace("LircDevice active?"); if (active && !lircService.active()) { try { deactivate(); @@ -95,7 +94,7 @@ public class LircDevice extends Device implements LircButtonListener, SignalList } } - public void stop() throws DeactivateException { + public void stop() { log.debug("Stop LircDevice"); super.stop(); lircService.stop(); diff --git a/java/src/mimis/device/lirc/LircService.java b/java/src/mimis/device/lirc/LircService.java index d732f30..a530c69 100644 --- a/java/src/mimis/device/lirc/LircService.java +++ b/java/src/mimis/device/lirc/LircService.java @@ -21,7 +21,7 @@ import mimis.exception.worker.DeactivateException; import mimis.util.Native; public class LircService extends Worker { - public static final String IP = "127.0.0.1"; + public static final String IP = "localhost"; public static final int PORT = 8765; protected ArrayList lircButtonListenerList; @@ -56,7 +56,7 @@ public class LircService extends Worker { } public void activate() throws ActivateException { - log.debug("Activate LircService"); + log.trace("Activate LircService"); try { socket = new Socket(ip, port); @@ -76,7 +76,6 @@ public class LircService extends Worker { } public boolean active() { - log.trace("LircService active?"); if (active && !socket.isConnected()) { active = false; } @@ -85,7 +84,7 @@ public class LircService extends Worker { } public void deactivate() throws DeactivateException { - log.debug("Deactivate LircService"); + log.trace("Deactivate LircService"); super.deactivate(); try { inputStream.close(); diff --git a/java/src/mimis/device/network/NetworkDevice.java b/java/src/mimis/device/network/NetworkDevice.java index a05c6a1..ce628d8 100644 --- a/java/src/mimis/device/network/NetworkDevice.java +++ b/java/src/mimis/device/network/NetworkDevice.java @@ -1,18 +1,24 @@ package mimis.device.network; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.OutputStream; import java.net.ServerSocket; import java.net.Socket; -import java.util.ArrayList; +import java.util.concurrent.ConcurrentLinkedQueue; import mimis.Device; import mimis.Event; import mimis.Worker; import mimis.event.Feedback; +import mimis.event.Task; +import mimis.event.feedback.TextFeedback; import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; +import mimis.value.Action; +import mimis.value.Target; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,11 +30,12 @@ public class NetworkDevice extends Device { protected Log log = LogFactory.getLog(NetworkDevice.class); protected int port; protected Server server; - protected ArrayList clientList; + protected ConcurrentLinkedQueue clientList; public NetworkDevice(int port) { super(TITLE); this.port = port; + clientList = new ConcurrentLinkedQueue(); } public NetworkDevice() { @@ -36,15 +43,25 @@ public class NetworkDevice extends Device { } public void activate() throws ActivateException { + log.trace("Activate NetworkDevice"); try { server = new Server(port); - server.start(); + server.activate(); } catch (IOException e) { throw new ActivateException(); } super.activate(); } + public boolean active() { + for (Client client : clientList) { + if (!client.active()) { + client.stop(); + } + } + return server == null ? active : (active = server.active()); + } + public void deactivate() throws DeactivateException { super.deactivate(); server.stop(); @@ -52,11 +69,7 @@ public class NetworkDevice extends Device { protected void feedback(Feedback feedback) { for (Client client : clientList) { - try { - client.send(feedback); - } catch (IOException e) { - e.printStackTrace(); - } + client.send(feedback); } } @@ -65,24 +78,35 @@ public class NetworkDevice extends Device { public Server(int port) throws IOException { serverSocket = new ServerSocket(port); - clientList = new ArrayList(); - log.trace("Server started"); + eventRouter.add(new TextFeedback("[NetworkDevice] Wating for clients")); + } + + public boolean active() { + return active = !serverSocket.isClosed(); } public void work() { - log.trace("Server is waiting for clients"); try { Socket socket = serverSocket.accept(); Client client = new Client(socket); - client.start(); - log.debug("Client connected"); + try { + client.activate(); + } catch (ActivateException e) { + log.error(e); + } + eventRouter.add(new TextFeedback("[NetworkDevice] Client connected: " + socket.getInetAddress())); } catch (IOException e) { log.error(e); } } - public void stop() throws DeactivateException { + public void stop() { super.stop(); + try { + serverSocket.close(); + } catch (IOException e) { + log.error(e); + } for (Client client : clientList) { client.stop(); } @@ -91,18 +115,26 @@ public class NetworkDevice extends Device { protected class Client extends Worker { protected Socket socket; - protected ObjectInputStream objectInputStream; + protected InputStream inputStream; + protected OutputStream outputStream; protected ObjectOutputStream objectOutputStream; public Client(Socket socket) throws IOException { this.socket = socket; - objectInputStream = new ObjectInputStream(socket.getInputStream()); - objectOutputStream = new ObjectOutputStream(socket.getOutputStream()); + inputStream = socket.getInputStream(); + outputStream = socket.getOutputStream(); + objectOutputStream = new ObjectOutputStream(outputStream); clientList.add(this); } + public boolean active() { + return active = socket.isConnected(); + } + public void work() { + ObjectInputStream objectInputStream; try { + objectInputStream = new ObjectInputStream(inputStream); Object object; do { object = objectInputStream.readObject(); @@ -112,26 +144,33 @@ public class NetworkDevice extends Device { } } while (object != null); } catch (IOException e) { - e.printStackTrace(); + log.error(e); + stop(); } catch (ClassNotFoundException e) { - e.printStackTrace(); + log.error(e); } } public void stop() { + super.stop(); + send(new Task(Target.SELF, Action.STOP)); + clientList.remove(this); try { - objectInputStream.close(); - objectOutputStream.close(); + inputStream.close(); + outputStream.close(); socket.close(); } catch (IOException e) { log.error(e); - } finally { - clientList.remove(this); } + eventRouter.add(new TextFeedback("[NetworkDevice] Client disconnected: " + socket.getInetAddress())); } - public void send(Object object) throws IOException { - objectOutputStream.writeObject(object); + public void send(Object object) { + try { + objectOutputStream.writeObject(object); + } catch (IOException e) { + log.error(e); + } } } } diff --git a/java/src/mimis/device/wiimote/WiimoteDevice.java b/java/src/mimis/device/wiimote/WiimoteDevice.java index 8f145c4..9ca2e5a 100644 --- a/java/src/mimis/device/wiimote/WiimoteDevice.java +++ b/java/src/mimis/device/wiimote/WiimoteDevice.java @@ -81,7 +81,7 @@ public class WiimoteDevice extends Device implements GestureListener { wiimoteDiscovery.disconnect(); } - public void stop() throws DeactivateException { + public void stop() { super.stop(); wiimoteService.exit(); } diff --git a/java/src/mimis/device/wiimote/WiimoteDiscovery.java b/java/src/mimis/device/wiimote/WiimoteDiscovery.java index addd59f..a945fc7 100644 --- a/java/src/mimis/device/wiimote/WiimoteDiscovery.java +++ b/java/src/mimis/device/wiimote/WiimoteDiscovery.java @@ -63,7 +63,7 @@ public class WiimoteDiscovery extends Worker { } } - public void stop() throws DeactivateException { + public void stop() { super.stop(); disconnect(); } diff --git a/java/src/mimis/event/EventListener.java b/java/src/mimis/event/EventListener.java index c7e98cc..5be1369 100644 --- a/java/src/mimis/event/EventListener.java +++ b/java/src/mimis/event/EventListener.java @@ -5,7 +5,6 @@ import java.util.concurrent.ConcurrentLinkedQueue; import mimis.Event; import mimis.Worker; -import mimis.exception.worker.DeactivateException; public abstract class EventListener extends Worker { protected Queue eventQueue; @@ -37,7 +36,7 @@ public abstract class EventListener extends Worker { event(eventQueue.poll()); } - public void stop() throws DeactivateException { + public void stop() { super.stop(); synchronized (work) { work.notifyAll(); diff --git a/java/src/mimis/event/EventRouter.java b/java/src/mimis/event/EventRouter.java index 57b4e02..ff6c705 100644 --- a/java/src/mimis/event/EventRouter.java +++ b/java/src/mimis/event/EventRouter.java @@ -15,7 +15,7 @@ public abstract class EventRouter extends EventListener { public EventRouter() { eventListenerList = new ArrayList(); } - + public void add(EventListener... eventListenerArray) { for (EventListener eventListener : eventListenerArray) { eventListenerList.add(eventListener); diff --git a/java/src/mimis/event/Feedback.java b/java/src/mimis/event/Feedback.java index 51be59e..33df727 100644 --- a/java/src/mimis/event/Feedback.java +++ b/java/src/mimis/event/Feedback.java @@ -4,6 +4,8 @@ import mimis.Event; import mimis.value.Target; public class Feedback extends Event { + protected static final long serialVersionUID = 1L; + public Feedback() { super(Target.ALL); } diff --git a/java/src/mimis/event/Task.java b/java/src/mimis/event/Task.java index 9a1261f..f784928 100644 --- a/java/src/mimis/event/Task.java +++ b/java/src/mimis/event/Task.java @@ -6,6 +6,8 @@ import mimis.value.Signal; import mimis.value.Target; public class Task extends Event { + protected static final long serialVersionUID = 1L; + public static final Target TARGET = Target.SELF; protected Action action; diff --git a/java/src/mimis/event/router/GlobalRouter.java b/java/src/mimis/event/router/GlobalRouter.java index a885de2..ed01848 100644 --- a/java/src/mimis/event/router/GlobalRouter.java +++ b/java/src/mimis/event/router/GlobalRouter.java @@ -32,13 +32,6 @@ public class GlobalRouter extends EventRouter { super.activate(); } - public boolean active() { - if (active && client.active()) { - active = false; - } - return active; - } - public void deactivate() throws DeactivateException { client.stop(); } @@ -78,10 +71,6 @@ public class GlobalRouter extends EventRouter { } } - public boolean active() { - return active = socket.isConnected(); - } - public void stop() { try { objectInputStream.close(); diff --git a/java/src/mimis/manager/Exitable.java b/java/src/mimis/manager/Exitable.java index 34a74e4..204dec9 100644 --- a/java/src/mimis/manager/Exitable.java +++ b/java/src/mimis/manager/Exitable.java @@ -1,7 +1,6 @@ package mimis.manager; -import mimis.exception.worker.DeactivateException; public interface Exitable { - public void stop() throws DeactivateException; + public void stop(); } diff --git a/java/src/org/wiigee/control/WiimoteDeviceDiscovery.java b/java/src/org/wiigee/control/WiimoteDeviceDiscovery.java index bdc611f..373c063 100644 --- a/java/src/org/wiigee/control/WiimoteDeviceDiscovery.java +++ b/java/src/org/wiigee/control/WiimoteDeviceDiscovery.java @@ -26,14 +26,8 @@ package org.wiigee.control; import java.io.IOException; import java.util.Vector; -import javax.bluetooth.DeviceClass; -import javax.bluetooth.DiscoveryListener; -import javax.bluetooth.RemoteDevice; -import javax.bluetooth.ServiceRecord; - -import org.wiigee.util.Log; - import org.wiigee.device.Wiimote; +import org.wiigee.util.Log; public class WiimoteDeviceDiscovery implements DiscoveryListener { diff --git a/java/src/org/wiigee/control/WiimoteWiigee.java b/java/src/org/wiigee/control/WiimoteWiigee.java index a157cf4..500e64c 100644 --- a/java/src/org/wiigee/control/WiimoteWiigee.java +++ b/java/src/org/wiigee/control/WiimoteWiigee.java @@ -26,14 +26,11 @@ package org.wiigee.control; import java.io.IOException; import java.util.Vector; -import javax.bluetooth.DiscoveryAgent; -import javax.bluetooth.LocalDevice; - -import org.wiigee.util.Log; import org.wiigee.device.Wiimote; import org.wiigee.event.AccelerationListener; import org.wiigee.event.GestureListener; import org.wiigee.filter.Filter; +import org.wiigee.util.Log; // Singleton public class WiimoteWiigee extends Wiigee { diff --git a/java/src/org/wiigee/device/Device.java b/java/src/org/wiigee/device/Device.java index 2952995..86bc2f0 100644 --- a/java/src/org/wiigee/device/Device.java +++ b/java/src/org/wiigee/device/Device.java @@ -26,9 +26,20 @@ package org.wiigee.device; import java.io.IOException; import java.util.Vector; -import org.wiigee.logic.*; -import org.wiigee.event.*; -import org.wiigee.filter.*; +import org.wiigee.event.AccelerationEvent; +import org.wiigee.event.AccelerationListener; +import org.wiigee.event.ButtonListener; +import org.wiigee.event.ButtonPressedEvent; +import org.wiigee.event.ButtonReleasedEvent; +import org.wiigee.event.GestureListener; +import org.wiigee.event.MotionStartEvent; +import org.wiigee.event.MotionStopEvent; +import org.wiigee.filter.DirectionalEquivalenceFilter; +import org.wiigee.filter.Filter; +import org.wiigee.filter.IdleStateFilter; +import org.wiigee.filter.MotionDetectFilter; +import org.wiigee.logic.ProcessingUnit; +import org.wiigee.logic.TriggeredProcessingUnit; /** * Abstract representation of a device with very basic functionalities. This diff --git a/java/src/org/wiigee/device/Wiimote.java b/java/src/org/wiigee/device/Wiimote.java index 7c17cd8..ed2290c 100644 --- a/java/src/org/wiigee/device/Wiimote.java +++ b/java/src/org/wiigee/device/Wiimote.java @@ -26,7 +26,12 @@ package org.wiigee.device; import java.io.IOException; import java.util.Random; import java.util.Vector; -import org.wiigee.event.*; + +import org.wiigee.event.InfraredEvent; +import org.wiigee.event.InfraredListener; +import org.wiigee.event.RotationEvent; +import org.wiigee.event.RotationListener; +import org.wiigee.event.RotationSpeedEvent; import org.wiigee.filter.Filter; import org.wiigee.util.Log; diff --git a/java/src/org/wiigee/event/AccelerationEvent.java b/java/src/org/wiigee/event/AccelerationEvent.java index 2f54741..ea7edb4 100644 --- a/java/src/org/wiigee/event/AccelerationEvent.java +++ b/java/src/org/wiigee/event/AccelerationEvent.java @@ -26,7 +26,7 @@ package org.wiigee.event; import java.util.EventObject; -import org.wiigee.device.*; +import org.wiigee.device.Device; /** * This Event would be generated if an acceleration has been detected. diff --git a/java/src/org/wiigee/event/ActionStopEvent.java b/java/src/org/wiigee/event/ActionStopEvent.java index c4379e2..cfa7077 100644 --- a/java/src/org/wiigee/event/ActionStopEvent.java +++ b/java/src/org/wiigee/event/ActionStopEvent.java @@ -25,6 +25,7 @@ package org.wiigee.event; import java.util.EventObject; + import org.wiigee.device.Device; /** diff --git a/java/src/org/wiigee/event/ButtonPressedEvent.java b/java/src/org/wiigee/event/ButtonPressedEvent.java index 6c34c36..0251dab 100644 --- a/java/src/org/wiigee/event/ButtonPressedEvent.java +++ b/java/src/org/wiigee/event/ButtonPressedEvent.java @@ -24,7 +24,7 @@ package org.wiigee.event; -import org.wiigee.device.*; +import org.wiigee.device.Device; /** * diff --git a/java/src/org/wiigee/event/ButtonReleasedEvent.java b/java/src/org/wiigee/event/ButtonReleasedEvent.java index 45de43b..9c3b776 100644 --- a/java/src/org/wiigee/event/ButtonReleasedEvent.java +++ b/java/src/org/wiigee/event/ButtonReleasedEvent.java @@ -24,7 +24,7 @@ package org.wiigee.event; -import org.wiigee.device.*; +import org.wiigee.device.Device; /** * diff --git a/java/src/org/wiigee/event/InfraredEvent.java b/java/src/org/wiigee/event/InfraredEvent.java index 4b6d87e..50d449e 100644 --- a/java/src/org/wiigee/event/InfraredEvent.java +++ b/java/src/org/wiigee/event/InfraredEvent.java @@ -25,6 +25,7 @@ package org.wiigee.event; import java.util.EventObject; + import org.wiigee.device.Device; /** diff --git a/java/src/org/wiigee/event/RotationEvent.java b/java/src/org/wiigee/event/RotationEvent.java index a603fa6..e41f8f0 100644 --- a/java/src/org/wiigee/event/RotationEvent.java +++ b/java/src/org/wiigee/event/RotationEvent.java @@ -25,6 +25,7 @@ package org.wiigee.event; import java.util.EventObject; + import org.wiigee.device.Device; /** diff --git a/java/src/org/wiigee/event/RotationSpeedEvent.java b/java/src/org/wiigee/event/RotationSpeedEvent.java index c25faaf..07fef23 100644 --- a/java/src/org/wiigee/event/RotationSpeedEvent.java +++ b/java/src/org/wiigee/event/RotationSpeedEvent.java @@ -25,6 +25,7 @@ package org.wiigee.event; import java.util.EventObject; + import org.wiigee.device.Device; /** diff --git a/java/src/org/wiigee/logic/Gesture.java b/java/src/org/wiigee/logic/Gesture.java index 2d1976a..a381fcf 100644 --- a/java/src/org/wiigee/logic/Gesture.java +++ b/java/src/org/wiigee/logic/Gesture.java @@ -25,6 +25,7 @@ package org.wiigee.logic; import java.util.Vector; + import org.wiigee.event.AccelerationEvent; /** diff --git a/java/src/org/wiigee/logic/GestureModel.java b/java/src/org/wiigee/logic/GestureModel.java index c550556..537f762 100644 --- a/java/src/org/wiigee/logic/GestureModel.java +++ b/java/src/org/wiigee/logic/GestureModel.java @@ -25,6 +25,7 @@ package org.wiigee.logic; import java.util.Vector; + import org.wiigee.event.AccelerationEvent; import org.wiigee.util.Log; diff --git a/java/src/org/wiigee/logic/HMM.java b/java/src/org/wiigee/logic/HMM.java index 746d6e9..9c80db4 100644 --- a/java/src/org/wiigee/logic/HMM.java +++ b/java/src/org/wiigee/logic/HMM.java @@ -25,6 +25,7 @@ package org.wiigee.logic; import java.text.DecimalFormat; import java.util.Vector; + import org.wiigee.util.Log; /** diff --git a/java/src/org/wiigee/logic/PreciseHMM.java b/java/src/org/wiigee/logic/PreciseHMM.java index 1155058..fbe2842 100644 --- a/java/src/org/wiigee/logic/PreciseHMM.java +++ b/java/src/org/wiigee/logic/PreciseHMM.java @@ -23,9 +23,9 @@ */ package org.wiigee.logic; -import java.text.*; +import java.text.DecimalFormat; import java.util.Vector; -import java.lang.Math; + import org.wiigee.util.Log; /** diff --git a/java/src/org/wiigee/logic/ProcessingUnit.java b/java/src/org/wiigee/logic/ProcessingUnit.java index 8a3adfa..ee6e461 100644 --- a/java/src/org/wiigee/logic/ProcessingUnit.java +++ b/java/src/org/wiigee/logic/ProcessingUnit.java @@ -3,10 +3,10 @@ package org.wiigee.logic; import java.util.Vector; import org.wiigee.event.AccelerationEvent; -import org.wiigee.event.ButtonPressedEvent; -import org.wiigee.event.ButtonReleasedEvent; import org.wiigee.event.AccelerationListener; import org.wiigee.event.ButtonListener; +import org.wiigee.event.ButtonPressedEvent; +import org.wiigee.event.ButtonReleasedEvent; import org.wiigee.event.GestureEvent; import org.wiigee.event.GestureListener; import org.wiigee.event.MotionStartEvent; diff --git a/java/src/org/wiigee/logic/Quantizer.java b/java/src/org/wiigee/logic/Quantizer.java index 791b28e..7225e1e 100644 --- a/java/src/org/wiigee/logic/Quantizer.java +++ b/java/src/org/wiigee/logic/Quantizer.java @@ -25,6 +25,7 @@ package org.wiigee.logic; import java.util.Vector; + import org.wiigee.event.AccelerationEvent; import org.wiigee.util.Log; diff --git a/java/src/org/wiigee/logic/TriggeredProcessingUnit.java b/java/src/org/wiigee/logic/TriggeredProcessingUnit.java index a620aea..d5f7bd1 100644 --- a/java/src/org/wiigee/logic/TriggeredProcessingUnit.java +++ b/java/src/org/wiigee/logic/TriggeredProcessingUnit.java @@ -25,7 +25,14 @@ package org.wiigee.logic; import java.util.Vector; -import org.wiigee.event.*; + +import org.wiigee.event.AccelerationEvent; +import org.wiigee.event.ActionStartEvent; +import org.wiigee.event.ActionStopEvent; +import org.wiigee.event.ButtonPressedEvent; +import org.wiigee.event.ButtonReleasedEvent; +import org.wiigee.event.MotionStartEvent; +import org.wiigee.event.MotionStopEvent; import org.wiigee.util.Log; /** diff --git a/java/src/org/wiigee/util/FileIO.java b/java/src/org/wiigee/util/FileIO.java index 82f6fc1..e03c321 100644 --- a/java/src/org/wiigee/util/FileIO.java +++ b/java/src/org/wiigee/util/FileIO.java @@ -29,6 +29,7 @@ import java.io.BufferedWriter; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; + import org.wiigee.logic.GestureModel; import org.wiigee.logic.HMM; import org.wiigee.logic.Quantizer; diff --git a/java/src/wiiusej/WiiUseApiManager.java b/java/src/wiiusej/WiiUseApiManager.java index f79d527..40894ac 100644 --- a/java/src/wiiusej/WiiUseApiManager.java +++ b/java/src/wiiusej/WiiUseApiManager.java @@ -21,8 +21,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.swing.event.EventListenerList; -import wiiusej.values.Calibration; -import wiiusej.values.RawAcceleration; import wiiusej.wiiusejevents.utils.EventsGatherer; import wiiusej.wiiusejevents.utils.WiiUseApiListener; import wiiusej.wiiusejevents.wiiuseapievents.WiiUseApiEvent; diff --git a/java/src/wiiusej/Wiimote.java b/java/src/wiiusej/Wiimote.java index fec8a1b..9709f00 100644 --- a/java/src/wiiusej/Wiimote.java +++ b/java/src/wiiusej/Wiimote.java @@ -18,7 +18,6 @@ package wiiusej; import javax.swing.event.EventListenerList; -import wiiusej.values.Calibration; import wiiusej.wiiusejevents.utils.WiiUseApiListener; import wiiusej.wiiusejevents.utils.WiimoteListener; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; diff --git a/java/src/wiiusej/test/CloseGuiTestCleanly.java b/java/src/wiiusej/test/CloseGuiTestCleanly.java index 584f2d9..a79edb7 100644 --- a/java/src/wiiusej/test/CloseGuiTestCleanly.java +++ b/java/src/wiiusej/test/CloseGuiTestCleanly.java @@ -18,6 +18,7 @@ package wiiusej.test; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; + import wiiusej.WiiUseApiManager; /** diff --git a/java/src/wiiusej/test/WiiuseJGuiTest.java b/java/src/wiiusej/test/WiiuseJGuiTest.java index 54dc777..acc4695 100644 --- a/java/src/wiiusej/test/WiiuseJGuiTest.java +++ b/java/src/wiiusej/test/WiiuseJGuiTest.java @@ -25,6 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.JFrame; + import wiiusej.WiiUseApiManager; import wiiusej.Wiimote; import wiiusej.utils.AccelerationPanel; diff --git a/java/src/wiiusej/utils/ClassicControllerButtonsEventPanel.java b/java/src/wiiusej/utils/ClassicControllerButtonsEventPanel.java index 9bec5a9..bc74ece 100644 --- a/java/src/wiiusej/utils/ClassicControllerButtonsEventPanel.java +++ b/java/src/wiiusej/utils/ClassicControllerButtonsEventPanel.java @@ -25,6 +25,7 @@ import java.awt.RenderingHints; import java.awt.Shape; import java.awt.Toolkit; import java.awt.geom.AffineTransform; + import wiiusej.wiiusejevents.physicalevents.ClassicControllerButtonsEvent; import wiiusej.wiiusejevents.physicalevents.ClassicControllerEvent; import wiiusej.wiiusejevents.physicalevents.ExpansionEvent; diff --git a/java/src/wiiusej/utils/JoystickEventPanel.java b/java/src/wiiusej/utils/JoystickEventPanel.java index 2883216..a654a9f 100644 --- a/java/src/wiiusej/utils/JoystickEventPanel.java +++ b/java/src/wiiusej/utils/JoystickEventPanel.java @@ -24,6 +24,7 @@ import java.awt.Image; import java.awt.RenderingHints; import java.awt.Shape; import java.awt.geom.AffineTransform; + import wiiusej.wiiusejevents.physicalevents.ExpansionEvent; import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.JoystickEvent;