rik/mimis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Button object verplaatst naar mimis.input package.

Browse Source
This commit is contained in:
Rik Veenboer
2012-03-04 17:30:44 +00:00
parent 56967b97a7
commit a12588c048
25 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/mimis/device/javainput/DirectionButton.java
View File

@@ -1,6 +1,6 @@
package mimis.device.javainput; package mimis.device.javainput;
import mimis.Button; import mimis.input.Button;
import mimis.exception.button.UnknownDirectionException; import mimis.exception.button.UnknownDirectionException;
import de.hardcode.jxinput.event.JXInputDirectionalEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent;

2
java/src/mimis/device/javainput/JavaInputDevice.java
View File

@@ -1,6 +1,5 @@
package mimis.device.javainput; package mimis.device.javainput;
import mimis.Button;
import mimis.device.Device; import mimis.device.Device;
import mimis.exception.ButtonException; import mimis.exception.ButtonException;
import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownButtonException;
@@ -8,6 +7,7 @@ import mimis.exception.button.UnknownDirectionException;
import mimis.exception.device.DeviceNotFoundException; import mimis.exception.device.DeviceNotFoundException;
import mimis.exception.worker.ActivateException; import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException; import mimis.exception.worker.DeactivateException;
import mimis.input.Button;
import mimis.input.state.Press; import mimis.input.state.Press;
import mimis.input.state.Release; import mimis.input.state.Release;
import mimis.worker.Component; import mimis.worker.Component;

2
java/src/mimis/device/javainput/extreme3d/Extreme3DButton.java
View File

@@ -1,7 +1,7 @@
package mimis.device.javainput.extreme3d; package mimis.device.javainput.extreme3d;
import mimis.Button;
import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownButtonException;
import mimis.input.Button;
import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputButtonEvent;
public enum Extreme3DButton implements Button { public enum Extreme3DButton implements Button {

2
java/src/mimis/device/javainput/extreme3d/Extreme3DDevice.java
View File

@@ -1,11 +1,11 @@
package mimis.device.javainput.extreme3d; package mimis.device.javainput.extreme3d;
import mimis.Button;
import mimis.device.javainput.DirectionButton; import mimis.device.javainput.DirectionButton;
import mimis.device.javainput.JavaInputDevice; import mimis.device.javainput.JavaInputDevice;
import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownButtonException;
import mimis.exception.button.UnknownDirectionException; import mimis.exception.button.UnknownDirectionException;
import mimis.exception.worker.ActivateException; import mimis.exception.worker.ActivateException;
import mimis.input.Button;
import mimis.value.Action; import mimis.value.Action;
import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputButtonEvent;
import de.hardcode.jxinput.event.JXInputDirectionalEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent;

2
java/src/mimis/device/javainput/rumblepad/RumblepadButton.java
View File

@@ -1,7 +1,7 @@
package mimis.device.javainput.rumblepad; package mimis.device.javainput.rumblepad;
import mimis.Button;
import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownButtonException;
import mimis.input.Button;
import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputButtonEvent;
public enum RumblepadButton implements Button { public enum RumblepadButton implements Button {

2
java/src/mimis/device/javainput/rumblepad/RumblepadDevice.java
View File

@@ -1,11 +1,11 @@
package mimis.device.javainput.rumblepad; package mimis.device.javainput.rumblepad;
import mimis.Button;
import mimis.device.javainput.DirectionButton; import mimis.device.javainput.DirectionButton;
import mimis.device.javainput.JavaInputDevice; import mimis.device.javainput.JavaInputDevice;
import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownButtonException;
import mimis.exception.button.UnknownDirectionException; import mimis.exception.button.UnknownDirectionException;
import mimis.exception.worker.ActivateException; import mimis.exception.worker.ActivateException;
import mimis.input.Button;
import mimis.value.Action; import mimis.value.Action;
import de.hardcode.jxinput.event.JXInputButtonEvent; import de.hardcode.jxinput.event.JXInputButtonEvent;
import de.hardcode.jxinput.event.JXInputDirectionalEvent; import de.hardcode.jxinput.event.JXInputDirectionalEvent;

2
java/src/mimis/device/jintellitype/CommandButton.java
View File

@@ -1,7 +1,7 @@
package mimis.device.jintellitype; package mimis.device.jintellitype;
import mimis.Button;
import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownButtonException;
import mimis.input.Button;
import com.melloware.jintellitype.JIntellitype; import com.melloware.jintellitype.JIntellitype;

3
java/src/mimis/device/jintellitype/Hotkey.java
View File

@@ -2,12 +2,11 @@ package mimis.device.jintellitype;
import java.util.ArrayList; import java.util.ArrayList;
import mimis.Button; import mimis.input.Button;
import mimis.value.Key; import mimis.value.Key;
import com.melloware.jintellitype.JIntellitype; import com.melloware.jintellitype.JIntellitype;
public class Hotkey implements Button { public class Hotkey implements Button {
protected static final long serialVersionUID = 1L; protected static final long serialVersionUID = 1L;

2
java/src/mimis/device/jintellitype/Modifier.java
View File

@@ -1,6 +1,6 @@
package mimis.device.jintellitype; package mimis.device.jintellitype;
import mimis.Button; import mimis.input.Button;
import com.melloware.jintellitype.JIntellitype; import com.melloware.jintellitype.JIntellitype;

2
java/src/mimis/device/lirc/LircButton.java
View File

@@ -1,6 +1,6 @@
package mimis.device.lirc; package mimis.device.lirc;
import mimis.Button; import mimis.input.Button;
public interface LircButton extends Button { public interface LircButton extends Button {
public static final String NAME = null; public static final String NAME = null;

2
java/src/mimis/device/lirc/LircDevice.java
View File

@@ -1,6 +1,5 @@
package mimis.device.lirc; package mimis.device.lirc;
import mimis.Button;
import mimis.application.cmd.CMDApplication; import mimis.application.cmd.CMDApplication;
import mimis.device.Device; import mimis.device.Device;
import mimis.device.lirc.button.ColorButton; import mimis.device.lirc.button.ColorButton;
@@ -10,6 +9,7 @@ import mimis.device.lirc.remote.PhiliphsRCLE011Button;
import mimis.device.lirc.remote.SamsungBN5901015AButton; import mimis.device.lirc.remote.SamsungBN5901015AButton;
import mimis.exception.worker.ActivateException; import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException; import mimis.exception.worker.DeactivateException;
import mimis.input.Button;
import mimis.input.state.Press; import mimis.input.state.Press;
import mimis.input.state.Release; import mimis.input.state.Release;
import mimis.util.Multiplexer; import mimis.util.Multiplexer;

2
java/src/mimis/device/lirc/button/ColorButton.java
View File

@@ -1,6 +1,6 @@
package mimis.device.lirc.button; package mimis.device.lirc.button;
import mimis.Button; import mimis.input.Button;
public enum ColorButton implements Button { public enum ColorButton implements Button {
RED, GREEN, YELLOW, BLUE; RED, GREEN, YELLOW, BLUE;

2
java/src/mimis/device/lirc/button/NumberButton.java
View File

@@ -1,6 +1,6 @@
package mimis.device.lirc.button; package mimis.device.lirc.button;
import mimis.Button; import mimis.input.Button;
public enum NumberButton implements Button { public enum NumberButton implements Button {
ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE; ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE;

2
java/src/mimis/device/lirc/remote/ColorButton.java
View File

@@ -1,6 +1,6 @@
package mimis.device.lirc.remote; package mimis.device.lirc.remote;
import mimis.Button; import mimis.input.Button;
public enum ColorButton implements Button { public enum ColorButton implements Button {
RED, GREEN, YELLOW, BLUE; RED, GREEN, YELLOW, BLUE;

2
java/src/mimis/device/panel/PanelButton.java
View File

@@ -1,6 +1,6 @@
package mimis.device.panel; package mimis.device.panel;
import mimis.Button; import mimis.input.Button;
public enum PanelButton implements Button { public enum PanelButton implements Button {
PREVIOUS, PREVIOUS,

2
java/src/mimis/device/wiimote/WiimoteButton.java
View File

@@ -1,7 +1,7 @@
package mimis.device.wiimote; package mimis.device.wiimote;
import mimis.Button;
import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownButtonException;
import mimis.input.Button;
public enum WiimoteButton implements Button { public enum WiimoteButton implements Button {
TWO (0x0001), TWO (0x0001),

2
java/src/mimis/device/wiimote/WiimoteDevice.java
View File

@@ -1,12 +1,12 @@
package mimis.device.wiimote; package mimis.device.wiimote;
import mimis.Button;
import mimis.device.Device; import mimis.device.Device;
import mimis.device.wiimote.gesture.GestureDevice; import mimis.device.wiimote.gesture.GestureDevice;
import mimis.exception.button.UnknownButtonException; import mimis.exception.button.UnknownButtonException;
import mimis.exception.device.DeviceNotFoundException; import mimis.exception.device.DeviceNotFoundException;
import mimis.exception.worker.ActivateException; import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException; import mimis.exception.worker.DeactivateException;
import mimis.input.Button;
import mimis.input.Feedback; import mimis.input.Feedback;
import mimis.input.state.Press; import mimis.input.state.Press;
import mimis.input.state.Release; import mimis.input.state.Release;

2
java/src/mimis/Button.java → java/src/mimis/input/Button.java
View File

@@ -1,4 +1,4 @@
package mimis; package mimis.input;
import mimis.input.Input; import mimis.input.Input;

2
java/src/mimis/input/state/Hold.java
View File

@@ -1,6 +1,6 @@
package mimis.input.state; package mimis.input.state;
import mimis.Button; import mimis.input.Button;
public class Hold extends State { public class Hold extends State {
protected static final long serialVersionUID = 1L; protected static final long serialVersionUID = 1L;

2
java/src/mimis/input/state/Press.java
View File

@@ -1,6 +1,6 @@
package mimis.input.state; package mimis.input.state;
import mimis.Button; import mimis.input.Button;
public class Press extends State { public class Press extends State {
protected static final long serialVersionUID = 1L; protected static final long serialVersionUID = 1L;

2
java/src/mimis/input/state/Release.java
View File

@@ -1,6 +1,6 @@
package mimis.input.state; package mimis.input.state;
import mimis.Button; import mimis.input.Button;
public class Release extends State { public class Release extends State {
protected static final long serialVersionUID = 1L; protected static final long serialVersionUID = 1L;

2
java/src/mimis/input/state/State.java
View File

@@ -1,6 +1,6 @@
package mimis.input.state; package mimis.input.state;
import mimis.Button; import mimis.input.Button;
import mimis.input.Input; import mimis.input.Input;
import mimis.input.state.State; import mimis.input.state.State;
import mimis.worker.Component; import mimis.worker.Component;

2
java/src/mimis/input/state/sequence/Macro.java
View File

@@ -2,8 +2,8 @@ package mimis.input.state.sequence;
import java.util.ArrayList; import java.util.ArrayList;
import mimis.Button;
import mimis.exception.macro.StateOrderException; import mimis.exception.macro.StateOrderException;
import mimis.input.Button;
import mimis.input.state.Hold; import mimis.input.state.Hold;
import mimis.input.state.Press; import mimis.input.state.Press;
import mimis.input.state.Release; import mimis.input.state.Release;

2
java/src/mimis/state/TaskMap.java
View File

@@ -2,7 +2,7 @@ package mimis.state;
import java.util.HashMap; import java.util.HashMap;
import mimis.Button; import mimis.input.Button;
import mimis.input.Input; import mimis.input.Input;
import mimis.input.Task; import mimis.input.Task;
import mimis.input.state.Press; import mimis.input.state.Press;