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

EventParser hernoemd naar SequenceParser, immers het is een Sequence van States die in een Event wordt omgezet en niet andersom.

Browse Source
This commit is contained in:
Rik Veenboer
2011-06-08 08:00:27 +00:00
parent 5ba74fdd78
commit 8490380eed
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/src/mimis/Device.java
View File

@@ -1,19 +1,17 @@
package mimis; package mimis;
import mimis.device.EventMapCycle;
import mimis.event.EventHandler; import mimis.event.EventHandler;
import mimis.exception.worker.ActivateException; import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException; import mimis.exception.worker.DeactivateException;
import mimis.manager.Exitable; import mimis.manager.Exitable;
import mimis.manager.Titled; import mimis.manager.Titled;
import mimis.sequence.EventMap; import mimis.sequence.EventMap;
import mimis.sequence.EventParser; import mimis.sequence.SequenceParser;
import mimis.sequence.State; import mimis.sequence.State;
public abstract class Device extends EventHandler implements Titled, Exitable { public abstract class Device extends EventHandler implements Titled, Exitable {
protected String title; protected String title;
protected EventMapCycle eventMapCycle; protected SequenceParser sequenceParser;
protected EventParser eventParser;
public Device(String title) { public Device(String title) {
this.title = title; this.title = title;
@@ -26,12 +24,12 @@ public abstract class Device extends EventHandler implements Titled, Exitable {
/* Worker */ /* Worker */
public void activate() throws ActivateException { public void activate() throws ActivateException {
super.activate(); super.activate();
eventParser = new EventParser(this); sequenceParser = new SequenceParser(this);
} }
public void deactivate() throws DeactivateException { public void deactivate() throws DeactivateException {
super.deactivate(); super.deactivate();
eventParser.reset(); sequenceParser.reset();
} }
public void stop() { public void stop() {
@@ -45,20 +43,20 @@ public abstract class Device extends EventHandler implements Titled, Exitable {
super.stop(); super.stop();
} }
/* EventParser */ /* SequenceParser */
protected void add(EventMap eventMap) { protected void add(EventMap eventMap) {
eventParser.add(eventMap); sequenceParser.add(eventMap);
} }
protected void remove(EventMap eventMap) { protected void remove(EventMap eventMap) {
eventParser.remove(eventMap); sequenceParser.remove(eventMap);
} }
protected void reset() { protected void reset() {
eventParser.reset(); sequenceParser.reset();
} }
protected void add(State state) { protected void add(State state) {
eventParser.add(state); sequenceParser.add(state);
} }
} }

6
java/src/mimis/Mimis.java
View File

@@ -5,7 +5,7 @@ import mimis.event.EventRouter;
import mimis.event.Feedback; import mimis.event.Feedback;
import mimis.exception.worker.ActivateException; import mimis.exception.worker.ActivateException;
import mimis.feedback.TextFeedback; import mimis.feedback.TextFeedback;
import mimis.sequence.EventParser; import mimis.sequence.SequenceParser;
import mimis.util.ArrayCycle; import mimis.util.ArrayCycle;
import mimis.value.Action; import mimis.value.Action;
@@ -40,9 +40,9 @@ public class Mimis extends EventHandler {
this.deviceArray = deviceArray; this.deviceArray = deviceArray;
applicationCycle = new ArrayCycle<Application>(applicationArray); applicationCycle = new ArrayCycle<Application>(applicationArray);
log.debug("Initialise EventHandler and EventParser"); log.debug("Initialise EventHandler and SequenceParser");
EventHandler.initialise(eventRouter); EventHandler.initialise(eventRouter);
EventParser.initialise(eventRouter); SequenceParser.initialise(eventRouter);
log.debug("Add EventListeners to EventRouter"); log.debug("Add EventListeners to EventRouter");
eventRouter.add(this); eventRouter.add(this);

6
java/src/mimis/sequence/EventParser.java → java/src/mimis/sequence/SequenceParser.java
View File

@@ -13,7 +13,7 @@ import mimis.event.Task;
import mimis.value.Signal; import mimis.value.Signal;
import mimis.value.Target; import mimis.value.Target;
public class EventParser { public class SequenceParser {
protected Log log = LogFactory.getLog(getClass()); protected Log log = LogFactory.getLog(getClass());
protected EventHandler self; protected EventHandler self;
@@ -23,7 +23,7 @@ public class EventParser {
protected static EventListener eventListener; protected static EventListener eventListener;
public EventParser(EventHandler self) { public SequenceParser(EventHandler self) {
this.self = self; this.self = self;
eventMap = new EventMap(); eventMap = new EventMap();
sequenceList = new ArrayList<Sequence>(); sequenceList = new ArrayList<Sequence>();
@@ -31,7 +31,7 @@ public class EventParser {
} }
public static void initialise(EventListener eventListener) { public static void initialise(EventListener eventListener) {
EventParser.eventListener = eventListener; SequenceParser.eventListener = eventListener;
} }
public synchronized void add(EventMap eventMap) { public synchronized void add(EventMap eventMap) {