diff options
author | Philipp Haller <hallerp@gmail.com> | 2007-02-27 13:18:00 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2007-02-27 13:18:00 +0000 |
commit | 5b971182c09884498db7c34730d99676ff75ed84 (patch) | |
tree | 2727f62a1134bed91742bea17cf200f9095d89a4 /src | |
parent | afbcca7ccf7d0dccd05eb1b0612e74e7f8335c25 (diff) | |
download | scala-5b971182c09884498db7c34730d99676ff75ed84.tar.gz scala-5b971182c09884498db7c34730d99676ff75ed84.tar.bz2 scala-5b971182c09884498db7c34730d99676ff75ed84.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/actors/scala/actors/ActorProxy.scala | 2 | ||||
-rw-r--r-- | src/actors/scala/actors/MessageQueue.scala | 4 | ||||
-rw-r--r-- | src/actors/scala/actors/OutputChannel.scala | 2 | ||||
-rw-r--r-- | src/actors/scala/actors/Reaction.scala | 4 | ||||
-rw-r--r-- | src/actors/scala/actors/ThreadPoolScheduler.scala | 4 | ||||
-rw-r--r-- | src/actors/scala/actors/TickedScheduler.scala | 2 | ||||
-rw-r--r-- | src/actors/scala/actors/TimerThread.scala | 7 |
7 files changed, 12 insertions, 13 deletions
diff --git a/src/actors/scala/actors/ActorProxy.scala b/src/actors/scala/actors/ActorProxy.scala index 0903e3daf2..0f6344f7c1 100644 --- a/src/actors/scala/actors/ActorProxy.scala +++ b/src/actors/scala/actors/ActorProxy.scala @@ -18,7 +18,7 @@ import java.lang.Thread * The class <code>ActorProxy</code>provides a dynamic actor proxy for normal * Java threads. * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ private[actors] class ActorProxy(t: Thread) extends Actor { diff --git a/src/actors/scala/actors/MessageQueue.scala b/src/actors/scala/actors/MessageQueue.scala index 4503065d8a..bc5ae505d6 100644 --- a/src/actors/scala/actors/MessageQueue.scala +++ b/src/actors/scala/actors/MessageQueue.scala @@ -5,7 +5,7 @@ package scala.actors * This class is used by our efficient message queue * implementation. * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ class MessageQueueElement { @@ -20,7 +20,7 @@ class MessageQueueElement { * library. Classes in this package are supposed to be the only * clients of this class. * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ class MessageQueue { diff --git a/src/actors/scala/actors/OutputChannel.scala b/src/actors/scala/actors/OutputChannel.scala index 50cde1a4fa..d430cf854e 100644 --- a/src/actors/scala/actors/OutputChannel.scala +++ b/src/actors/scala/actors/OutputChannel.scala @@ -14,7 +14,7 @@ package scala.actors * The <code>OutputChannel</code> trait provides a common interface * for all channels to which values can be sent. * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ trait OutputChannel[Msg] { diff --git a/src/actors/scala/actors/Reaction.scala b/src/actors/scala/actors/Reaction.scala index 931d2cd17b..a7d2ee47fb 100644 --- a/src/actors/scala/actors/Reaction.scala +++ b/src/actors/scala/actors/Reaction.scala @@ -19,7 +19,7 @@ import java.lang.{InterruptedException, Runnable} * return type <code>Nothing</code>. * </p> * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ private[actors] class ExitActorException extends Throwable @@ -29,7 +29,7 @@ private[actors] class ExitActorException extends Throwable * an instance of an <code>Actor</code> with a * <code>java.lang.Runnable</code>. * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ private[actors] class Reaction(a: Actor, diff --git a/src/actors/scala/actors/ThreadPoolScheduler.scala b/src/actors/scala/actors/ThreadPoolScheduler.scala index eefd9bcbe9..b7d68cfae5 100644 --- a/src/actors/scala/actors/ThreadPoolScheduler.scala +++ b/src/actors/scala/actors/ThreadPoolScheduler.scala @@ -21,7 +21,7 @@ import java.util.concurrent.{ThreadPoolExecutor, * This handler executes rejected tasks on the thread of * the scheduler. * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ private class TaskRejectedHandler(sched: ThreadPoolScheduler) extends RejectedExecutionHandler { @@ -37,7 +37,7 @@ private class TaskRejectedHandler(sched: ThreadPoolScheduler) extends RejectedEx * by the execution of actors. This scheduler is only available on Java >= 1.5 * since it uses <code>java.util.concurrent.ThreadPoolExecutor</code>.</p> * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ class ThreadPoolScheduler extends Thread with IScheduler { diff --git a/src/actors/scala/actors/TickedScheduler.scala b/src/actors/scala/actors/TickedScheduler.scala index 2d85263b6d..adc84b00c8 100644 --- a/src/actors/scala/actors/TickedScheduler.scala +++ b/src/actors/scala/actors/TickedScheduler.scala @@ -13,7 +13,7 @@ import scala.collection.mutable.{ArrayBuffer, Buffer, HashMap, Queue, Stack, Has * by the execution of actors. Unlike <code>ThreadPoolScheduler</code>, this * scheduler is available on all Java versions >= 1.4.</p> * - * @version 0.9.2 + * @version 0.9.4 * @author Philipp Haller */ class TickedScheduler extends Thread with IScheduler { diff --git a/src/actors/scala/actors/TimerThread.scala b/src/actors/scala/actors/TimerThread.scala index b0a38ca267..1c5a65959e 100644 --- a/src/actors/scala/actors/TimerThread.scala +++ b/src/actors/scala/actors/TimerThread.scala @@ -11,9 +11,8 @@ package scala.actors +import compat.Platform import java.lang.{InterruptedException, Runnable, Thread} -import java.util.Date - import scala.collection.mutable.PriorityQueue /** @@ -22,7 +21,7 @@ import scala.collection.mutable.PriorityQueue * Note that the library deletes non-received <code>TIMEOUT</code> message if a * message is received before the time-out occurs. * - * @version 0.9.2 + * @version 0.9.4 * @author Sebastien Noir, Philipp Haller */ @@ -128,5 +127,5 @@ object TimerThread extends AnyRef with Runnable { return FOREVER } - def now = new Date().getTime() + def now = Platform.currentTime } |