Action en Target systeem omgepast naar rudimentair Task systeem om Continuous Tasks straks mogelijk te maken. Momenteel zijn de aanpassingen alleen doorgevoerd in de JIntellitypeDevice en ExampleApplication.

This commit is contained in:
2011-02-12 16:30:17 +00:00
parent 24cedc16a6
commit 6550062bc1
17 changed files with 118 additions and 112 deletions

View File

@@ -1,37 +0,0 @@
package pm.device;
import pm.Action;
import pm.Macro;
import pm.action.ActionProvider;
import pm.exception.MacroException;
import pm.exception.device.DeviceExitException;
import pm.exception.device.DeviceInitialiseException;
import pm.macro.Event;
import pm.macro.MacroListener;
public abstract class Device {
protected MacroListener macroListener;
public Device() {
macroListener = new MacroListener();
}
public void add(Macro macro, Action action) {
macroListener.add(macro, action);
}
public void add(Event event, Action action) throws MacroException {
macroListener.add(event, action);
}
public void add(Event event) {
macroListener.add(event);
}
public void add(Action action) {
ActionProvider.add(action);
}
public void initialise() throws DeviceInitialiseException {}
public void exit() throws DeviceExitException {}
}

View File

@@ -1,8 +1,8 @@
package pm.device.example;
import pm.Action;
import pm.Device;
import pm.Target;
import pm.device.Device;
public class ExampleDevice extends Device {
public void initialise() {

View File

@@ -1,6 +1,6 @@
package pm.device.gui;
import pm.device.Device;
import pm.Device;
public class GUIDevice extends Device {

View File

@@ -7,7 +7,7 @@ import javax.swing.JButton;
import javax.swing.JFrame;
import pm.Action;
import pm.Target;
import pm.action.ActionProvider;
import pm.task.ActionProvider;
import layout.TableLayout;
import layout.TableLayoutConstraints;

View File

@@ -7,7 +7,7 @@ import de.hardcode.jxinput.event.JXInputButtonEvent;
import de.hardcode.jxinput.event.JXInputDirectionalEvent;
import pm.Button;
import pm.device.Device;
import pm.Device;
import pm.exception.EventException;
import pm.exception.device.DeviceInitialiseException;
import pm.exception.device.DeviceNotFoundException;

View File

@@ -7,8 +7,9 @@ import com.melloware.jintellitype.IntellitypeListener;
import com.melloware.jintellitype.JIntellitype;
import pm.Action;
import pm.Device;
import pm.Target;
import pm.device.Device;
import pm.Task;
import pm.exception.EventException;
import pm.exception.MacroException;
import pm.exception.device.DeviceInitialiseException;
@@ -31,10 +32,10 @@ public class JIntellitypeDevice extends Device implements HotkeyListener, Intell
try {
add(
new Hotkey(HotkeyButton.CTRL | HotkeyButton.WIN, 'x'),
Action.EXIT.setTarget(Target.MAIN));
new Task(Action.EXIT, Target.MAIN));
add(
new Press(CommandButton.VOLUME_UP),
Action.EXIT.setTarget(Target.MAIN));
new Hotkey(HotkeyButton.CTRL | HotkeyButton.WIN, 't'),
new Task(Action.TEST, Target.MAIN));
} catch (MacroException e) {
e.printStackTrace();
}

View File

@@ -2,7 +2,7 @@ package pm.device.textinput;
import java.util.Scanner;
import pm.device.Device;
import pm.Device;
public class TextinputDevice extends Device {
static final int SLEEP = 50;

View File

@@ -1,8 +1,8 @@
package pm.device.wiimote;
import pm.Action;
import pm.Device;
import pm.Target;
import pm.device.Device;
import pm.exception.MacroException;
import pm.exception.device.DeviceInitialiseException;
import pm.macro.event.Press;