5 files changed, 5 insertions, 5 deletions

diff --git a/sources/scala/concurrent/Channel.scala b/sources/scala/concurrent/Channel.scala
index fee66786ab..0ebc751081 100644
--- a/sources/scala/concurrent/Channel.scala
+++ b/sources/scala/concurrent/Channel.scala
@@ -1,6 +1,6 @@
 package scala.concurrent;
 
-class Channel[a] extends Monitor {
+class Channel[a] with Monitor {
   private var written: LinkedList[a] = new LinkedList;
   private var lastWritten = written;
   private var nreaders = 0;
diff --git a/sources/scala/concurrent/Lock.scala b/sources/scala/concurrent/Lock.scala
index 48431ff110..c92aab9b7c 100644
--- a/sources/scala/concurrent/Lock.scala
+++ b/sources/scala/concurrent/Lock.scala
@@ -1,6 +1,6 @@
 package scala.concurrent;
 
-class Lock extends Monitor {
+class Lock with Monitor {
   var available = true;
   def acquire = {
     if (!available) wait();
diff --git a/sources/scala/concurrent/MailBox.scala b/sources/scala/concurrent/MailBox.scala
index 576d203d89..fb50b515c9 100644
--- a/sources/scala/concurrent/MailBox.scala
+++ b/sources/scala/concurrent/MailBox.scala
@@ -1,6 +1,6 @@
 package scala.concurrent;
 
-class MailBox extends Monitor {
+class MailBox with Monitor {
 
   type Message = AnyRef;
 
diff --git a/sources/scala/concurrent/SyncChannel.scala b/sources/scala/concurrent/SyncChannel.scala
index 7f0680487d..34de081647 100644
--- a/sources/scala/concurrent/SyncChannel.scala
+++ b/sources/scala/concurrent/SyncChannel.scala
@@ -1,6 +1,6 @@
 package scala.concurrent;
 
-class SyncChannel[a] extends Monitor {
+class SyncChannel[a] with Monitor {
   private var data: a = _;
   private var reading = false;
   private var writing = false;
diff --git a/sources/scala/concurrent/SyncVar.scala b/sources/scala/concurrent/SyncVar.scala
index 4c1c6864bd..ead0d1635c 100644
--- a/sources/scala/concurrent/SyncVar.scala
+++ b/sources/scala/concurrent/SyncVar.scala
@@ -1,6 +1,6 @@
 package scala.concurrent;
 
-class SyncVar[a] extends Monitor {
+class SyncVar[a] with Monitor {
   private var isDefined: Boolean = false;
   private var value: a = _;
   def get = synchronized {