From a12588c048b5e95098dc2eb681ce379461a7fa14 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Sun, 4 Mar 2012 17:30:44 +0000 Subject: [PATCH] Button object verplaatst naar mimis.input package. --- java/build.xml | 8 ++++---- java/src/mimis/device/javainput/DirectionButton.java | 2 +- java/src/mimis/device/javainput/JavaInputDevice.java | 2 +- .../mimis/device/javainput/extreme3d/Extreme3DButton.java | 2 +- .../mimis/device/javainput/extreme3d/Extreme3DDevice.java | 2 +- .../mimis/device/javainput/rumblepad/RumblepadButton.java | 2 +- .../mimis/device/javainput/rumblepad/RumblepadDevice.java | 2 +- java/src/mimis/device/jintellitype/CommandButton.java | 2 +- java/src/mimis/device/jintellitype/Hotkey.java | 3 +-- java/src/mimis/device/jintellitype/Modifier.java | 2 +- java/src/mimis/device/lirc/LircButton.java | 2 +- java/src/mimis/device/lirc/LircDevice.java | 2 +- java/src/mimis/device/lirc/button/ColorButton.java | 2 +- java/src/mimis/device/lirc/button/NumberButton.java | 2 +- java/src/mimis/device/lirc/remote/ColorButton.java | 2 +- java/src/mimis/device/panel/PanelButton.java | 2 +- java/src/mimis/device/wiimote/WiimoteButton.java | 2 +- java/src/mimis/device/wiimote/WiimoteDevice.java | 2 +- java/src/mimis/{ => input}/Button.java | 2 +- java/src/mimis/input/state/Hold.java | 2 +- java/src/mimis/input/state/Press.java | 2 +- java/src/mimis/input/state/Release.java | 2 +- java/src/mimis/input/state/State.java | 2 +- java/src/mimis/input/state/sequence/Macro.java | 2 +- java/src/mimis/state/TaskMap.java | 2 +- 25 files changed, 28 insertions(+), 29 deletions(-) rename java/src/mimis/{ => input}/Button.java (72%) diff --git a/java/build.xml b/java/build.xml index a901c7b..397c9e9 100644 --- a/java/build.xml +++ b/java/build.xml @@ -2,12 +2,12 @@ - + - + @@ -46,8 +46,8 @@ - - + + diff --git a/java/src/mimis/device/javainput/DirectionButton.java b/java/src/mimis/device/javainput/DirectionButton.java index 99c87c3..08de97a 100644 --- a/java/src/mimis/device/javainput/DirectionButton.java +++ b/java/src/mimis/device/javainput/DirectionButton.java @@ -1,6 +1,6 @@ package mimis.device.javainput; -import mimis.Button; +import mimis.input.Button; import mimis.exception.button.UnknownDirectionException; import de.hardcode.jxinput.event.JXInputDirectionalEvent; diff --git a/java/src/mimis/device/javainput/JavaInputDevice.java b/java/src/mimis/device/javainput/JavaInputDevice.java index d9f6049..61d9605 100644 --- a/java/src/mimis/device/javainput/JavaInputDevice.java +++ b/java/src/mimis/device/javainput/JavaInputDevice.java @@ -1,6 +1,5 @@ package mimis.device.javainput; -import mimis.Button; import mimis.device.Device; import mimis.exception.ButtonException; import mimis.exception.button.UnknownButtonException; @@ -8,6 +7,7 @@ import mimis.exception.button.UnknownDirectionException; import mimis.exception.device.DeviceNotFoundException; import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; +import mimis.input.Button; import mimis.input.state.Press; import mimis.input.state.Release; import mimis.worker.Component; diff --git a/java/src/mimis/device/javainput/extreme3d/Extreme3DButton.java b/java/src/mimis/device/javainput/extreme3d/Extreme3DButton.java index d1ee38a..88aaadf 100644 --- a/java/src/mimis/device/javainput/extreme3d/Extreme3DButton.java +++ b/java/src/mimis/device/javainput/extreme3d/Extreme3DButton.java @@ -1,7 +1,7 @@ package mimis.device.javainput.extreme3d; -import mimis.Button; import mimis.exception.button.UnknownButtonException; +import mimis.input.Button; import de.hardcode.jxinput.event.JXInputButtonEvent; public enum Extreme3DButton implements Button { diff --git a/java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java b/java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java index a5fe185..3d24840 100644 --- a/java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java +++ b/java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java @@ -1,11 +1,11 @@ package mimis.device.javainput.extreme3d; -import mimis.Button; import mimis.device.javainput.DirectionButton; import mimis.device.javainput.JavaInputDevice; import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownDirectionException; import mimis.exception.worker.ActivateException; +import mimis.input.Button; import mimis.value.Action; import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent; diff --git a/java/src/mimis/device/javainput/rumblepad/RumblepadButton.java b/java/src/mimis/device/javainput/rumblepad/RumblepadButton.java index 182d18d..f531762 100644 --- a/java/src/mimis/device/javainput/rumblepad/RumblepadButton.java +++ b/java/src/mimis/device/javainput/rumblepad/RumblepadButton.java @@ -1,7 +1,7 @@ package mimis.device.javainput.rumblepad; -import mimis.Button; import mimis.exception.button.UnknownButtonException; +import mimis.input.Button; import de.hardcode.jxinput.event.JXInputButtonEvent; public enum RumblepadButton implements Button { diff --git a/java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java b/java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java index 7286849..9465174 100644 --- a/java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java +++ b/java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java @@ -1,11 +1,11 @@ package mimis.device.javainput.rumblepad; -import mimis.Button; import mimis.device.javainput.DirectionButton; import mimis.device.javainput.JavaInputDevice; import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownDirectionException; import mimis.exception.worker.ActivateException; +import mimis.input.Button; import mimis.value.Action; import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent; diff --git a/java/src/mimis/device/jintellitype/CommandButton.java b/java/src/mimis/device/jintellitype/CommandButton.java index 2eadb6f..7888c7d 100644 --- a/java/src/mimis/device/jintellitype/CommandButton.java +++ b/java/src/mimis/device/jintellitype/CommandButton.java @@ -1,7 +1,7 @@ package mimis.device.jintellitype; -import mimis.Button; import mimis.exception.button.UnknownButtonException; +import mimis.input.Button; import com.melloware.jintellitype.JIntellitype; diff --git a/java/src/mimis/device/jintellitype/Hotkey.java b/java/src/mimis/device/jintellitype/Hotkey.java index 1f3d877..64174d4 100644 --- a/java/src/mimis/device/jintellitype/Hotkey.java +++ b/java/src/mimis/device/jintellitype/Hotkey.java @@ -2,12 +2,11 @@ package mimis.device.jintellitype; import java.util.ArrayList; -import mimis.Button; +import mimis.input.Button; import mimis.value.Key; import com.melloware.jintellitype.JIntellitype; - public class Hotkey implements Button { protected static final long serialVersionUID = 1L; diff --git a/java/src/mimis/device/jintellitype/Modifier.java b/java/src/mimis/device/jintellitype/Modifier.java index c4ef6d9..2f29ba8 100644 --- a/java/src/mimis/device/jintellitype/Modifier.java +++ b/java/src/mimis/device/jintellitype/Modifier.java @@ -1,6 +1,6 @@ package mimis.device.jintellitype; -import mimis.Button; +import mimis.input.Button; import com.melloware.jintellitype.JIntellitype; diff --git a/java/src/mimis/device/lirc/LircButton.java b/java/src/mimis/device/lirc/LircButton.java index d6695a1..4ea6d82 100644 --- a/java/src/mimis/device/lirc/LircButton.java +++ b/java/src/mimis/device/lirc/LircButton.java @@ -1,6 +1,6 @@ package mimis.device.lirc; -import mimis.Button; +import mimis.input.Button; public interface LircButton extends Button { public static final String NAME = null; diff --git a/java/src/mimis/device/lirc/LircDevice.java b/java/src/mimis/device/lirc/LircDevice.java index de72cd4..cc7a429 100644 --- a/java/src/mimis/device/lirc/LircDevice.java +++ b/java/src/mimis/device/lirc/LircDevice.java @@ -1,6 +1,5 @@ package mimis.device.lirc; -import mimis.Button; import mimis.application.cmd.CMDApplication; import mimis.device.Device; import mimis.device.lirc.button.ColorButton; @@ -10,6 +9,7 @@ import mimis.device.lirc.remote.PhiliphsRCLE011Button; import mimis.device.lirc.remote.SamsungBN5901015AButton; import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; +import mimis.input.Button; import mimis.input.state.Press; import mimis.input.state.Release; import mimis.util.Multiplexer; diff --git a/java/src/mimis/device/lirc/button/ColorButton.java b/java/src/mimis/device/lirc/button/ColorButton.java index fdddfef..5857ebc 100644 --- a/java/src/mimis/device/lirc/button/ColorButton.java +++ b/java/src/mimis/device/lirc/button/ColorButton.java @@ -1,6 +1,6 @@ package mimis.device.lirc.button; -import mimis.Button; +import mimis.input.Button; public enum ColorButton implements Button { RED, GREEN, YELLOW, BLUE; diff --git a/java/src/mimis/device/lirc/button/NumberButton.java b/java/src/mimis/device/lirc/button/NumberButton.java index 8de9cae..dabd14b 100644 --- a/java/src/mimis/device/lirc/button/NumberButton.java +++ b/java/src/mimis/device/lirc/button/NumberButton.java @@ -1,6 +1,6 @@ package mimis.device.lirc.button; -import mimis.Button; +import mimis.input.Button; public enum NumberButton implements Button { ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE; diff --git a/java/src/mimis/device/lirc/remote/ColorButton.java b/java/src/mimis/device/lirc/remote/ColorButton.java index 257bf75..72eedd9 100644 --- a/java/src/mimis/device/lirc/remote/ColorButton.java +++ b/java/src/mimis/device/lirc/remote/ColorButton.java @@ -1,6 +1,6 @@ package mimis.device.lirc.remote; -import mimis.Button; +import mimis.input.Button; public enum ColorButton implements Button { RED, GREEN, YELLOW, BLUE; diff --git a/java/src/mimis/device/panel/PanelButton.java b/java/src/mimis/device/panel/PanelButton.java index f0d2a04..0dd553b 100644 --- a/java/src/mimis/device/panel/PanelButton.java +++ b/java/src/mimis/device/panel/PanelButton.java @@ -1,6 +1,6 @@ package mimis.device.panel; -import mimis.Button; +import mimis.input.Button; public enum PanelButton implements Button { PREVIOUS, diff --git a/java/src/mimis/device/wiimote/WiimoteButton.java b/java/src/mimis/device/wiimote/WiimoteButton.java index 44fa14b..7df838e 100644 --- a/java/src/mimis/device/wiimote/WiimoteButton.java +++ b/java/src/mimis/device/wiimote/WiimoteButton.java @@ -1,7 +1,7 @@ package mimis.device.wiimote; -import mimis.Button; import mimis.exception.button.UnknownButtonException; +import mimis.input.Button; public enum WiimoteButton implements Button { TWO (0x0001), diff --git a/java/src/mimis/device/wiimote/WiimoteDevice.java b/java/src/mimis/device/wiimote/WiimoteDevice.java index 11ffdc5..a1aeb5f 100644 --- a/java/src/mimis/device/wiimote/WiimoteDevice.java +++ b/java/src/mimis/device/wiimote/WiimoteDevice.java @@ -1,12 +1,12 @@ package mimis.device.wiimote; -import mimis.Button; import mimis.device.Device; import mimis.device.wiimote.gesture.GestureDevice; import mimis.exception.button.UnknownButtonException; import mimis.exception.device.DeviceNotFoundException; import mimis.exception.worker.ActivateException; import mimis.exception.worker.DeactivateException; +import mimis.input.Button; import mimis.input.Feedback; import mimis.input.state.Press; import mimis.input.state.Release; diff --git a/java/src/mimis/Button.java b/java/src/mimis/input/Button.java similarity index 72% rename from java/src/mimis/Button.java rename to java/src/mimis/input/Button.java index bf20715..51258d2 100644 --- a/java/src/mimis/Button.java +++ b/java/src/mimis/input/Button.java @@ -1,4 +1,4 @@ -package mimis; +package mimis.input; import mimis.input.Input; diff --git a/java/src/mimis/input/state/Hold.java b/java/src/mimis/input/state/Hold.java index f342a0d..7fbd8be 100644 --- a/java/src/mimis/input/state/Hold.java +++ b/java/src/mimis/input/state/Hold.java @@ -1,6 +1,6 @@ package mimis.input.state; -import mimis.Button; +import mimis.input.Button; public class Hold extends State { protected static final long serialVersionUID = 1L; diff --git a/java/src/mimis/input/state/Press.java b/java/src/mimis/input/state/Press.java index 283fd8e..cfb1796 100644 --- a/java/src/mimis/input/state/Press.java +++ b/java/src/mimis/input/state/Press.java @@ -1,6 +1,6 @@ package mimis.input.state; -import mimis.Button; +import mimis.input.Button; public class Press extends State { protected static final long serialVersionUID = 1L; diff --git a/java/src/mimis/input/state/Release.java b/java/src/mimis/input/state/Release.java index 877154c..553abcf 100644 --- a/java/src/mimis/input/state/Release.java +++ b/java/src/mimis/input/state/Release.java @@ -1,6 +1,6 @@ package mimis.input.state; -import mimis.Button; +import mimis.input.Button; public class Release extends State { protected static final long serialVersionUID = 1L; diff --git a/java/src/mimis/input/state/State.java b/java/src/mimis/input/state/State.java index 728e9e4..54dd8b5 100644 --- a/java/src/mimis/input/state/State.java +++ b/java/src/mimis/input/state/State.java @@ -1,6 +1,6 @@ package mimis.input.state; -import mimis.Button; +import mimis.input.Button; import mimis.input.Input; import mimis.input.state.State; import mimis.worker.Component; diff --git a/java/src/mimis/input/state/sequence/Macro.java b/java/src/mimis/input/state/sequence/Macro.java index aeacb36..8239602 100644 --- a/java/src/mimis/input/state/sequence/Macro.java +++ b/java/src/mimis/input/state/sequence/Macro.java @@ -2,8 +2,8 @@ package mimis.input.state.sequence; import java.util.ArrayList; -import mimis.Button; import mimis.exception.macro.StateOrderException; +import mimis.input.Button; import mimis.input.state.Hold; import mimis.input.state.Press; import mimis.input.state.Release; diff --git a/java/src/mimis/state/TaskMap.java b/java/src/mimis/state/TaskMap.java index a3b4057..1babda2 100644 --- a/java/src/mimis/state/TaskMap.java +++ b/java/src/mimis/state/TaskMap.java @@ -2,7 +2,7 @@ package mimis.state; import java.util.HashMap; -import mimis.Button; +import mimis.input.Button; import mimis.input.Input; import mimis.input.Task; import mimis.input.state.Press;