1 files changed, 7 insertions, 14 deletions
diff --git a/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/ConsoleReader.scala b/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/ConsoleReader.scala
index c4401e7..701ecd7 100644
--- a/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/ConsoleReader.scala
+++ b/flow-samples/flow-samples-terminal/src/main/scala/com/github/jodersky/flow/samples/terminal/ConsoleReader.scala
@@ -1,24 +1,18 @@
 package com.github.jodersky.flow.samples.terminal
 
-import akka.actor._
-import java.io.BufferedReader
-import java.io.InputStreamReader
+import akka.actor.Actor
+import akka.actor.actorRef2Scala
 
 class ConsoleReader extends Actor {
   import context._
   import ConsoleReader._
 
   def receive = {
-    case Read => read() match {
-      case Some(input) => parent ! ConsoleInput(input)
-      case None => parent ! EOT
-    }
-  }
-
-  def read(): Option[String] = {
-    val eot = 4
-    val line = Console.readLine
-    if (line == ":q") None else Some(line)
+    case Read =>
+      Console.readLine() match {
+        case ":q" => parent ! EOT
+        case s => parent ! ConsoleInput(s)
+      }
   }
 
 }
@@ -26,7 +20,6 @@ class ConsoleReader extends Actor {
 object ConsoleReader {
 
   case object Read
-
   case object EOT
   case class ConsoleInput(in: String)