Mopping up after the deprecation of exit and er...

Mopping up after the deprecation of exit and error. It is decidedly
non-trivial (at least for the IDE-impaired) to be completely sure of
which error function was being called when there were about twenty with
the same signature in trunk and they are being variously inherited,
imported, shadowed, etc. So although I was careful, the possibility
exists that something is now calling a different "error" function than
before. Caveat programmer.

(And let's all make it our policy not to name anything "error" or "exit"
from here on out....) No review.

5 files changed, 10 insertions, 10 deletions

diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index 77b55e288c..0e52e867ca 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -75,7 +75,7 @@ object Actor extends Combinators {
   private[actors] def rawSelf(sched: IScheduler): ReplyReactor = {
     val s = tl.get
     if (s eq null) {
-      val r = new ActorProxy(currentThread, sched)
+      val r = new ActorProxy(Thread.currentThread, sched)
       tl.set(r)
       r
     } else
@@ -98,7 +98,7 @@ object Actor extends Combinators {
   def resetProxy {
     val a = tl.get
     if ((null ne a) && a.isInstanceOf[ActorProxy])
-      tl.set(new ActorProxy(currentThread, parentScheduler))
+      tl.set(new ActorProxy(Thread.currentThread, parentScheduler))
   }
 
   /**
@@ -543,7 +543,7 @@ trait Actor extends AbstractActor with ReplyReactor with ActorCanReply with Inpu
         received = Some(TIMEOUT)
         senders = this :: senders
       } else
-        error("unhandled timeout")
+        system.error("unhandled timeout")
     }
 
     var done = false
diff --git a/src/actors/scala/actors/ActorTask.scala b/src/actors/scala/actors/ActorTask.scala
index 66c47f65a5..fd6c1f71ed 100644
--- a/src/actors/scala/actors/ActorTask.scala
+++ b/src/actors/scala/actors/ActorTask.scala
@@ -37,7 +37,7 @@ private[actors] class ActorTask(actor: Actor,
     val uncaught = UncaughtException(actor,
                                      if (msg != null) Some(msg) else None,
                                      senderInfo,
-                                     currentThread,
+                                     Thread.currentThread,
                                      e)
 
     val todo = actor.synchronized {
diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala
index ad5d83e911..d41d2ea9e8 100644
--- a/src/actors/scala/actors/Scheduler.scala
+++ b/src/actors/scala/actors/Scheduler.scala
@@ -45,7 +45,7 @@ object Scheduler extends DelegatingScheduler {
     if (sched.isInstanceOf[ForkJoinScheduler]) {
       sched.asInstanceOf[ForkJoinScheduler].snapshot()
     } else
-      error("scheduler does not implement snapshot")
+      system.error("scheduler does not implement snapshot")
   }
 
   /* Only <code>ForkJoinScheduler</code> implements this method.
@@ -55,7 +55,7 @@ object Scheduler extends DelegatingScheduler {
     if (sched.isInstanceOf[ForkJoinScheduler]) {
       sched.asInstanceOf[ForkJoinScheduler].restart()
     } else
-      error("scheduler does not implement restart")
+      system.error("scheduler does not implement restart")
   }
 
 }
diff --git a/src/actors/scala/actors/scheduler/ForkJoinScheduler.scala b/src/actors/scala/actors/scheduler/ForkJoinScheduler.scala
index 4aaef16661..c31026c3e8 100644
--- a/src/actors/scala/actors/scheduler/ForkJoinScheduler.scala
+++ b/src/actors/scala/actors/scheduler/ForkJoinScheduler.scala
@@ -160,9 +160,9 @@ class ForkJoinScheduler(val initCoreSize: Int, val maxSize: Int, daemon: Boolean
   def restart() {
     synchronized {
       if (!snapshoting)
-        error("snapshot has not been invoked")
+        system.error("snapshot has not been invoked")
       else if (isActive)
-        error("scheduler is still active")
+        system.error("scheduler is still active")
       else
         snapshoting = false
 
diff --git a/src/actors/scala/actors/scheduler/ResizableThreadPoolScheduler.scala b/src/actors/scala/actors/scheduler/ResizableThreadPoolScheduler.scala
index 89df10e19c..575a2698e5 100644
--- a/src/actors/scala/actors/scheduler/ResizableThreadPoolScheduler.scala
+++ b/src/actors/scala/actors/scheduler/ResizableThreadPoolScheduler.scala
@@ -181,9 +181,9 @@ class ResizableThreadPoolScheduler(protected val terminate: Boolean,
   def restart() {
     synchronized {
       if (!suspending)
-        error("snapshot has not been invoked")
+        system.error("snapshot has not been invoked")
       else if (isActive)
-        error("scheduler is still active")
+        system.error("scheduler is still active")
       else
         suspending = false