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

* Target.SELF toegevoegd.

Browse Source 
* Voormalige Events hernoemd naar States (Press, Release, Hold)
--> Nu komt Event vrij als naam voor de parent van Task en toekomstig Feedback
--> Exception namen nagelopen, controleren!
* Aantal classes verplaatst (Sequence en SequenceListener)
This commit is contained in:
Rik Veenboer
2011-02-25 14:38:29 +00:00
parent f778a86c4f
commit f1313e3109
38 changed files with 221 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
package pm.device.javainput;
import pm.Button;
import pm.exception.event.UnknownDirectionException;
import pm.exception.button.UnknownDirectionException;
import de.hardcode.jxinput.event.JXInputDirectionalEvent;
public enum DirectionButton implements Button {

14
java/src/pm/device/javainput/JavaInputDevice.java
View File

@@ -8,11 +8,11 @@ import de.hardcode.jxinput.event.JXInputDirectionalEvent;
import pm.Button;
import pm.Device;
import pm.exception.EventException;
import pm.exception.StateException;
import pm.exception.device.DeviceInitialiseException;
import pm.exception.device.DeviceNotFoundException;
import pm.macro.event.Press;
import pm.macro.event.Release;
import pm.macro.state.Press;
import pm.macro.state.Release;
public abstract class JavaInputDevice extends Device {
protected JavaInputListener javaInputListener;
@@ -35,7 +35,7 @@ public abstract class JavaInputDevice extends Device {
//System.out.println(event);
}
public void processEvent(JXInputButtonEvent event) throws EventException {
public void processEvent(JXInputButtonEvent event) throws StateException {
Button button = getButton(event);
if (event.getButton().getState()) {
System.out.println("Press: " + button);
@@ -46,7 +46,7 @@ public abstract class JavaInputDevice extends Device {
}
}
public void processEvent(JXInputDirectionalEvent event) throws EventException {
public void processEvent(JXInputDirectionalEvent event) throws StateException {
Button button = getButton(event);
if (event.getDirectional().isCentered()) {
if (previousDirectionalButton != null) {
@@ -60,8 +60,8 @@ public abstract class JavaInputDevice extends Device {
}
}
protected abstract Button getButton(JXInputButtonEvent event) throws EventException;
protected abstract Button getButton(JXInputDirectionalEvent event) throws EventException;
protected abstract Button getButton(JXInputButtonEvent event) throws StateException;
protected abstract Button getButton(JXInputDirectionalEvent event) throws StateException;
public static JXInputDevice getDevice(String name) throws DeviceNotFoundException {
int numberOfDevices = JXInputManager.getNumberOfDevices();

6
java/src/pm/device/javainput/JavaInputListener.java
View File

@@ -3,7 +3,7 @@ package pm.device.javainput;
import java.util.LinkedList;
import java.util.Queue;
import pm.exception.EventException;
import pm.exception.StateException;
import de.hardcode.jxinput.Axis;
import de.hardcode.jxinput.Button;
@@ -86,13 +86,13 @@ public class JavaInputListener implements Runnable, JXInputAxisEventListener, JX
if (!buttonEventQueue.isEmpty()) {
try {
javaInputDevice.processEvent(buttonEventQueue.poll());
} catch (EventException e) {}
} catch (StateException e) {}
sleep = false;
}
if (!directionalEventQueue.isEmpty()) {
try {
javaInputDevice.processEvent(directionalEventQueue.poll());
} catch (EventException e) {e.printStackTrace();}
} catch (StateException e) {e.printStackTrace();}
sleep = false;
}
if (sleep) {

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

@@ -2,7 +2,7 @@ package pm.device.javainput.extreme3d;
import de.hardcode.jxinput.event.JXInputButtonEvent;
import pm.Button;
import pm.exception.event.UnknownButtonException;
import pm.exception.button.UnknownButtonException;
public enum Extreme3DButton implements Button {
ONE ("Button 0"),

10
java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java
View File

@@ -6,12 +6,12 @@ import pm.Task;
import pm.device.javainput.DirectionButton;
import pm.device.javainput.JavaInputDevice;
import pm.exception.MacroException;
import pm.exception.button.UnknownButtonException;
import pm.exception.button.UnknownDirectionException;
import pm.exception.device.DeviceInitialiseException;
import pm.exception.event.UnknownButtonException;
import pm.exception.event.UnknownDirectionException;
import pm.macro.event.Hold;
import pm.macro.event.Press;
import pm.macro.event.Release;
import pm.macro.state.Hold;
import pm.macro.state.Press;
import pm.macro.state.Release;
import pm.value.Action;
import pm.value.Target;
import de.hardcode.jxinput.event.JXInputButtonEvent;

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

@@ -2,7 +2,7 @@ package pm.device.javainput.rumblepad;
import de.hardcode.jxinput.event.JXInputButtonEvent;
import pm.Button;
import pm.exception.event.UnknownButtonException;
import pm.exception.button.UnknownButtonException;
public enum RumblepadButton implements Button {
ONE ("Button 0"),

8
java/src/pm/device/javainput/rumblepad/RumblepadDevice.java
View File

@@ -4,11 +4,11 @@ import pm.Button;
import pm.Task;
import pm.device.javainput.DirectionButton;
import pm.device.javainput.JavaInputDevice;
import pm.exception.button.UnknownButtonException;
import pm.exception.button.UnknownDirectionException;
import pm.exception.device.DeviceInitialiseException;
import pm.exception.event.UnknownButtonException;
import pm.exception.event.UnknownDirectionException;
import pm.macro.event.Hold;
import pm.macro.event.Press;
import pm.macro.state.Hold;
import pm.macro.state.Press;
import pm.task.Continuous;
import pm.task.Dynamic;
import pm.value.Action;

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

@@ -3,7 +3,7 @@ package pm.device.jintellitype;
import com.melloware.jintellitype.JIntellitype;
import pm.Button;
import pm.exception.event.UnknownButtonException;
import pm.exception.button.UnknownButtonException;
public enum CommandButton implements Button {
BROWSER_BACKWARD (JIntellitype.APPCOMMAND_BROWSER_BACKWARD),

2
java/src/pm/device/jintellitype/Hotkey.java
View File

@@ -4,7 +4,7 @@ import java.util.ArrayList;
import com.melloware.jintellitype.JIntellitype;
import pm.macro.event.Press;
import pm.macro.state.Press;
import pm.value.Key;
public class Hotkey extends Press {

10
java/src/pm/device/jintellitype/JIntellitypeDevice.java
View File

@@ -8,11 +8,11 @@ import com.melloware.jintellitype.JIntellitype;
import pm.Device;
import pm.Task;
import pm.exception.EventException;
import pm.exception.StateException;
import pm.exception.device.DeviceInitialiseException;
import pm.macro.event.Hold;
import pm.macro.event.Press;
import pm.macro.event.Release;
import pm.macro.state.Hold;
import pm.macro.state.Press;
import pm.macro.state.Release;
import pm.task.Continuous;
import pm.value.Action;
import pm.value.Command;
@@ -63,7 +63,7 @@ public class JIntellitypeDevice extends Device implements HotkeyListener, Intell
System.out.println(commandButton);
add(new Press(commandButton));
add(new Release(commandButton));
} catch (EventException e) {
} catch (StateException e) {
e.printStackTrace(); // Todo: deze exception verder omhoog gooien
}
}

7
java/src/pm/device/text/InputListener.java
View File

@@ -5,6 +5,7 @@ import java.util.Scanner;
import pm.Listener;
import pm.Task;
import pm.exception.task.TaskNotSupportedException;
import pm.task.TaskManager;
import pm.value.Action;
import pm.value.Target;
@@ -22,8 +23,10 @@ public class InputListener extends Listener {
String string = input.next().toUpperCase();
if(string != null) {
try {
TaskManager.add(
new Task(Action.valueOf(string), Target.APPLICATION));
try {
TaskManager.add(
new Task(Action.valueOf(string), Target.APPLICATION));
} catch (TaskNotSupportedException e) {}
} catch(IllegalArgumentException e) {}
}
try {

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

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

22
java/src/pm/device/wiimote/WiimoteDevice.java
View File

@@ -8,11 +8,11 @@ import pm.Button;
import pm.Device;
import pm.Task;
import pm.device.wiimote.gesture.GestureDevice;
import pm.exception.button.UnknownButtonException;
import pm.exception.device.DeviceInitialiseException;
import pm.exception.event.UnknownButtonException;
import pm.macro.event.Hold;
import pm.macro.event.Press;
import pm.macro.event.Release;
import pm.macro.state.Hold;
import pm.macro.state.Press;
import pm.macro.state.Release;
import pm.task.Continuous;
import pm.task.Dynamic;
import pm.value.Action;
@@ -48,20 +48,20 @@ public class WiimoteDevice extends Device implements GestureListener {
public void initialise() throws DeviceInitialiseException {
wiimote = wiimoteService.getDevice(this);
wiimote.activateMotionSensing();
/*add(
add(
new Hold(WiimoteButton.A),
new Task(Action.TRAIN, Target.DEVICE),
new Task(Action.STOP, Target.DEVICE));
new Task(Action.TRAIN),
new Task(Action.STOP));
add(
new Press(WiimoteButton.B),
new Task(Action.SAVE, Target.DEVICE));
new Task(Action.SAVE));
add(
new Press(WiimoteButton.DOWN),
new Task(Action.LOAD, Target.DEVICE));
new Task(Action.LOAD));
add(
new Hold(WiimoteButton.HOME),
new Task(Action.RECOGNIZE, Target.DEVICE),
new Task(Action.STOP, Target.DEVICE));*/
new Task(Action.RECOGNIZE),
new Task(Action.STOP));
add(
new Press(WiimoteButton.A),
new Task(Action.PLAY, Target.APPLICATION));