From ab05bf943066a9fa6d687d7219ed1a46875c5a24 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik_dot_nordwall@gmail>
Date: Fri, 8 Apr 2011 14:10:39 +0200
Subject: [PATCH] fixed warnings, @serializable -> extends scala.Serializable

---
 akka-actor/src/main/scala/akka/actor/Actor.scala            | 2 +-
 .../scala/akka/serialization/SerializationProtocol.scala    | 4 ++--
 .../src/main/scala/akka/serialization/Serializer.scala      | 2 +-
 .../src/test/scala/remote/RemoteSupervisorSpec.scala        | 6 +++---
 .../serialization/SerializableTypeClassActorSpec.scala      | 4 ++--
 akka-stm/src/main/scala/akka/stm/Ref.scala                  | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 718c3b94bb..db06a04418 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -18,7 +18,7 @@ import akka.japi. {Creator, Procedure}
 /**
  * Life-cycle messages for the Actors
  */
-@serializable sealed trait LifeCycleMessage
+sealed trait LifeCycleMessage extends Serializable
 
 /* Marker trait to show which Messages are automatically handled by Akka */
 sealed trait AutoReceivedMessage { self: LifeCycleMessage => }
diff --git a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
index 7ad0c1e443..090f483309 100644
--- a/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
@@ -44,7 +44,7 @@ trait Format[T <: Actor] extends FromBinary[T] with ToBinary[T]
  * }
  * </pre>
  */
-@serializable trait StatelessActorFormat[T <: Actor] extends Format[T] {
+trait StatelessActorFormat[T <: Actor] extends Format[T] with Serializable {
   def fromBinary(bytes: Array[Byte], act: T) = act
 
   def toBinary(ac: T) = Array.empty[Byte]
@@ -64,7 +64,7 @@ trait Format[T <: Actor] extends FromBinary[T] with ToBinary[T]
  * }
  * </pre>
  */
-@serializable trait SerializerBasedActorFormat[T <: Actor] extends Format[T] {
+trait SerializerBasedActorFormat[T <: Actor] extends Format[T] with Serializable {
   val serializer: Serializer
 
   def fromBinary(bytes: Array[Byte], act: T) = serializer.fromBinary(bytes, Some(act.self.actorClass)).asInstanceOf[T]
diff --git a/akka-remote/src/main/scala/akka/serialization/Serializer.scala b/akka-remote/src/main/scala/akka/serialization/Serializer.scala
index 3a292e0de0..3fc661afce 100644
--- a/akka-remote/src/main/scala/akka/serialization/Serializer.scala
+++ b/akka-remote/src/main/scala/akka/serialization/Serializer.scala
@@ -17,7 +17,7 @@ import sjson.json.{Serializer => SJSONSerializer}
 /**
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-@serializable trait Serializer {
+trait Serializer extends scala.Serializable {
   @volatile var classLoader: Option[ClassLoader] = None
   def deepClone(obj: AnyRef): AnyRef = fromBinary(toBinary(obj), Some(obj.getClass))
 
diff --git a/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala b/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala
index 4026418d18..a0b6440287 100644
--- a/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala
+++ b/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala
@@ -23,7 +23,7 @@ object Log {
   }
 }
 
-@serializable class RemotePingPong1Actor extends Actor {
+class RemotePingPong1Actor extends Actor with Serializable {
   def receive = {
     case "Ping" =>
       Log.messageLog.put("ping")
@@ -41,7 +41,7 @@ object Log {
   }
 }
 
-@serializable class RemotePingPong2Actor extends Actor {
+class RemotePingPong2Actor extends Actor with Serializable {
   def receive = {
     case "Ping" =>
       Log.messageLog.put("ping")
@@ -55,7 +55,7 @@ object Log {
   }
 }
 
-@serializable class RemotePingPong3Actor extends Actor {
+class RemotePingPong3Actor extends Actor with Serializable {
   def receive = {
     case "Ping" =>
       Log.messageLog.put("ping")
diff --git a/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala b/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
index 2eec948698..20ccc076b0 100644
--- a/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
+++ b/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
@@ -221,7 +221,7 @@ class MyActorWithDualCounter extends Actor {
   }
 }
 
-@serializable class MyActor extends Actor {
+class MyActor extends Actor with scala.Serializable {
   var count = 0
 
   def receive = {
@@ -249,7 +249,7 @@ class MyStatelessActorWithMessagesInMailbox extends Actor {
   }
 }
 
-@serializable class MyJavaSerializableActor extends Actor {
+class MyJavaSerializableActor extends Actor with Serializable {
   var count = 0
   self.receiveTimeout = Some(1000)
 
diff --git a/akka-stm/src/main/scala/akka/stm/Ref.scala b/akka-stm/src/main/scala/akka/stm/Ref.scala
index 74b1bf5a9e..5d1aa9dc96 100644
--- a/akka-stm/src/main/scala/akka/stm/Ref.scala
+++ b/akka-stm/src/main/scala/akka/stm/Ref.scala
@@ -11,7 +11,7 @@ import org.multiverse.transactional.refs.BasicRef
 /**
  * Common trait for all the transactional objects.
  */
-@serializable trait Transactional {
+trait Transactional extends Serializable {
   val uuid: String
 }