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

Basis gelegd voor Events: Feedback en Task, daartoe aantal dingen hernoemd.

Browse Source
This commit is contained in:
Rik Veenboer
2011-02-25 14:51:30 +00:00
parent f1313e3109
commit ad25a129f8
22 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/pm/device/gui/GUIDeviceUI.java
View File

@@ -5,7 +5,8 @@ import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JFrame;
import pm.Task;
import pm.event.Task;
import pm.task.TaskManager;
import pm.value.Action;
import pm.value.Target;

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

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

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

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

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

@@ -2,9 +2,9 @@ package pm.device.javainput.extreme3d;
import pm.Button;
import pm.Macro;
import pm.Task;
import pm.device.javainput.DirectionButton;
import pm.device.javainput.JavaInputDevice;
import pm.event.Task;
import pm.exception.MacroException;
import pm.exception.button.UnknownButtonException;
import pm.exception.button.UnknownDirectionException;

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

@@ -1,9 +1,9 @@
package pm.device.javainput.rumblepad;
import pm.Button;
import pm.Task;
import pm.device.javainput.DirectionButton;
import pm.device.javainput.JavaInputDevice;
import pm.event.Task;
import pm.exception.button.UnknownButtonException;
import pm.exception.button.UnknownDirectionException;
import pm.exception.device.DeviceInitialiseException;

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

@@ -7,8 +7,9 @@ import com.melloware.jintellitype.IntellitypeListener;
import com.melloware.jintellitype.JIntellitype;
import pm.Device;
import pm.Task;
import pm.event.Task;
import pm.exception.StateException;
import pm.exception.button.UnknownButtonException;
import pm.exception.device.DeviceInitialiseException;
import pm.macro.state.Hold;
import pm.macro.state.Press;
@@ -63,9 +64,7 @@ public class JIntellitypeDevice extends Device implements HotkeyListener, Intell
System.out.println(commandButton);
add(new Press(commandButton));
add(new Release(commandButton));
} catch (StateException e) {
e.printStackTrace(); // Todo: deze exception verder omhoog gooien
}
} catch (UnknownButtonException e) {}
}
public void onHotKey(int id) {

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

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

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

@@ -6,8 +6,8 @@ import org.wiigee.util.Log;
import pm.Button;
import pm.Device;
import pm.Task;
import pm.device.wiimote.gesture.GestureDevice;
import pm.event.Task;
import pm.exception.button.UnknownButtonException;
import pm.exception.device.DeviceInitialiseException;
import pm.macro.state.Hold;