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

Gekke door elkaar lopende versie gefixt.

Browse Source
This commit is contained in:
Rik Veenboer
2011-02-09 18:20:16 +00:00
parent 6f61c029eb
commit 4a236f0e05
3 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/pm/Main.java
View File

@@ -52,10 +52,10 @@ public class Main {
public void start() throws Exception {
//add(new ExampleDevice());
add(new RumblepadDevice());
//add(new RumblepadDevice());
//add(new Extreme3DDevice());
add(new JIntellitypeDevice());
add(new WiimoteDevice());
//add(new WiimoteDevice());
for (Device device : deviceList) {
device.start();
}

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

@@ -2,49 +2,41 @@ package pm.device.javainput.rumblepad;
import de.hardcode.jxinput.event.JXInputButtonEvent;
import pm.Button;
import pm.device.javainput.JavaInputButton;
import pm.device.javainput.extreme3d.Extreme3DButton;
import pm.exception.event.UnknownButtonException;
public enum RumblepadButton implements Button {
ONE (0),
TWO (1),
THREE (2),
FOUR (3),
FIVE (4),
SIX (5),
SEVEN (6),
EIGHT (7),
NINE (8),
TEN (9);
ONE ("Button 0"),
TWO ("Button 1"),
THREE ("Button 2"),
FOUR ("Button 3"),
FIVE ("Button 4"),
SIX ("Button 5"),
SEVEN ("Button 6"),
EIGHT ("Button 7"),
NINE ("Button 8"),
TEN ("Button 9");
protected int code;
protected String code;
private RumblepadButton(int code) {
private RumblepadButton(String code) {
this.code = code;
}
public int getCode() {
public String getCode() {
return code;
}
public static JavaInputButton create(int code) throws UnknownButtonException {
public static RumblepadButton create(String code) throws UnknownButtonException {
for (RumblepadButton button : RumblepadButton.values()) {
if (button.getCode() == code) {
return new JavaInputButton(code + 1);
if (button.getCode().equals(code)) {
return button;
}
}
throw new UnknownButtonException();
}
public static JavaInputButton create(JXInputButtonEvent event) throws UnknownButtonException {
String name = event.getButton().getName();
String button = name.replaceFirst("Button ", "");
int code = Integer.valueOf(button);
//System.out.println(name + " " + button + " " + code);
return create(code);
}
public String toString() {
return String.valueOf(getCode());
public static RumblepadButton create(JXInputButtonEvent event) throws UnknownButtonException {
return create(event.getButton().getName());
}
}

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

@@ -5,7 +5,6 @@ import pm.Button;
import pm.Macro;
import pm.Target;
import pm.device.javainput.EightfoldDirection;
import pm.device.javainput.JavaInputButton;
import pm.device.javainput.JavaInputDevice;
import pm.exception.DeviceException;
import pm.exception.MacroException;
@@ -36,7 +35,7 @@ public class RumblepadDevice extends JavaInputDevice {
new Press(RumblepadButton.THREE),
Action.RESUME.setTarget(Target.APPLICATION));
add(
new Press(new JavaInputButton(9)),
new Press(RumblepadButton.NINE),
Action.EXIT.setTarget(Target.MAIN));
} catch (MacroException e) {
e.printStackTrace();