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

Macro systeem veralgemeniseerd naar Sequence. Sequence maakt het mogelijk om de automatische toegevoegde events bij macro's te omzeilen. Hier wordt gebruik van gemaakt bij de Continuous task, want deze moet alle vrijheid hebben. Nu is in de vele shortcut-sequence add functies nog geen beveiliging om oneindige Continuous tasks uit te voeren. De verantwoordelijkheid hiervoor ligt bij de gebruiker of een toekomstige controle.

Browse Source
This commit is contained in:
Rik Veenboer
2011-02-13 13:08:55 +00:00
parent d62a354d9a
commit 3805baf986
10 changed files with 86 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
java/src/pm/Device.java
View File

@@ -3,32 +3,37 @@ package pm;
import pm.exception.device.DeviceExitException;
import pm.exception.device.DeviceInitialiseException;
import pm.macro.Event;
import pm.macro.MacroListener;
import pm.macro.event.Hold;
import pm.macro.event.Press;
import pm.macro.event.Release;
import pm.macro.event.Sequence;
import pm.macro.event.SequenceListener;
import pm.task.Continuous;
import pm.task.Stopper;
public abstract class Device {
protected MacroListener macroListener;
protected SequenceListener sequenceListener;
public Device() {
macroListener = new MacroListener();
sequenceListener = new SequenceListener();
}
/* Register macro's */
protected void add(Macro macro, Task task) {
macroListener.add(macro, task);
protected void add(Sequence sequence, Task task) {
sequenceListener.add(sequence, task);
}
protected void add(Press press, Task task) {
add(new Macro(press), task);
}
protected void add(Event event, Task task) {
add(new Macro(event), task);
add(new Sequence(event), task);
}
protected void add(Macro startMacro, Macro stopMacro, Continuous continuous) {
add(startMacro, continuous);
add(stopMacro, new Stopper(continuous));
protected void add(Sequence startSequence, Sequence stopSequence, Continuous continuous) {
add(startSequence, continuous);
add(stopSequence, new Stopper(continuous));
}
protected void add(Event startEvent, Event stopEvent, Continuous continuous) {
@@ -36,6 +41,11 @@ public abstract class Device {
add(stopEvent, new Stopper(continuous));
}
protected void add(Press startPress, Press stopPress, Continuous continuous) {
add(new Macro(startPress), continuous);
add(new Macro(stopPress), new Stopper(continuous));
}
protected void add(Hold hold, Continuous continuous) {
Button button = hold.getButton();
add(new Press(button), new Release(button), continuous);
@@ -43,7 +53,7 @@ public abstract class Device {
/* Recognize events */
protected void add(Event event) {
macroListener.add(event);
sequenceListener.add(event);
}
/* Device default methods */