Weer een debug/optimalisatie ronde gehad....

This commit is contained in:
Bram Veenboer
2011-06-12 13:42:41 +00:00
parent ddd71a1daf
commit 384bfd3608

View File

@@ -5,7 +5,6 @@ import mimis.event.EventRouter;
import mimis.event.Feedback; import mimis.event.Feedback;
import mimis.event.feedback.TextFeedback; import mimis.event.feedback.TextFeedback;
import mimis.exception.worker.ActivateException; import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException;
import mimis.sequence.SequenceParser; import mimis.sequence.SequenceParser;
import mimis.util.ArrayCycle; import mimis.util.ArrayCycle;
import mimis.value.Action; import mimis.value.Action;
@@ -59,7 +58,7 @@ public class Mimis extends EventHandler {
public void activate() throws ActivateException { public void activate() throws ActivateException {
log.debug("Create gui"); log.debug("Create gui");
gui = new GUI(this, applicationManager, deviceManager); gui = new GUI(this, applicationManager, deviceManager);
log.debug("Activate event router"); log.debug("Activate event router");
eventRouter.activate(); eventRouter.activate();
@@ -72,11 +71,11 @@ public class Mimis extends EventHandler {
eventRouter.set(applicationCycle.current()); eventRouter.set(applicationCycle.current());
add(new TextFeedback("Current application: " + applicationCycle.current().title())); add(new TextFeedback("Current application: " + applicationCycle.current().title()));
} }
super.activate(false); super.activate();
} }
public void stop() throws DeactivateException { public void stop() {
super.stop(); super.stop();
log.debug("Stop GUI"); log.debug("Stop GUI");
gui.stop(); gui.stop();
@@ -99,11 +98,7 @@ public class Mimis extends EventHandler {
add(new TextFeedback("Previous application: " + applicationCycle.current().title())); add(new TextFeedback("Previous application: " + applicationCycle.current().title()));
break; break;
case EXIT: case EXIT:
try { stop();
stop();
} catch (DeactivateException e) {
log.error(e);
}
break; break;
} }
} }