From 3de9030dca760325555d697e3082d714f84f5df5 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 14 Apr 2011 21:05:12 +0000 Subject: Adds "since" field to @deprecated. for the patch, as it's a change I've always wanted. Moving up in the glamorous world of scala commits! No review. --- src/actors/scala/actors/Debug.scala | 2 +- src/actors/scala/actors/Future.scala | 6 +++--- src/actors/scala/actors/IScheduler.scala | 8 ++++---- src/actors/scala/actors/MessageQueue.scala | 4 ++-- src/actors/scala/actors/Reaction.scala | 2 +- src/actors/scala/actors/Scheduler.scala | 4 ++-- src/actors/scala/actors/package.scala | 12 ++++++------ src/actors/scala/actors/remote/RemoteActor.scala | 4 ++-- src/actors/scala/actors/scheduler/TerminationMonitor.scala | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/actors') diff --git a/src/actors/scala/actors/Debug.scala b/src/actors/scala/actors/Debug.scala index 17af47310d..30d5ae5703 100644 --- a/src/actors/scala/actors/Debug.scala +++ b/src/actors/scala/actors/Debug.scala @@ -43,5 +43,5 @@ private[actors] class Logger(tag: String) { if (lev > 0) b } -@deprecated("this class is going to be removed in a future release") +@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/Future.scala b/src/actors/scala/actors/Future.scala index 20e2de47a5..c6b575d0ee 100644 --- a/src/actors/scala/actors/Future.scala +++ b/src/actors/scala/actors/Future.scala @@ -27,12 +27,12 @@ abstract class Future[+T] extends Responder[T] with Function0[T] { private[actors] var fvalue: Option[Any] = None private[actors] def fvalueTyped = fvalue.get.asInstanceOf[T] - @deprecated("this member is going to be removed in a future release") + @deprecated("this member is going to be removed in a future release", "2.8.0") def ch: InputChannel[Any] = inputChannel - @deprecated("this member is going to be removed in a future release") + @deprecated("this member is going to be removed in a future release", "2.8.0") protected def value: Option[Any] = fvalue - @deprecated("this member is going to be removed in a future release") + @deprecated("this member is going to be removed in a future release", "2.8.0") protected def value_=(x: Option[Any]) { fvalue = x } /** Tests whether the future's result is available. diff --git a/src/actors/scala/actors/IScheduler.scala b/src/actors/scala/actors/IScheduler.scala index 5e0b6c0d0c..865ead58a0 100644 --- a/src/actors/scala/actors/IScheduler.scala +++ b/src/actors/scala/actors/IScheduler.scala @@ -67,16 +67,16 @@ trait IScheduler { def managedBlock(blocker: scala.concurrent.ManagedBlocker): Unit - @deprecated("this member is going to be removed in a future release") + @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") + @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") + @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") + @deprecated("this member is going to be removed in a future release", "2.7.7") def printActorDump {} } diff --git a/src/actors/scala/actors/MessageQueue.scala b/src/actors/scala/actors/MessageQueue.scala index 0e5e62b1b5..777735df23 100644 --- a/src/actors/scala/actors/MessageQueue.scala +++ b/src/actors/scala/actors/MessageQueue.scala @@ -16,7 +16,7 @@ package scala.actors * @author Philipp Haller */ @SerialVersionUID(7124278808020037465L) -@deprecated("this class is going to be removed in a future release") +@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) @@ -36,7 +36,7 @@ private[actors] class MQueueElement[Msg >: Null](val msg: Msg, val session: Outp * @author Philipp Haller */ @SerialVersionUID(2168935872884095767L) -@deprecated("this class is going to be removed in a future release") +@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) { diff --git a/src/actors/scala/actors/Reaction.scala b/src/actors/scala/actors/Reaction.scala index 6b8efc22fe..e94d42005d 100644 --- a/src/actors/scala/actors/Reaction.scala +++ b/src/actors/scala/actors/Reaction.scala @@ -24,7 +24,7 @@ private[actors] class KillActorControl extends ControlThrowable * * @author Philipp Haller */ -@deprecated("This class will be removed in a future release") +@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) { diff --git a/src/actors/scala/actors/Scheduler.scala b/src/actors/scala/actors/Scheduler.scala index 8d0cac44ea..bbdf691fad 100644 --- a/src/actors/scala/actors/Scheduler.scala +++ b/src/actors/scala/actors/Scheduler.scala @@ -40,12 +40,12 @@ object Scheduler extends DelegatingScheduler { /* Only ForkJoinScheduler implements this method. */ - @deprecated("snapshot will be removed") + @deprecated("snapshot will be removed", "2.8.0") def snapshot() { if (sched.isInstanceOf[ForkJoinScheduler]) { sched.asInstanceOf[ForkJoinScheduler].snapshot() } else - sys.error("scheduler does not implement snapshot") + sys.error("scheduler does not implement snapshot", "2.8.0") } /* Only ForkJoinScheduler implements this method. diff --git a/src/actors/scala/actors/package.scala b/src/actors/scala/actors/package.scala index 55bc8e113f..1fd9fd7699 100644 --- a/src/actors/scala/actors/package.scala +++ b/src/actors/scala/actors/package.scala @@ -20,26 +20,26 @@ package object actors { // type of Reactors tracked by termination detector private[actors] type TrackedReactor = Reactor[A] forSome { type A >: Null } - @deprecated("use scheduler.ForkJoinScheduler instead") + @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0") type FJTaskScheduler2 = scala.actors.scheduler.ForkJoinScheduler - @deprecated("use scheduler.ForkJoinScheduler instead") + @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0") type TickedScheduler = scala.actors.scheduler.ForkJoinScheduler - @deprecated("use scheduler.ForkJoinScheduler instead") + @deprecated("use scheduler.ForkJoinScheduler instead", "2.8.0") type WorkerThreadScheduler = scala.actors.scheduler.ForkJoinScheduler - @deprecated("this class is going to be removed in a future release") + @deprecated("this class is going to be removed in a future release", "2.8.0") type WorkerThread = java.lang.Thread - @deprecated("use scheduler.SingleThreadedScheduler instead") + @deprecated("use scheduler.SingleThreadedScheduler instead", "2.8.0") type SingleThreadedScheduler = scala.actors.scheduler.SingleThreadedScheduler // This used to do a blind cast and throw a CCE after the package // object was loaded. I have replaced with a variation that should work // in whatever cases that was working but fail less exceptionally for // those not intentionally using it. - @deprecated("this value is going to be removed in a future release") + @deprecated("this value is going to be removed in a future release", "2.8.0") val ActorGC = scala.actors.Scheduler.impl match { case x: scala.actors.scheduler.ActorGC => x case _ => null diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala index df2d8610b1..f6ef62bc10 100644 --- a/src/actors/scala/actors/remote/RemoteActor.scala +++ b/src/actors/scala/actors/remote/RemoteActor.scala @@ -81,7 +81,7 @@ object RemoteActor { kern } - @deprecated("this member is going to be removed in a future release") + @deprecated("this member is going to be removed in a future release", "2.8.0") def createKernelOnPort(port: Int): NetKernel = createNetKernelOnPort(port) @@ -121,7 +121,7 @@ object RemoteActor { private[remote] def someNetKernel: NetKernel = kernels.valuesIterator.next - @deprecated("this member is going to be removed in a future release") + @deprecated("this member is going to be removed in a future release", "2.8.0") def someKernel: NetKernel = someNetKernel } diff --git a/src/actors/scala/actors/scheduler/TerminationMonitor.scala b/src/actors/scala/actors/scheduler/TerminationMonitor.scala index c7e4cdda37..e4b9743ab5 100644 --- a/src/actors/scala/actors/scheduler/TerminationMonitor.scala +++ b/src/actors/scala/actors/scheduler/TerminationMonitor.scala @@ -66,7 +66,7 @@ private[scheduler] trait TerminationMonitor { } /** Deprecated non-actor-private version */ - @deprecated("this method is going to be removed in a future release") + @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. */ -- cgit v1.2.3