1 files changed, 18 insertions, 22 deletions
diff --git a/vfd-uav/src/main/scala/vfd/uav/MockConnection.scala b/vfd-uav/src/main/scala/vfd/uav/MockConnection.scala
index 94a14db..126fa9a 100644
--- a/vfd-uav/src/main/scala/vfd/uav/MockConnection.scala
+++ b/vfd-uav/src/main/scala/vfd/uav/MockConnection.scala
@@ -1,33 +1,32 @@
 package vfd.uav
 
 import java.util.concurrent.TimeUnit.MILLISECONDS
+
 import scala.concurrent.duration.FiniteDuration
+import scala.util.Random
+
+import Connection.Received
 import akka.actor.Actor
-import akka.actor.Props
-import akka.actor.Terminated
-import akka.actor.actorRef2Scala
 import akka.actor.ActorLogging
-import scala.util.Random
+import akka.actor.Props
+import akka.util.ByteString
 
 class MockConnection extends Actor with ActorLogging with Connection {
   import Connection._
   import context._
 
   val messageInterval = FiniteDuration(500, MILLISECONDS)
-  
+
   override def preStart() = {
     context.system.scheduler.schedule(messageInterval, messageInterval) {
       val data = MockPackets.random()
-      
+
       this.log.debug("sending mock flight data: " + data.mkString("(", ",", ")"))
-      clients foreach (_ ! Received(data))
+      sendAll(Received(ByteString(data)))
     }
   }
 
-  def receive = {
-    case Connection.Register => register(sender)
-    case Terminated(client) => unregister(client)
-  }
+  def receive = registration
 
 }
 
@@ -35,17 +34,14 @@ object MockConnection {
   def apply = Props(classOf[MockConnection])
 }
 
-object MockPackets { 
-  
-  def random() = {
-    Random.nextInt(2) match {
-      case 0 => invalidCrc
-      case 1 => invalidOverflow
-    }
-    
+object MockPackets {
+
+  def random() = Random.nextInt(2) match {
+    case 0 => invalidCrc
+    case 1 => invalidOverflow
   }
-  
-  val invalidCrc = Array(254,1,123,13,13).map(_.toByte)
+
+  val invalidCrc = Array(254, 1, 123, 13, 13).map(_.toByte)
   val invalidOverflow = {
     val data = Array.fill[Byte](1006)(42)
     data(0) = -2
@@ -53,5 +49,5 @@ object MockPackets {
     data(1) = -1
     data
   }
-  
+
 }
 \ No newline at end of file