1 files changed, 3 insertions, 15 deletions
diff --git a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala b/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala
index b8d332c..b6f45f3 100644
--- a/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala
+++ b/flow-samples/terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/Main.scala
@@ -24,23 +24,11 @@ object Main {
     val cs = ask("Char size", "8").toInt
     val tsb = ask("Use two stop bits", "false").toBoolean
     val parity = Parity(ask("Parity [0=None, 1=Odd, 2=Even]", "0").toInt)
-    println("Starting terminal, enter :q to exit.")
+    println("Starting terminal system, enter :q to exit.")
     
     internal.InternalSerial.debug(true)
     val system = ActorSystem("flow")
-    val serial = system.actorOf(Props(classOf[SerialHandler], port, baud, cs, tsb, parity), name = "serial-handler")
-
-    var continue = true
-    while (continue) {
-      val in = Console.readLine()
-      if (in == ":q") {
-        continue = false
-        serial ! "close"
-      } else {
-        serial ! ByteString(in.getBytes())
-      }
-    }
-    system.shutdown()
-    println("Stopped terminal.")
+    system.registerOnTermination(println("Stopped terminal system."))
+    val terminal = system.actorOf(Props(classOf[Terminal], port, baud, cs, tsb, parity), name = "terminal")
   }
 }
 \ No newline at end of file