removed more warnings

3 files changed, 18 insertions, 17 deletions

diff --git a/src/actors/scala/actors/remote/NetKernel.scala b/src/actors/scala/actors/remote/NetKernel.scala
index f3fa57478c..c2d3723033 100644
--- a/src/actors/scala/actors/remote/NetKernel.scala
+++ b/src/actors/scala/actors/remote/NetKernel.scala
@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2005-2007, LAMP/EPFL             **
+**    / __/ __// _ | / /  / _ |    (c) 2005-2008, LAMP/EPFL             **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
@@ -54,8 +54,8 @@ class NetKernel(service: Service) {
   private val names = new HashMap[Actor, Symbol]
 
   def register(name: Symbol, a: Actor): Unit = synchronized {
-    actors += name -> a
-    names += a -> name
+    actors += Pair(name, a)
+    names += Pair(a, name)
   }
 
   def selfName = names.get(Actor.self) match {
@@ -79,7 +79,7 @@ class NetKernel(service: Service) {
 
   def createProxy(node: Node, sym: Symbol): Actor = {
     val p = new Proxy(node, sym, this)
-    proxies += Pair(node, sym) -> p
+    proxies += Pair((node, sym), p)
     p
   }
 
diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala
index 6126ecbc86..b1a2587aa1 100644
--- a/src/actors/scala/actors/remote/RemoteActor.scala
+++ b/src/actors/scala/actors/remote/RemoteActor.scala
@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2005-2007, LAMP/EPFL             **
+**    / __/ __// _ | / /  / _ |    (c) 2005-2008, LAMP/EPFL             **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
@@ -53,7 +53,7 @@ object RemoteActor {
     val serv = TcpService(port)
     val kern = serv.kernel
     val s = Actor.self
-    kernels += s -> kern
+    kernels += Pair(s, kern)
 
     Scheduler.onTerminate(s) {
       Debug.info("alive actor "+s+" terminated")
@@ -75,7 +75,7 @@ object RemoteActor {
       case None =>
         val serv = new TcpService(TcpService.generatePort)
         serv.start()
-        kernels += Actor.self -> serv.kernel
+        kernels += Pair(Actor.self, serv.kernel)
         serv.kernel
       case Some(k) =>
         k
@@ -89,7 +89,7 @@ object RemoteActor {
       // return path (sender)
       val serv = new TcpService(TcpService.generatePort)
       serv.start()
-      kernels += Actor.self -> serv.kernel
+      kernels += Pair(Actor.self, serv.kernel)
       serv.kernel
     case Some(k) =>
       k
diff --git a/src/actors/scala/actors/remote/TcpService.scala b/src/actors/scala/actors/remote/TcpService.scala
index c678a0c43c..74f03c44d5 100644
--- a/src/actors/scala/actors/remote/TcpService.scala
+++ b/src/actors/scala/actors/remote/TcpService.scala
@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2005-2007, LAMP/EPFL             **
+**    / __/ __// _ | / /  / _ |    (c) 2005-2008, LAMP/EPFL             **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
@@ -12,8 +12,8 @@
 package scala.actors.remote
 
 
-import java.lang.{Thread, SecurityException}
 import java.io.{DataInputStream, DataOutputStream, IOException}
+import java.lang.{Thread, SecurityException}
 import java.net.{InetAddress, ServerSocket, Socket, UnknownHostException}
 
 import scala.collection.mutable.HashMap
@@ -29,10 +29,11 @@ object TcpService {
 
   def apply(port: Int): TcpService =
     ports.get(port) match {
-      case Some(service) => service
+      case Some(service) =>
+        service
       case None =>
         val service = new TcpService(port)
-        ports += port -> service
+        ports += Pair(port, service)
         service.start()
         service
     }
@@ -79,14 +80,14 @@ class TcpService(port: Int) extends Thread with Service {
    */
   def send(node: Node, data: Array[Byte]): Unit = synchronized {
 
-    def bufferMsg(t: Throwable) = {
+    def bufferMsg(t: Throwable) {
       // buffer message, so that it can be re-sent
       // when remote net kernel comes up
-      pendingSends.get(node) match {
+      (pendingSends.get(node): @unchecked) match {
         case None =>
-          pendingSends += node -> (data :: Nil)
+          pendingSends += Pair(node, List(data))
         case Some(msgs) if msgs.length < TcpService.BufSize =>
-          pendingSends += node -> (data :: msgs)
+          pendingSends += Pair(node, data :: msgs)
       }
     }
 
@@ -162,7 +163,7 @@ class TcpService(port: Int) extends Thread with Service {
     new scala.collection.mutable.HashMap[Node, TcpServiceWorker]
 
   private[actors] def addConnection(node: Node, worker: TcpServiceWorker) = synchronized {
-    connections += node -> worker
+    connections += Pair(node, worker)
   }
 
   def getConnection(n: Node) = synchronized {