diff options
author | Paul Phillips <paulp@improving.org> | 2011-07-16 20:40:11 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-07-16 20:40:11 +0000 |
commit | a8e5a7be9f63ef6795524e263777756f0043b8c1 (patch) | |
tree | 03b5fd02da78bfb1050490fd06b9859fa42d905b /src | |
parent | 87d050bf09c7bebaa1c3a8253d172fcc695b6ee4 (diff) | |
download | scala-a8e5a7be9f63ef6795524e263777756f0043b8c1.tar.gz scala-a8e5a7be9f63ef6795524e263777756f0043b8c1.tar.bz2 scala-a8e5a7be9f63ef6795524e263777756f0043b8c1.zip |
Removed classes and methods deprecated before 2.8.
Contributed by Simon Ochsenreither.
Diffstat (limited to 'src')
-rw-r--r-- | src/actors/scala/actors/Debug.scala | 3 | ||||
-rw-r--r-- | src/actors/scala/actors/IScheduler.scala | 17 | ||||
-rw-r--r-- | src/actors/scala/actors/KillActorControl.scala (renamed from src/actors/scala/actors/Reaction.scala) | 17 | ||||
-rw-r--r-- | src/actors/scala/actors/MessageQueue.scala | 23 | ||||
-rw-r--r-- | src/actors/scala/actors/scheduler/TerminationMonitor.scala | 4 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/Queue.scala | 19 |
6 files changed, 3 insertions, 80 deletions
diff --git a/src/actors/scala/actors/Debug.scala b/src/actors/scala/actors/Debug.scala index 30d5ae5703..cf9fb0dd56 100644 --- a/src/actors/scala/actors/Debug.scala +++ b/src/actors/scala/actors/Debug.scala @@ -42,6 +42,3 @@ private[actors] class Logger(tag: String) { def doError(b: => Unit) = if (lev > 0) b } - -@deprecated("this class is going to be removed in a future release", "2.7.7") -class Debug(tag: String) extends Logger(tag) {} diff --git a/src/actors/scala/actors/IScheduler.scala b/src/actors/scala/actors/IScheduler.scala index bf108133e2..b0bae79281 100644 --- a/src/actors/scala/actors/IScheduler.scala +++ b/src/actors/scala/actors/IScheduler.scala @@ -34,11 +34,12 @@ trait IScheduler { def executeFromActor(task: Runnable): Unit = execute(task) - /** Shuts down the scheduler. - */ + /** Shuts down the scheduler. */ def shutdown(): Unit /** When the scheduler is active, it can execute tasks. + * + * @return `'''true'''`, if the scheduler is active, otherwise false. */ def isActive: Boolean @@ -65,16 +66,4 @@ trait IScheduler { def managedBlock(blocker: scala.concurrent.ManagedBlocker): Unit - @deprecated("this member is going to be removed in a future release", "2.7.7") - def tick(a: Actor) {} - - @deprecated("this member is going to be removed in a future release", "2.7.7") - def onLockup(handler: () => Unit) {} - - @deprecated("this member is going to be removed in a future release", "2.7.7") - def onLockup(millis: Int)(handler: () => Unit) {} - - @deprecated("this member is going to be removed in a future release", "2.7.7") - def printActorDump() {} - } diff --git a/src/actors/scala/actors/Reaction.scala b/src/actors/scala/actors/KillActorControl.scala index e94d42005d..4c469f4a5d 100644 --- a/src/actors/scala/actors/Reaction.scala +++ b/src/actors/scala/actors/KillActorControl.scala @@ -14,20 +14,3 @@ import scala.util.control.ControlThrowable import java.lang.{InterruptedException, Runnable} private[actors] class KillActorControl extends ControlThrowable - -/** <p> - * The abstract class <code>Reaction</code> associates - * an instance of an <code>Actor</code> with a - * <a class="java/lang/Runnable" href="" target="contentFrame"> - * <code>java.lang.Runnable</code></a>. - * </p> - * - * @author Philipp Haller - */ -@deprecated("This class will be removed in a future release", "2.7.7") -class Reaction(a: Actor, f: PartialFunction[Any, Any], msg: Any) -extends ActorTask(a, if (f == null) (() => a.act()) else null, f, msg) { - - def this(a: Actor) = this(a, null, null) - -} diff --git a/src/actors/scala/actors/MessageQueue.scala b/src/actors/scala/actors/MessageQueue.scala index e96f3d787f..65427d68c5 100644 --- a/src/actors/scala/actors/MessageQueue.scala +++ b/src/actors/scala/actors/MessageQueue.scala @@ -8,34 +8,11 @@ package scala.actors -/** - * This class is used by our efficient message queue implementation. - * - * @author Philipp Haller - */ -@SerialVersionUID(7124278808020037465L) -@deprecated("this class is going to be removed in a future release", "2.7.7") -class MessageQueueElement(msg: Any, session: OutputChannel[Any], next: MessageQueueElement) extends MQueueElement[Any](msg, session, next) with Serializable { - def this() = this(null, null, null) - def this(msg: Any, session: OutputChannel[Any]) = this(msg, session, null) -} - private[actors] class MQueueElement[Msg >: Null](val msg: Msg, val session: OutputChannel[Any], var next: MQueueElement[Msg]) { def this() = this(null, null, null) def this(msg: Msg, session: OutputChannel[Any]) = this(msg, session, null) } -/** - * The class `MessageQueue` provides an efficient implementation of a message - * queue specialized for this actor library. Classes in this package are - * supposed to be the only clients of this class. - * - * @author Philipp Haller - */ -@SerialVersionUID(2168935872884095767L) -@deprecated("this class is going to be removed in a future release", "2.7.7") -class MessageQueue(label: String) extends MQueue[Any](label) with Serializable - private[actors] class MQueue[Msg >: Null](protected val label: String) { protected var first: MQueueElement[Msg] = null protected var last: MQueueElement[Msg] = null // last eq null iff list is empty diff --git a/src/actors/scala/actors/scheduler/TerminationMonitor.scala b/src/actors/scala/actors/scheduler/TerminationMonitor.scala index 032c10af6a..b95720fb65 100644 --- a/src/actors/scala/actors/scheduler/TerminationMonitor.scala +++ b/src/actors/scala/actors/scheduler/TerminationMonitor.scala @@ -64,10 +64,6 @@ private[scheduler] trait TerminationMonitor { started && activeActors <= 0 } - /** Deprecated non-actor-private version */ - @deprecated("this method is going to be removed in a future release", "2.7.7") - def allTerminated: Boolean = allActorsTerminated - /** Checks for actors that have become garbage. */ protected def gc() {} } diff --git a/src/library/scala/collection/immutable/Queue.scala b/src/library/scala/collection/immutable/Queue.scala index c3ae2ffa19..75c3845f04 100644 --- a/src/library/scala/collection/immutable/Queue.scala +++ b/src/library/scala/collection/immutable/Queue.scala @@ -79,14 +79,6 @@ class Queue[+A] protected(protected val in: List[A], protected val out: List[A]) * * @param elem the element to insert */ - @deprecated("Use `enqueue` instead", "2.7.2") - def +[B >: A](elem: B) = enqueue(elem) - - /** Creates a new queue with element added at the end - * of the old queue. - * - * @param elem the element to insert - */ def enqueue[B >: A](elem: B) = new Queue(elem :: in, out) /** Returns a new queue with all elements provided by an `Iterable` object @@ -97,17 +89,6 @@ class Queue[+A] protected(protected val in: List[A], protected val out: List[A]) * * @param iter an iterable object */ - @deprecated("Use `enqueue` instead", "2.7.2") - def +[B >: A](iter: Iterable[B]) = enqueue(iter) - - /** Returns a new queue with all elements provided by an `Iterable` object - * added at the end of the queue. - * - * The elements are prepended in the order they are given out by the - * iterator. - * - * @param iter an iterable object - */ def enqueue[B >: A](iter: Iterable[B]) = new Queue(iter.toList.reverse ::: in, out) |