From 36e067d5f637c992d944afdd07eb45ddf8b76b22 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Sat, 11 Jun 2011 23:34:01 +0000 Subject: [PATCH] --- java/src/mimis/Client.java | 25 ++++++++----------- java/src/mimis/GUI.java | 12 ++++++--- java/src/mimis/Manager.java | 9 ++++--- java/src/mimis/Mimis.java | 8 +++--- .../cmd/windows/WindowsApplication.java | 3 +-- java/src/mimis/device/EventMapCycle.java | 6 ++--- .../device/javainput/JavaInputDevice.java | 1 - .../device/javainput/JavaInputListener.java | 1 - .../javainput/extreme3d/Extreme3DDevice.java | 1 - .../javainput/rumblepad/RumblepadDevice.java | 1 - .../jintellitype/JIntellitypeDevice.java | 1 + java/src/mimis/device/lirc/LircDevice.java | 6 +++-- java/src/mimis/device/lirc/LircService.java | 3 +-- .../mimis/device/network/NetworkDevice.java | 2 ++ .../mimis/device/wiimote/WiimoteDevice.java | 1 + .../device/wiimote/WiimoteEventMapCycle.java | 2 +- .../mimis/device/wiimote/WiimoteService.java | 4 +-- .../device/wiimote/gesture/GestureDevice.java | 1 + java/src/mimis/event/router/LocalRouter.java | 2 +- java/src/mimis/sequence/SequenceParser.java | 6 ++--- 20 files changed, 49 insertions(+), 46 deletions(-) diff --git a/java/src/mimis/Client.java b/java/src/mimis/Client.java index 56b24c5..c416f4d 100644 --- a/java/src/mimis/Client.java +++ b/java/src/mimis/Client.java @@ -9,15 +9,15 @@ import mimis.device.panel.PanelDevice; import mimis.device.wiimote.WiimoteDevice; import mimis.event.EventRouter; import mimis.event.router.GlobalRouter; -import mimis.exception.event.router.GlobalRouterException; import mimis.exception.worker.ActivateException; +import mimis.exception.worker.DeactivateException; import mimis.util.swing.Dialog; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; public class Client { - protected static Log log = LogFactory.getLog(Client.class); + protected Log log = LogFactory.getLog(getClass()); public static final String IP = "127.0.0.1"; public static final int PORT = 6789; @@ -25,11 +25,7 @@ public class Client { protected EventRouter eventRouter; protected Device[] deviceArray; - public Client() throws GlobalRouterException { - this(IP, PORT); - } - - public Client(String ip, int port) throws GlobalRouterException { + public Client(String ip, int port) { eventRouter = new GlobalRouter(ip, port); deviceArray = new Device[] { new LircDevice(), @@ -49,15 +45,16 @@ public class Client { } catch (ActivateException e) { log.fatal(e); } - } - - public static void main(String[] args) { try { - String ip = Dialog.question("Server IP:", IP); - int port = Integer.valueOf(Dialog.question("Server Port:", PORT)); - new Client(ip, port).start(); - } catch (GlobalRouterException e) { + mimis.stop(); + } catch (DeactivateException e) { log.fatal(e); } } + + public static void main(String[] args) { + String ip = Dialog.question("Server IP:", IP); + int port = Integer.valueOf(Dialog.question("Server Port:", PORT)); + new Client(ip, port).start(); + } } diff --git a/java/src/mimis/GUI.java b/java/src/mimis/GUI.java index 2552fef..deee861 100644 --- a/java/src/mimis/GUI.java +++ b/java/src/mimis/GUI.java @@ -49,10 +49,14 @@ public class GUI extends JFrame { protected JPanel createControlPanel(Manager applicationManager, Manager deviceManager) { JPanel controlPanel = new JPanel(new GridLayout(1, 0)); - JPanel applicationPanel = createManagerPanel(applicationManager, APPLICATION_TITLE); - controlPanel.add(applicationPanel); - JPanel devicePanel = createManagerPanel(deviceManager, DEVICE_TITLE); - controlPanel.add(devicePanel); + if (applicationManager.count() > 0) { + JPanel applicationPanel = createManagerPanel(applicationManager, APPLICATION_TITLE); + controlPanel.add(applicationPanel); + } + if (applicationManager.count() > 0) { + JPanel devicePanel = createManagerPanel(deviceManager, DEVICE_TITLE); + controlPanel.add(devicePanel); + } return controlPanel; } diff --git a/java/src/mimis/Manager.java b/java/src/mimis/Manager.java index 672f633..305579e 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.application.cmd.windows.winamp.WinampApplication; import mimis.exception.worker.DeactivateException; import mimis.manager.Exitable; import mimis.manager.ManageButton; @@ -31,12 +30,14 @@ public class Manager extends Worker { public void stop() throws DeactivateException { super.stop(); for (T manageable : manageableArray) { - if (!(manageable instanceof WinampApplication)) { - manageable.stop(); - } + manageable.stop(); } } + public int count() { + return manageableArray.length; + } + protected void createButtons() { buttonMap = new HashMap>(); for (T manageable : manageableArray) { diff --git a/java/src/mimis/Mimis.java b/java/src/mimis/Mimis.java index 8bc9db7..9b04f04 100644 --- a/java/src/mimis/Mimis.java +++ b/java/src/mimis/Mimis.java @@ -3,9 +3,9 @@ package mimis; import mimis.event.EventHandler; import mimis.event.EventRouter; import mimis.event.Feedback; +import mimis.event.feedback.TextFeedback; import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; -import mimis.event.feedback.TextFeedback; import mimis.sequence.SequenceParser; import mimis.util.ArrayCycle; import mimis.value.Action; @@ -57,6 +57,9 @@ public class Mimis extends EventHandler { } public void activate() throws ActivateException { + log.debug("Create gui"); + gui = new GUI(this, applicationManager, deviceManager); + log.debug("Activate event router"); eventRouter.activate(); @@ -64,9 +67,6 @@ public class Mimis extends EventHandler { applicationManager.activate(); deviceManager.activate(); - log.debug("Create gui"); - gui = new GUI(this, applicationManager, deviceManager); - if (applicationCycle.size() > 0) { log.debug("Initialise application cycle"); eventRouter.set(applicationCycle.current()); diff --git a/java/src/mimis/application/cmd/windows/WindowsApplication.java b/java/src/mimis/application/cmd/windows/WindowsApplication.java index def0127..4ef4ba6 100644 --- a/java/src/mimis/application/cmd/windows/WindowsApplication.java +++ b/java/src/mimis/application/cmd/windows/WindowsApplication.java @@ -3,11 +3,10 @@ package mimis.application.cmd.windows; import java.io.IOException; import mimis.application.cmd.CMDApplication; - import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; -import mimis.util.Windows; import mimis.util.VBScript; +import mimis.util.Windows; import mimis.value.Command; import mimis.value.Key; import mimis.value.Type; diff --git a/java/src/mimis/device/EventMapCycle.java b/java/src/mimis/device/EventMapCycle.java index a7d2812..e17cccb 100644 --- a/java/src/mimis/device/EventMapCycle.java +++ b/java/src/mimis/device/EventMapCycle.java @@ -1,11 +1,11 @@ package mimis.device; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import mimis.sequence.EventMap; import mimis.util.ArrayCycle; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + public class EventMapCycle extends ArrayCycle { protected static final long serialVersionUID = 1L; diff --git a/java/src/mimis/device/javainput/JavaInputDevice.java b/java/src/mimis/device/javainput/JavaInputDevice.java index 949086a..8da248b 100644 --- a/java/src/mimis/device/javainput/JavaInputDevice.java +++ b/java/src/mimis/device/javainput/JavaInputDevice.java @@ -10,7 +10,6 @@ import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; import mimis.sequence.state.Press; import mimis.sequence.state.Release; - import de.hardcode.jxinput.JXInputDevice; import de.hardcode.jxinput.JXInputManager; import de.hardcode.jxinput.event.JXInputAxisEvent; diff --git a/java/src/mimis/device/javainput/JavaInputListener.java b/java/src/mimis/device/javainput/JavaInputListener.java index 92580f0..34c4b89 100644 --- a/java/src/mimis/device/javainput/JavaInputListener.java +++ b/java/src/mimis/device/javainput/JavaInputListener.java @@ -5,7 +5,6 @@ import java.util.Queue; import mimis.Worker; import mimis.exception.ButtonException; - import de.hardcode.jxinput.Button; import de.hardcode.jxinput.Directional; import de.hardcode.jxinput.JXInputDevice; diff --git a/java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java b/java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java index 37ef2df..3a3407d 100644 --- a/java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java +++ b/java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java @@ -6,7 +6,6 @@ import mimis.device.javainput.JavaInputDevice; import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownDirectionException; import mimis.exception.worker.ActivateException; - import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent; diff --git a/java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java b/java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java index 64ebc8a..0e8390c 100644 --- a/java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java +++ b/java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java @@ -6,7 +6,6 @@ import mimis.device.javainput.JavaInputDevice; import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownDirectionException; import mimis.exception.worker.ActivateException; - import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent; diff --git a/java/src/mimis/device/jintellitype/JIntellitypeDevice.java b/java/src/mimis/device/jintellitype/JIntellitypeDevice.java index 855c4bb..afd52ff 100644 --- a/java/src/mimis/device/jintellitype/JIntellitypeDevice.java +++ b/java/src/mimis/device/jintellitype/JIntellitypeDevice.java @@ -8,6 +8,7 @@ import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; import mimis.sequence.state.Press; import mimis.sequence.state.Release; + import com.melloware.jintellitype.HotkeyListener; import com.melloware.jintellitype.IntellitypeListener; import com.melloware.jintellitype.JIntellitype; diff --git a/java/src/mimis/device/lirc/LircDevice.java b/java/src/mimis/device/lirc/LircDevice.java index 3149367..2861ee9 100644 --- a/java/src/mimis/device/lirc/LircDevice.java +++ b/java/src/mimis/device/lirc/LircDevice.java @@ -12,8 +12,8 @@ import mimis.exception.worker.DeactivateException; import mimis.sequence.state.Press; import mimis.sequence.state.Release; import mimis.util.Multiplexer; -import mimis.util.multiplexer.SignalListener; import mimis.util.VBScript; +import mimis.util.multiplexer.SignalListener; import mimis.value.Signal; public class LircDevice extends Device implements LircButtonListener, SignalListener { @@ -50,6 +50,7 @@ public class LircDevice extends Device implements LircButtonListener, SignalList } public boolean active() { + log.trace("LircDevice active?"); if (active && !lircService.active()) { active = false; } else if (!active) { @@ -69,8 +70,9 @@ public class LircDevice extends Device implements LircButtonListener, SignalList } public void deactivate() throws DeactivateException { + log.debug("Deactivate LircDevice"); super.deactivate(); - multiplexer.deactivate(); + multiplexer.stop(); lircService.deactivate(); } diff --git a/java/src/mimis/device/lirc/LircService.java b/java/src/mimis/device/lirc/LircService.java index a5ef6ed..8ad9db0 100644 --- a/java/src/mimis/device/lirc/LircService.java +++ b/java/src/mimis/device/lirc/LircService.java @@ -82,6 +82,7 @@ public class LircService extends Worker { } public void deactivate() throws DeactivateException { + super.deactivate(); try { bufferedReader.close(); inputStream.close(); @@ -89,8 +90,6 @@ public class LircService extends Worker { socket.close(); } catch (IOException e) { log.error(e); - } finally { - super.deactivate(); } } diff --git a/java/src/mimis/device/network/NetworkDevice.java b/java/src/mimis/device/network/NetworkDevice.java index 5a4a999..a05c6a1 100644 --- a/java/src/mimis/device/network/NetworkDevice.java +++ b/java/src/mimis/device/network/NetworkDevice.java @@ -42,9 +42,11 @@ public class NetworkDevice extends Device { } catch (IOException e) { throw new ActivateException(); } + super.activate(); } public void deactivate() throws DeactivateException { + super.deactivate(); server.stop(); } diff --git a/java/src/mimis/device/wiimote/WiimoteDevice.java b/java/src/mimis/device/wiimote/WiimoteDevice.java index c12d6ca..8f145c4 100644 --- a/java/src/mimis/device/wiimote/WiimoteDevice.java +++ b/java/src/mimis/device/wiimote/WiimoteDevice.java @@ -11,6 +11,7 @@ import mimis.exception.worker.DeactivateException; import mimis.sequence.state.Press; import mimis.sequence.state.Release; import mimis.value.Action; + import org.wiigee.event.GestureEvent; import org.wiigee.event.GestureListener; import org.wiigee.util.Log; diff --git a/java/src/mimis/device/wiimote/WiimoteEventMapCycle.java b/java/src/mimis/device/wiimote/WiimoteEventMapCycle.java index 73c1b9d..22b77f7 100644 --- a/java/src/mimis/device/wiimote/WiimoteEventMapCycle.java +++ b/java/src/mimis/device/wiimote/WiimoteEventMapCycle.java @@ -3,9 +3,9 @@ package mimis.device.wiimote; import mimis.device.EventMapCycle; import mimis.event.Task; import mimis.sequence.EventMap; +import mimis.sequence.state.Release; import mimis.value.Action; import mimis.value.Target; -import mimis.sequence.state.Release; public class WiimoteEventMapCycle extends EventMapCycle { protected static final long serialVersionUID = 1L; diff --git a/java/src/mimis/device/wiimote/WiimoteService.java b/java/src/mimis/device/wiimote/WiimoteService.java index e00417b..9288b7e 100644 --- a/java/src/mimis/device/wiimote/WiimoteService.java +++ b/java/src/mimis/device/wiimote/WiimoteService.java @@ -3,11 +3,11 @@ package mimis.device.wiimote; import java.util.ArrayList; import java.util.HashMap; +import mimis.exception.device.DeviceNotFoundException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import mimis.exception.device.DeviceNotFoundException; - import wiiusej.WiiUseApiManager; import wiiusej.Wiimote; import wiiusej.wiiusejevents.GenericEvent; diff --git a/java/src/mimis/device/wiimote/gesture/GestureDevice.java b/java/src/mimis/device/wiimote/gesture/GestureDevice.java index 4e2127a..96ad5a0 100644 --- a/java/src/mimis/device/wiimote/gesture/GestureDevice.java +++ b/java/src/mimis/device/wiimote/gesture/GestureDevice.java @@ -8,6 +8,7 @@ import org.wiigee.device.Device; import org.wiigee.event.ButtonListener; import org.wiigee.event.ButtonPressedEvent; import org.wiigee.event.GestureListener; + import wiiusej.values.GForce; public class GestureDevice extends Device /*implements AccelerationListener */{ diff --git a/java/src/mimis/event/router/LocalRouter.java b/java/src/mimis/event/router/LocalRouter.java index 72b8d12..b7bf438 100644 --- a/java/src/mimis/event/router/LocalRouter.java +++ b/java/src/mimis/event/router/LocalRouter.java @@ -1,9 +1,9 @@ package mimis.event.router; import mimis.Event; -import mimis.event.Task; import mimis.event.EventListener; import mimis.event.EventRouter; +import mimis.event.Task; import mimis.event.feedback.TextFeedback; import mimis.value.Target; diff --git a/java/src/mimis/sequence/SequenceParser.java b/java/src/mimis/sequence/SequenceParser.java index d3f26c7..35576f2 100644 --- a/java/src/mimis/sequence/SequenceParser.java +++ b/java/src/mimis/sequence/SequenceParser.java @@ -3,9 +3,6 @@ package mimis.sequence; import java.util.ArrayList; import java.util.Map.Entry; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import mimis.Event; import mimis.event.EventHandler; import mimis.event.EventListener; @@ -13,6 +10,9 @@ import mimis.event.Task; import mimis.value.Signal; import mimis.value.Target; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + public class SequenceParser { protected Log log = LogFactory.getLog(getClass());