From 56003e8535831eb3acf482a4e7638cb6a41849ec Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Thu, 25 Mar 2010 13:14:28 +0000 Subject: Renamed Replyable* types to *CanReply. No review. --- src/actors/scala/actors/Actor.scala | 2 +- src/actors/scala/actors/ReplyReactor.scala | 2 +- src/actors/scala/actors/ReplyableActor.scala | 7 +++---- src/actors/scala/actors/ReplyableReactor.scala | 7 +++---- 4 files changed, 8 insertions(+), 10 deletions(-) (limited to 'src/actors') diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala index f374f7eccf..491c1eb075 100644 --- a/src/actors/scala/actors/Actor.scala +++ b/src/actors/scala/actors/Actor.scala @@ -384,7 +384,7 @@ object Actor extends Combinators { * @author Philipp Haller */ @serializable @SerialVersionUID(-781154067877019505L) -trait Actor extends AbstractActor with ReplyReactor with ReplyableActor { +trait Actor extends AbstractActor with ReplyReactor with ActorCanReply { /* The following two fields are only used when the actor * suspends by blocking its underlying thread, for example, diff --git a/src/actors/scala/actors/ReplyReactor.scala b/src/actors/scala/actors/ReplyReactor.scala index c933c43cf2..26057ab9cb 100644 --- a/src/actors/scala/actors/ReplyReactor.scala +++ b/src/actors/scala/actors/ReplyReactor.scala @@ -21,7 +21,7 @@ import java.util.{Timer, TimerTask} * * @author Philipp Haller */ -trait ReplyReactor extends Reactor[Any] with ReplyableReactor { +trait ReplyReactor extends Reactor[Any] with ReactorCanReply { /* A list of the current senders. The head of the list is * the sender of the message that was received last. diff --git a/src/actors/scala/actors/ReplyableActor.scala b/src/actors/scala/actors/ReplyableActor.scala index 8c68784b93..8cba425b4c 100644 --- a/src/actors/scala/actors/ReplyableActor.scala +++ b/src/actors/scala/actors/ReplyableActor.scala @@ -13,13 +13,12 @@ package scala.actors import java.util.concurrent.ExecutionException /** - * The ReplyableActor trait provides - * message send operations that may result in a - * response from the receiver. + * The ActorCanReply trait provides message send operations that + * may result in a response from the receiver. * * @author Philipp Haller */ -private[actors] trait ReplyableActor extends ReplyableReactor { +private[actors] trait ActorCanReply extends ReactorCanReply { thiz: AbstractActor with ReplyReactor => /** diff --git a/src/actors/scala/actors/ReplyableReactor.scala b/src/actors/scala/actors/ReplyableReactor.scala index bfe16eb395..c53e3a78e1 100644 --- a/src/actors/scala/actors/ReplyableReactor.scala +++ b/src/actors/scala/actors/ReplyableReactor.scala @@ -11,13 +11,12 @@ package scala.actors /** - * The ReplyableReactor trait provides - * message send operations that may result in a - * response from the receiver. + * The ReactorCanReply trait provides message send operations that + * may result in a response from the receiver. * * @author Philipp Haller */ -private[actors] trait ReplyableReactor extends CanReply[Any, Any] { +private[actors] trait ReactorCanReply extends CanReply[Any, Any] { _: ReplyReactor => /** -- cgit v1.2.3