*** empty log message ***

2 files changed, 2 insertions, 19 deletions

diff --git a/sources/scala/concurrent/Actor.scala b/sources/scala/concurrent/Actor.scala
index dd4cee26d2..0e8caa4b7f 100644
--- a/sources/scala/concurrent/Actor.scala
+++ b/sources/scala/concurrent/Actor.scala
@@ -1,22 +1,5 @@
 package scala.concurrent;
 
-abstract class Actor extends Thread() {
-
-  type Message = AnyRef;
-
-  private val mb = new MailBox;
-
-  def send(msg: Message): unit =
-    mb.send(msg);
-
-  def receive[a](f: PartialFunction[Message, a]): a =
-    mb.receive(f);
-
-  def receiveWithin[a](msec: long)(f: PartialFunction[Message, a]): a =
-    mb.receiveWithin(msec)(f);
-}
-
-
-
+abstract class Actor extends Thread with MailBox;
 
 
diff --git a/sources/scala/concurrent/MailBox.scala b/sources/scala/concurrent/MailBox.scala
index f173a2912f..d8c59c774b 100644
--- a/sources/scala/concurrent/MailBox.scala
+++ b/sources/scala/concurrent/MailBox.scala
@@ -1,7 +1,7 @@
 package scala.concurrent;
 
 //class MailBox with Monitor with LinkedListQueueCreator {
-class MailBox extends Monitor with ListQueueCreator {
+class MailBox with Monitor with ListQueueCreator {
 
   type Message = AnyRef;