Begonnen met testen, shuffle en repeat zijn kapot in de meest recente winamp

java/src/mimis/Mimis.java

@@ -68,6 +68,7 @@ public class Mimis extends EventHandler {
         if (applicationCycle.size() > 0) {
             log.debug("Initialise application cycle");
             eventRouter.set(applicationCycle.current());
+            add(new TextFeedback("Current application: " + applicationCycle.current().title()));
         }
         super.activate(false);
     }
@@ -82,7 +83,7 @@ public class Mimis extends EventHandler {
         super.stop();
     }
 
-    protected void action(Action action) {
+    protected void end(Action action) {
         log.debug(String.format("action(%s)", action));
         switch (action) {
             case NEXT:

java/src/mimis/event/EventHandler.java

@@ -21,6 +21,7 @@ public abstract class EventHandler extends EventListener {
     protected void feedback(Feedback feedback) {}
 
     protected void task(Task task) {
+        log.debug("Signal: " + task.signal);
         Action action = task.getAction();
         switch (task.getSignal()) {
             case BEGIN:

java/src/mimis/sequence/Active.java

@@ -4,38 +4,26 @@ package mimis.sequence;
 public class Active {
     protected Sequence sequence;
     protected int step;
-    //protected long start;
-    //protected long duration;
 
     public Active(Sequence sequence) {
         this.sequence = sequence;
         step = -1;
-        //start = System.nanoTime();
     }
 
     public Sequence getSequence() {
         return sequence;
     }
 
-    /*public long getDuration() {
-        return duration;
-    }*/
-
     public boolean next(State state) {
         State next = sequence.get(++step);
         return next == null ? false : state.equals(next);
     }
-    
+
     public boolean first() {
-        return step == 0;
+        return step == -1;
     }
 
     public boolean last() {
         return step == sequence.count() - 1;
-        /*boolean last = step == sequence.count() - 1;
-        if (last) {
-            duration = System.nanoTime() - start;
-        }
-        return last;*/
     }
 }

java/src/mimis/sequence/SequenceListener.java

@@ -71,9 +71,9 @@ public class SequenceListener {
             task.setSignal(signal);
         }
         if (event.getTarget().equals(Target.SELF)) {
-            eventListener.add(event);
-        } else {
             self.add(event);
+        } else {
+            eventListener.add(event);
         }
     }
 }