From 384bfd36085d4a2bb2f2aa99538ad73fe57e7f47 Mon Sep 17 00:00:00 2001 From: Bram Veenboer Date: Sun, 12 Jun 2011 13:42:41 +0000 Subject: [PATCH] Weer een debug/optimalisatie ronde gehad.... --- java/src/mimis/Mimis.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/java/src/mimis/Mimis.java b/java/src/mimis/Mimis.java index 9b04f04..23dec37 100644 --- a/java/src/mimis/Mimis.java +++ b/java/src/mimis/Mimis.java @@ -5,7 +5,6 @@ import mimis.event.EventRouter; import mimis.event.Feedback; import mimis.event.feedback.TextFeedback; import mimis.exception.worker.ActivateException; -import mimis.exception.worker.DeactivateException; import mimis.sequence.SequenceParser; import mimis.util.ArrayCycle; import mimis.value.Action; @@ -59,7 +58,7 @@ public class Mimis extends EventHandler { public void activate() throws ActivateException { log.debug("Create gui"); gui = new GUI(this, applicationManager, deviceManager); - + log.debug("Activate event router"); eventRouter.activate(); @@ -72,11 +71,11 @@ public class Mimis extends EventHandler { eventRouter.set(applicationCycle.current()); add(new TextFeedback("Current application: " + applicationCycle.current().title())); } - super.activate(false); + super.activate(); } - public void stop() throws DeactivateException { - super.stop(); + public void stop() { + super.stop(); log.debug("Stop GUI"); gui.stop(); @@ -99,11 +98,7 @@ public class Mimis extends EventHandler { add(new TextFeedback("Previous application: " + applicationCycle.current().title())); break; case EXIT: - try { - stop(); - } catch (DeactivateException e) { - log.error(e); - } + stop(); break; } }