From 936a0ed2705154229ed1ddb798e6d18fa02add4c Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Fri, 11 Feb 2011 19:41:49 +0000 Subject: [PATCH] Classes die op de verkeerde plek stonden verplaatst. Vergeten aanpassingen in WiimoteDevice doorgevoerd. --- java/src/pm/Application.java | 2 +- java/src/pm/Main.java | 4 ++-- java/src/pm/{listener => action}/ActionListener.java | 2 +- java/src/pm/{listener => action}/ActionProvider.java | 2 +- java/src/pm/device/Device.java | 4 ++-- java/src/pm/device/wiimote/WiimoteDevice.java | 10 +++------- java/src/pm/device/wiimote/WiimoteService.java | 7 +++---- java/src/pm/{listener => macro}/MacroListener.java | 5 ++--- 8 files changed, 15 insertions(+), 21 deletions(-) rename java/src/pm/{listener => action}/ActionListener.java (93%) rename java/src/pm/{listener => action}/ActionProvider.java (89%) rename java/src/pm/{listener => macro}/MacroListener.java (91%) diff --git a/java/src/pm/Application.java b/java/src/pm/Application.java index dfcf0ce..d938f13 100644 --- a/java/src/pm/Application.java +++ b/java/src/pm/Application.java @@ -1,8 +1,8 @@ package pm; +import pm.action.ActionListener; import pm.exception.application.ApplicationExitException; import pm.exception.application.ApplicationInitialiseException; -import pm.listener.ActionListener; public abstract class Application extends ActionListener { public void run() { diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java index 0ed9c4e..5c6211e 100644 --- a/java/src/pm/Main.java +++ b/java/src/pm/Main.java @@ -2,6 +2,8 @@ package pm; import java.util.ArrayList; +import pm.action.ActionListener; +import pm.action.ActionProvider; import pm.application.Winamp.WinampApplication; import pm.application.iTunes.iTunesApplication; import pm.device.Device; @@ -11,8 +13,6 @@ import pm.exception.action.TargetNotSetException; import pm.exception.application.ApplicationExitException; import pm.exception.device.DeviceExitException; import pm.exception.device.DeviceInitialiseException; -import pm.listener.ActionListener; -import pm.listener.ActionProvider; import pm.util.ArrayCycle; public class Main extends ActionListener { diff --git a/java/src/pm/listener/ActionListener.java b/java/src/pm/action/ActionListener.java similarity index 93% rename from java/src/pm/listener/ActionListener.java rename to java/src/pm/action/ActionListener.java index ef83eb5..be8a902 100644 --- a/java/src/pm/listener/ActionListener.java +++ b/java/src/pm/action/ActionListener.java @@ -1,4 +1,4 @@ -package pm.listener; +package pm.action; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/java/src/pm/listener/ActionProvider.java b/java/src/pm/action/ActionProvider.java similarity index 89% rename from java/src/pm/listener/ActionProvider.java rename to java/src/pm/action/ActionProvider.java index ad22e6d..0374a2c 100644 --- a/java/src/pm/listener/ActionProvider.java +++ b/java/src/pm/action/ActionProvider.java @@ -1,4 +1,4 @@ -package pm.listener; +package pm.action; import java.util.Queue; diff --git a/java/src/pm/device/Device.java b/java/src/pm/device/Device.java index 9f24f24..84d2048 100644 --- a/java/src/pm/device/Device.java +++ b/java/src/pm/device/Device.java @@ -2,12 +2,12 @@ package pm.device; import pm.Action; import pm.Macro; +import pm.action.ActionProvider; import pm.exception.MacroException; import pm.exception.device.DeviceExitException; import pm.exception.device.DeviceInitialiseException; -import pm.listener.ActionProvider; -import pm.listener.MacroListener; import pm.macro.Event; +import pm.macro.MacroListener; public abstract class Device { protected MacroListener macroListener; diff --git a/java/src/pm/device/wiimote/WiimoteDevice.java b/java/src/pm/device/wiimote/WiimoteDevice.java index 5bdd08f..7c20d85 100644 --- a/java/src/pm/device/wiimote/WiimoteDevice.java +++ b/java/src/pm/device/wiimote/WiimoteDevice.java @@ -3,8 +3,8 @@ package pm.device.wiimote; import pm.Action; import pm.Target; import pm.device.Device; -import pm.exception.DeviceException; import pm.exception.MacroException; +import pm.exception.device.DeviceInitialiseException; import pm.macro.event.Press; import wiiusej.Wiimote; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; @@ -16,16 +16,12 @@ public class WiimoteDevice extends Device { protected Wiimote wiimote; - { + public WiimoteDevice() { WiimoteDevice.wiimoteService = new WiimoteService(); } - public WiimoteDevice() throws DeviceException { + public void initialise() throws DeviceInitialiseException { wiimote = wiimoteService.getDevice(this); - } - - public void initialise() { - super.initialise(); try { add( new Press(WiimoteButton.A), diff --git a/java/src/pm/device/wiimote/WiimoteService.java b/java/src/pm/device/wiimote/WiimoteService.java index 4ac0dc5..e519b38 100644 --- a/java/src/pm/device/wiimote/WiimoteService.java +++ b/java/src/pm/device/wiimote/WiimoteService.java @@ -3,8 +3,7 @@ package pm.device.wiimote; import java.util.ArrayList; import java.util.HashMap; -import pm.exception.DeviceException; -import pm.exception.device.javainput.JavaInputDeviceSpecificException; +import pm.exception.device.DeviceNotFoundException; import wiiusej.WiiUseApiManager; import wiiusej.Wiimote; import wiiusej.wiiusejevents.GenericEvent; @@ -43,7 +42,7 @@ public class WiimoteService extends WiiUseApiManager implements WiimoteListener definitiveShutdown(); } - public Wiimote getDevice(WiimoteDevice wiimoteDevice) throws DeviceException { + public Wiimote getDevice(WiimoteDevice wiimoteDevice) throws DeviceNotFoundException { Wiimote[] wiimoteArray = getWiimotes(1, false); for (Wiimote wiimote : wiimoteArray) { int id = wiimote.getId(); @@ -54,7 +53,7 @@ public class WiimoteService extends WiiUseApiManager implements WiimoteListener return wiimote; } } - throw new JavaInputDeviceSpecificException(); + throw new DeviceNotFoundException(); } public Wiimote getWiimote(GenericEvent event) { diff --git a/java/src/pm/listener/MacroListener.java b/java/src/pm/macro/MacroListener.java similarity index 91% rename from java/src/pm/listener/MacroListener.java rename to java/src/pm/macro/MacroListener.java index 02bf7cf..0d72cda 100644 --- a/java/src/pm/listener/MacroListener.java +++ b/java/src/pm/macro/MacroListener.java @@ -1,13 +1,12 @@ -package pm.listener; +package pm.macro; import java.util.ArrayList; import java.util.HashMap; import pm.Action; import pm.Macro; +import pm.action.ActionProvider; import pm.exception.MacroException; -import pm.macro.Active; -import pm.macro.Event; public class MacroListener { public ArrayList macroList;