From f0a76248141f6992d2a3622572f86810abfd07b5 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Thu, 27 Jun 2013 13:08:04 +0200 Subject: organize imports --- src/main/scala/com/github/jodersky/flow/Serial.scala | 4 +--- src/main/scala/com/github/jodersky/flow/SerialExt.scala | 2 +- .../scala/com/github/jodersky/flow/SerialManager.scala | 13 +++++++++---- .../scala/com/github/jodersky/flow/SerialOperator.scala | 17 ++++++++++------- 4 files changed, 21 insertions(+), 15 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/com/github/jodersky/flow/Serial.scala b/src/main/scala/com/github/jodersky/flow/Serial.scala index 9b03ba0..6f18e19 100644 --- a/src/main/scala/com/github/jodersky/flow/Serial.scala +++ b/src/main/scala/com/github/jodersky/flow/Serial.scala @@ -1,9 +1,7 @@ package com.github.jodersky.flow -import akka.io._ -import akka.actor.ExtensionKey -import akka.actor.Props import akka.actor.ActorRef +import akka.actor.ExtensionKey import akka.util.ByteString /** Defines messages used by serial IO layer. */ diff --git a/src/main/scala/com/github/jodersky/flow/SerialExt.scala b/src/main/scala/com/github/jodersky/flow/SerialExt.scala index 45d10d8..080ddd3 100644 --- a/src/main/scala/com/github/jodersky/flow/SerialExt.scala +++ b/src/main/scala/com/github/jodersky/flow/SerialExt.scala @@ -1,8 +1,8 @@ package com.github.jodersky.flow import akka.actor.ExtendedActorSystem -import akka.io.IO import akka.actor.Props +import akka.io.IO class SerialExt(system: ExtendedActorSystem) extends IO.Extension { lazy val manager = system.actorOf(Props(classOf[SerialManager]), name = "IO-SERIAL") diff --git a/src/main/scala/com/github/jodersky/flow/SerialManager.scala b/src/main/scala/com/github/jodersky/flow/SerialManager.scala index 8b0a39c..688ae3c 100644 --- a/src/main/scala/com/github/jodersky/flow/SerialManager.scala +++ b/src/main/scala/com/github/jodersky/flow/SerialManager.scala @@ -1,17 +1,22 @@ package com.github.jodersky.flow +import java.io.IOException + import scala.util.Failure import scala.util.Success import scala.util.Try + import com.github.jodersky.flow.internal.InternalSerial -import Serial._ + +import Serial.Open +import Serial.OpenFailed import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.OneForOneStrategy -import akka.actor.OneForOneStrategy import akka.actor.Props -import akka.actor.SupervisorStrategy._ -import java.io.IOException +import akka.actor.SupervisorStrategy.Escalate +import akka.actor.SupervisorStrategy.Stop +import akka.actor.actorRef2Scala class SerialManager extends Actor with ActorLogging { import SerialManager._ diff --git a/src/main/scala/com/github/jodersky/flow/SerialOperator.scala b/src/main/scala/com/github/jodersky/flow/SerialOperator.scala index 5be8cd5..8621c55 100644 --- a/src/main/scala/com/github/jodersky/flow/SerialOperator.scala +++ b/src/main/scala/com/github/jodersky/flow/SerialOperator.scala @@ -1,16 +1,19 @@ package com.github.jodersky.flow -import scala.concurrent.future -import scala.util.Failure -import scala.util.Success -import Serial._ +import com.github.jodersky.flow.internal.InternalSerial + +import Serial.Close +import Serial.Closed +import Serial.Opened +import Serial.Received +import Serial.Write +import Serial.Wrote import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.ActorRef -import akka.util.ByteString -import com.github.jodersky.flow.internal.InternalSerial import akka.actor.Terminated -import scala.util.Try +import akka.actor.actorRef2Scala +import akka.util.ByteString class SerialOperator(handler: ActorRef, serial: InternalSerial) extends Actor with ActorLogging { import context._ -- cgit v1.2.3