Button object verplaatst naar mimis.input package.

java/build.xml

@@ -2,12 +2,12 @@
 <project default="jar" name="Build file for Project Mimis">
 	<!-- Javadoc -->
 	<target name="javadoc">
-		<javadoc access="private" author="true" classpath="cfg;resource;lib/log4j-1.2.16.jar;lib/jxinput.jar;lib/commons-logging-1.1.1.jar;lib/jacob-1.15-M3.jar" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="mimis.exception.macro,mimis.device.network,wiiusej,mimis.application.itunes,mimis.exception.util,mimis.device.javainput,wiiusej.wiiusejevents,wiiusej.wiiusejevents.utils,mimis.util.swing,mimis.exception.worker,mimis.application.lirc,mimis.application.cmd.windows.winamp,wiiusej.values,mimis.exception.event,mimis.device.lirc.remote,mimis.device.panel,mimis.exception.device,mimis.exception.button,mimis.application.robot,mimis.application.lirc.ipod,mimis.exception.task.action,mimis.exception.application,wiiusej.wiiusejevents.wiiuseapievents,mimis.application.cmd.windows.gomplayer,mimis.application.mpc,org.wiigee.logic,mimis.device.lirc,mimis.sequence,mimis.manager,org.wiigee.util,mimis.event,mimis.application.cmd.windows.wmp,mimis.value,mimis.device.javainput.extreme3d,mimis.event.router,mimis.application.cmd,mimis.worker,org.wiigee.event,mimis.device.wiimote,mimis.device.wiimote.gesture.event,wiiusej.wiiusejevents.physicalevents,mimis.util.multiplexer,mimis,org.wiigee.control,mimis.exception.device.javainput,mimis.util,mimis.application.cmd.windows,com.dt.iTunesController,org.wiigee.device,mimis.application.vlc,mimis.device.wiimote.gesture,mimis.device.jintellitype,mimis.event.feedback,mimis.device,org.wiigee.filter,mimis.exception.application.windows,mimis.application,mimis.sequence.state,mimis.device.javainput.rumblepad,com.melloware.jintellitype,mimis.exception.event.router,mimis.exception.task,mimis.exception" source="1.6" sourcepath="src" splitindex="true" use="true" version="true"/>
+		<javadoc access="private" author="true" classpath="cfg;resource;lib/log4j-1.2.16.jar;lib/jxinput.jar;lib/commons-logging-1.1.1.jar;lib/jacob-1.15-M3.jar" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="mimis.exception.macro,mimis.device.network,wiiusej,mimis.application.itunes,mimis.exception.util,mimis.device.javainput,wiiusej.wiiusejevents,wiiusej.wiiusejevents.utils,mimis.util.swing,mimis.exception.worker,mimis.application.lirc,mimis.application.cmd.windows.winamp,wiiusej.values,mimis.exception.event,mimis.device.lirc.remote,mimis.device.panel,mimis.exception.device,mimis.exception.button,mimis.application.robot,mimis.application.lirc.ipod,mimis.exception.task.action,mimis.exception.application,wiiusej.wiiusejevents.wiiuseapievents,mimis.application.cmd.windows.gomplayer,mimis.application.mpc,org.wiigee.logic,mimis.device.lirc,mimis.sequence,mimis.manager,org.wiigee.util,mimis.event,mimis.application.cmd.windows.wmp,mimis.value,mimis.device.javainput.extreme3d,mimis.event.router,mimis.application.cmd,mimis.worker,org.wiigee.event,mimis.device.wiimote,mimis.device.wiimote.gesture.event,wiiusej.wiiusejevents.physicalevents,mimis.util.multiplexer,mimis,org.wiigee.control,mimis.exception.device.javainput,mimis.util,mimis.application.cmd.windows,com.dt.iTunesController,org.wiigee.device,mimis.application.vlc,mimis.device.wiimote.gesture,mimis.device.jintellitype,mimis.event.feedback,mimis.device,org.wiigee.filter,mimis.exception.application.windows,mimis.application,mimis.sequence.state,mimis.device.javainput.rumblepad,com.melloware.jintellitype,mimis.exception.event.router,mimis.exception.task,mimis.exception" source="1.6" sourcepath="src" splitindex="true" use="true" version="true" />
 	</target>
 
 	<!-- Jar -->
 	<target name="jar">
-		<property name="jar.dir" value="."/>
+		<property name="jar.dir" value="." />
 		<jar destfile="${jar.dir}/main.jar" filesetmanifest="mergewithoutmain">
 			<manifest>
 				<attribute name="Main-Class" value="mimis.Main" />
@@ -46,8 +46,8 @@
 	<target name="launch4j" depends="jar">
 		<property name="launch4j.dir" location="C:\Program Files (x86)\Launch4j" />
 		<path id="launch4j">
-			<pathelement location="${launch4j.dir}/launch4j.jar"/>
+			<pathelement location="${launch4j.dir}/launch4j.jar" />
-			<pathelement location="${launch4j.dir}/lib/xstream.jar"/>
+			<pathelement location="${launch4j.dir}/lib/xstream.jar" />
 		</path>
 		<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask">
 			<classpath refid="launch4j" />

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;
 

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;

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 {

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;

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 {

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;

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,

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),

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;

java/src/mimis/input/Button.java

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

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;

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;

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;

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;

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;

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;