fixed problems with build.

31 files changed, 43 insertions, 34 deletions

diff --git a/src/actors/scala/actors/Channel.scala b/src/actors/scala/actors/Channel.scala
index f17c95f53f..700082f0dc 100644
--- a/src/actors/scala/actors/Channel.scala
+++ b/src/actors/scala/actors/Channel.scala
@@ -24,7 +24,7 @@ class SuspendActorException extends Throwable {
   }
 }
 
-case class ![a](ch: Channel[a], msg: a)
+case class ! [a](ch: Channel[a], msg: a)
 
 /**
  * This class provides a means for typed communication among
@@ -58,14 +58,16 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] {
   }
 
   def receive[R](f: PartialFunction[Any, R]): R = {
-    val C = this
+    val C = this.asInstanceOf[Channel[Any]]
+    // Martin: had to do this to get it to compiler after bug909 fix
     receiver.receive {
       case C ! msg if (f.isDefinedAt(msg)) => f(msg)
     }
   }
 
   def receiveWithin[R](msec: long)(f: PartialFunction[Any, R]): R = {
-    val C = this
+    val C = this.asInstanceOf[Channel[Any]]
+    // Martin: had to do this to get it to compiler after bug909 fix
     receiver.receiveWithin(msec) {
       case C ! msg if (f.isDefinedAt(msg)) => f(msg)
       case TIMEOUT => f(TIMEOUT)
@@ -73,14 +75,16 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] {
   }
 
   def react(f: PartialFunction[Any, Unit]): Nothing = {
-    val C = this
+    val C = this.asInstanceOf[Channel[Any]]
+    // Martin: had to do this to get it to compiler after bug909 fix
     receiver.react {
       case C ! msg if (f.isDefinedAt(msg)) => f(msg)
     }
   }
 
   def reactWithin(msec: long)(f: PartialFunction[Any, Unit]): Nothing = {
-    val C = this
+    val C = this.asInstanceOf[Channel[Any]]
+    // Martin: had to do this to get it to compiler after bug909 fix
     receiver.reactWithin(msec) {
       case C ! msg if (f.isDefinedAt(msg)) => f(msg)
       case TIMEOUT => f(TIMEOUT)
diff --git a/src/library/scala/collection/jcl/IterableWrapper.scala b/src/library/scala/collection/jcl/IterableWrapper.scala
index b904342af6..5070325454 100644
--- a/src/library/scala/collection/jcl/IterableWrapper.scala
+++ b/src/library/scala/collection/jcl/IterableWrapper.scala
@@ -27,7 +27,7 @@ trait IterableWrapper[A] extends MutableIterable[A] {
   }
   override def size = underlying.size;
   override def isEmpty = underlying.isEmpty;
-  override def clear = underlying.clear;
+  override def clear() = underlying.clear;
   override def elements : MutableIterator[A] = new IteratorWrapper(underlying.iterator);
   class IteratorWrapper(underlying : java.util.Iterator) extends MutableIterator[A] {
     // val underlying = IterableWrapper.this.underlying.iterator;
diff --git a/src/library/scala/collection/jcl/Map.scala b/src/library/scala/collection/jcl/Map.scala
index de888c08a8..46b9fc463e 100644
--- a/src/library/scala/collection/jcl/Map.scala
+++ b/src/library/scala/collection/jcl/Map.scala
@@ -15,7 +15,7 @@ package scala.collection.jcl;
  *  @author Sean McDirmid
  */
 trait Map[K,E] extends MutableIterable[Tuple2[K,E]] with scala.collection.mutable.Map[K,E] {
-  override def clear = super[MutableIterable].clear;
+  override def clear() = super[MutableIterable].clear;
   override def isEmpty = super[MutableIterable].isEmpty;
   override def keySet : Set[K] = new KeySet;
   /** The values of this map as a projection, which means
diff --git a/src/library/scala/collection/jcl/MapWrapper.scala b/src/library/scala/collection/jcl/MapWrapper.scala
index 7677c5ffca..06ffff75f7 100644
--- a/src/library/scala/collection/jcl/MapWrapper.scala
+++ b/src/library/scala/collection/jcl/MapWrapper.scala
@@ -18,7 +18,7 @@ trait MapWrapper[K,E] extends jcl.Map[K,E] {
   protected def underlying : java.util.Map;
   override def size = underlying.size;
   override def isEmpty = underlying.isEmpty;
-  override def clear = underlying.clear;
+  override def clear() = underlying.clear;
   override def put(key : K, elem : E) = {
     if (elem == null) throw new IllegalArgumentException;
     val ret = underlying.put(key,elem);
diff --git a/src/library/scala/collection/jcl/MutableIterable.scala b/src/library/scala/collection/jcl/MutableIterable.scala
index 52aab52914..75f6b01717 100644
--- a/src/library/scala/collection/jcl/MutableIterable.scala
+++ b/src/library/scala/collection/jcl/MutableIterable.scala
@@ -58,7 +58,7 @@ trait MutableIterable[A] extends Iterable[A] {
   }
   /** clear all elements from the collection.
    **/
-  def clear : Unit = {
+  def clear(): Unit = {
     val i = elements;
     while (i.hasNext) {
       i.next; i.remove;
diff --git a/src/library/scala/collection/jcl/Set.scala b/src/library/scala/collection/jcl/Set.scala
index 3589064df1..08d4013bd4 100644
--- a/src/library/scala/collection/jcl/Set.scala
+++ b/src/library/scala/collection/jcl/Set.scala
@@ -26,6 +26,7 @@ trait Set[A] extends Collection[A] with scala.collection.mutable.Set[A] {
   override def retain(f : A => Boolean) = super[Collection].retain(f);
   override def isEmpty = super[Collection].isEmpty;
   override final def contains(a : A) = has(a);
+  override def clear() = super.clear()
 
   override def transform(f : A => A) = {
     var toAdd : List[A] = Nil;
@@ -42,6 +43,9 @@ trait Set[A] extends Collection[A] with scala.collection.mutable.Set[A] {
 
   override def pfilter(p : A => Boolean) : Set[A] = new Filter(p);
   class Filter(p : A => Boolean) extends super.Filter(p) with Set[A] {
-    override def filter(p : A => Boolean) = super[Set].filter(p);
+    override def filter(p : A => Boolean): scala.collection.mutable.Set[A] = {
+      super[Set].retain(p)
+      this
+    }
   }
 }
diff --git a/src/library/scala/collection/jcl/SetWrapper.scala b/src/library/scala/collection/jcl/SetWrapper.scala
index 9388fdcea1..26e3c20fb2 100644
--- a/src/library/scala/collection/jcl/SetWrapper.scala
+++ b/src/library/scala/collection/jcl/SetWrapper.scala
@@ -17,4 +17,5 @@ package scala.collection.jcl;
 trait SetWrapper[A] extends CollectionWrapper[A] with Set[A] {
   protected def underlying: java.util.Set;
   override def isEmpty = super[Set].isEmpty;
+  override def clear() = super.clear()
 }
diff --git a/src/library/scala/collection/mutable/History.scala b/src/library/scala/collection/mutable/History.scala
index 676d798961..4143e6e9de 100644
--- a/src/library/scala/collection/mutable/History.scala
+++ b/src/library/scala/collection/mutable/History.scala
@@ -44,5 +44,5 @@ class History[A, B] extends AnyRef with Subscriber[A, B] with Iterable[Pair[B, A
 
   def size: Int = log.length
 
-  def clear: Unit = log.clear
+  def clear(): Unit = log.clear
 }
diff --git a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
index 18fd6885f6..1114b4785e 100644
--- a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
+++ b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
@@ -53,7 +53,7 @@ extends Map[A, B]
 
   def -= (key: A): Unit = { imap = imap - key }
 
-  override def clear: Unit = { imap = imap.empty }
+  override def clear(): Unit = { imap = imap.empty }
 
   override def transform(f: (A, B) => B): Unit = { imap = imap.transform(f) }
 
diff --git a/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
index 57570f327d..5c0b766303 100644
--- a/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
+++ b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
@@ -44,6 +44,6 @@ class ImmutableSetAdaptor[A](protected var set: immutable.Set[A]) extends Set[A]
 
   def -=(elem: A): Unit = { set = set - elem }
 
-  override def clear: Unit = { set = set.empty }
+  override def clear(): Unit = { set = set.empty }
 
 }
diff --git a/src/library/scala/collection/mutable/JavaMapAdaptor.scala b/src/library/scala/collection/mutable/JavaMapAdaptor.scala
index 550ef3b9d9..9b918836da 100644
--- a/src/library/scala/collection/mutable/JavaMapAdaptor.scala
+++ b/src/library/scala/collection/mutable/JavaMapAdaptor.scala
@@ -58,7 +58,7 @@ class JavaMapAdaptor[A, B](jmap: java.util.Map) extends Map[A, B] {
 
   def -= (key: A): Unit = { val x = jmap.remove(key); }
 
-  override def clear: Unit = jmap.clear()
+  override def clear(): Unit = jmap.clear()
 
   override def clone(): Map[A, B] = {
     val res = new HashMap[A, B]
diff --git a/src/library/scala/collection/mutable/JavaSetAdaptor.scala b/src/library/scala/collection/mutable/JavaSetAdaptor.scala
index 141c527caa..45c49d58d7 100644
--- a/src/library/scala/collection/mutable/JavaSetAdaptor.scala
+++ b/src/library/scala/collection/mutable/JavaSetAdaptor.scala
@@ -36,7 +36,7 @@ class JavaSetAdaptor[A](jset: java.util.Set) extends Set[A] {
 
   def -=(elem: A): Unit = { val x = jset.remove(elem); }
 
-  override def clear: Unit = jset.clear()
+  override def clear(): Unit = jset.clear()
 
   override def clone(): Set[A] = {
     val res = new HashSet[A]
diff --git a/src/library/scala/collection/mutable/LinkedHashSet.scala b/src/library/scala/collection/mutable/LinkedHashSet.scala
index c55c16201c..e38a7151e9 100644
--- a/src/library/scala/collection/mutable/LinkedHashSet.scala
+++ b/src/library/scala/collection/mutable/LinkedHashSet.scala
@@ -37,7 +37,7 @@ class LinkedHashSet[A](private val set0 : java.util.LinkedHashSet) extends Set[A
     def next = i.next().asInstanceOf[A]
   }
 
-  override def clear = set0.clear()
+  override def clear() = set0.clear()
 
   def size = set0.size()
 
diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala
index 1c248835e9..55bd75d3fd 100644
--- a/src/library/scala/collection/mutable/ListBuffer.scala
+++ b/src/library/scala/collection/mutable/ListBuffer.scala
@@ -98,7 +98,7 @@ final class ListBuffer[A] extends Buffer[A] {
 
   /** Clears the buffer contents.
    */
-  def clear: unit = {
+  def clear(): unit = {
     start = Nil
     exported = false
   }
diff --git a/src/library/scala/collection/mutable/MapProxy.scala b/src/library/scala/collection/mutable/MapProxy.scala
index 2c612b9911..3ce815403d 100644
--- a/src/library/scala/collection/mutable/MapProxy.scala
+++ b/src/library/scala/collection/mutable/MapProxy.scala
@@ -46,7 +46,7 @@ trait MapProxy[A, B] extends Map[A, B] with collection.MapProxy[A, B] {
   override def - (key1: A, key2: A, keys: A*): Map[A, B] = self.-(key1, key2, keys: _*)
   override def -- (keys: Iterable[A]): Map[A, B] = self -- keys
   override def -- (keys: Iterator[A]): Map[A, B] = self -- keys
-  override def clear: Unit = self.clear
+  override def clear(): Unit = self.clear
   override def transform(f: (A, B) => B) = self transform f
   override def retain(p: (A, B) => Boolean): Unit = self retain p
   override def <<(cmd: Message[Pair[A, B]]): Unit = self << cmd
diff --git a/src/library/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala
index 93f325cfaa..57f474f6e8 100644
--- a/src/library/scala/collection/mutable/ObservableBuffer.scala
+++ b/src/library/scala/collection/mutable/ObservableBuffer.scala
@@ -73,7 +73,7 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]] requires This
     oldelement
   }
 
-  abstract override def clear: Unit = {
+  abstract override def clear(): Unit = {
     super.clear
     publish(new Reset with Undoable {
       def undo: Unit = throw new UnsupportedOperationException("cannot undo")
diff --git a/src/library/scala/collection/mutable/ObservableMap.scala b/src/library/scala/collection/mutable/ObservableMap.scala
index 55b0cb3ede..988eaf67c6 100644
--- a/src/library/scala/collection/mutable/ObservableMap.scala
+++ b/src/library/scala/collection/mutable/ObservableMap.scala
@@ -49,7 +49,7 @@ trait ObservableMap[A, B, This <: ObservableMap[A, B, This]] requires This
       })
   }
 
-  abstract override def clear: Unit = {
+  abstract override def clear(): Unit = {
     super.clear
     publish(new Reset with Undoable {
       def undo: Unit = throw new UnsupportedOperationException("cannot undo")
diff --git a/src/library/scala/collection/mutable/ObservableSet.scala b/src/library/scala/collection/mutable/ObservableSet.scala
index f437fa8cfa..46140275c9 100644
--- a/src/library/scala/collection/mutable/ObservableSet.scala
+++ b/src/library/scala/collection/mutable/ObservableSet.scala
@@ -36,7 +36,7 @@ trait ObservableSet[A, This <: ObservableSet[A, This]] requires This
     publish(new Remove(elem) with Undoable { def undo = +=(elem) })
   }
 
-  abstract override def clear: Unit = {
+  abstract override def clear(): Unit = {
     super.clear
     publish(new Reset with Undoable {
       def undo: Unit = throw new UnsupportedOperationException("cannot undo")
diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala
index 866348af1a..4f67392381 100644
--- a/src/library/scala/collection/mutable/PriorityQueue.scala
+++ b/src/library/scala/collection/mutable/PriorityQueue.scala
@@ -128,7 +128,7 @@ class PriorityQueue[A <% Ordered[A]] extends ResizableArray[A] {
   /** Removes all elements from the queue. After this operation is completed,
    *  the queue will be empty.
    */
-  def clear: Unit = { size = 1 }
+  def clear(): Unit = { size = 1 }
 
   /** Returns an iterator which yiels all the elements of the priority
    *  queue in descending priority order.
diff --git a/src/library/scala/collection/mutable/PriorityQueueProxy.scala b/src/library/scala/collection/mutable/PriorityQueueProxy.scala
index e9a5a866ed..869caf805a 100644
--- a/src/library/scala/collection/mutable/PriorityQueueProxy.scala
+++ b/src/library/scala/collection/mutable/PriorityQueueProxy.scala
@@ -84,7 +84,7 @@ abstract class PriorityQueueProxy[A <% Ordered[A]] extends PriorityQueue[A]
   /** Removes all elements from the queue. After this operation is completed,
    *  the queue will be empty.
    */
-  override def clear: Unit = self.clear
+  override def clear(): Unit = self.clear
 
   /** Returns a regular queue containing the same elements.
    */
diff --git a/src/library/scala/collection/mutable/Queue.scala b/src/library/scala/collection/mutable/Queue.scala
index 271c8d680d..7c34c1f2ae 100644
--- a/src/library/scala/collection/mutable/Queue.scala
+++ b/src/library/scala/collection/mutable/Queue.scala
@@ -157,7 +157,7 @@ class Queue[A] extends MutableList[A] {
   /** Removes all elements from the queue. After this operation is completed,
    *  the queue will be empty.
    */
-  def clear: Unit = reset
+  def clear(): Unit = reset
 
   /** Checks if two queues are structurally identical.
    *
diff --git a/src/library/scala/collection/mutable/QueueProxy.scala b/src/library/scala/collection/mutable/QueueProxy.scala
index 21d3635241..e882303db2 100644
--- a/src/library/scala/collection/mutable/QueueProxy.scala
+++ b/src/library/scala/collection/mutable/QueueProxy.scala
@@ -83,7 +83,7 @@ trait QueueProxy[A] extends Queue[A] with SeqProxy[A] {
   /** Removes all elements from the queue. After this operation is completed,
    *  the queue will be empty.
    */
-  override def clear: Unit = self.clear
+  override def clear(): Unit = self.clear
 
   /** Returns an iterator over all elements on the queue.
    *
diff --git a/src/library/scala/collection/mutable/SetProxy.scala b/src/library/scala/collection/mutable/SetProxy.scala
index b13132c682..0cba74da40 100644
--- a/src/library/scala/collection/mutable/SetProxy.scala
+++ b/src/library/scala/collection/mutable/SetProxy.scala
@@ -44,7 +44,7 @@ trait SetProxy[A] extends Set[A] with collection.SetProxy[A] {
 
   override def intersect(that: Set[A]): Unit = self.intersect(that)
 
-  override def clear: Unit = self.clear
+  override def clear(): Unit = self.clear
 
   override def retain(p: A => Boolean): Unit =  self.retain(p)
 
diff --git a/src/library/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala
index e3aa316c21..e3890d22df 100644
--- a/src/library/scala/collection/mutable/Stack.scala
+++ b/src/library/scala/collection/mutable/Stack.scala
@@ -83,7 +83,7 @@ class Stack[A] extends MutableList[A] {
    * Removes all elements from the stack. After this operation completed,
    * the stack will be empty.
    */
-  def clear: Unit = reset
+  def clear(): Unit = reset
 
   /** Returns an iterator over all elements on the stack. This iterator
    *  is stable with respect to state changes in the stack object; i.e.
diff --git a/src/library/scala/collection/mutable/StackProxy.scala b/src/library/scala/collection/mutable/StackProxy.scala
index f48d186b50..24b8d743e3 100644
--- a/src/library/scala/collection/mutable/StackProxy.scala
+++ b/src/library/scala/collection/mutable/StackProxy.scala
@@ -83,7 +83,7 @@ trait StackProxy[A] extends Stack[A] with SeqProxy[A] {
    * Removes all elements from the stack. After this operation completed,
    * the stack will be empty.
    */
-  override def clear: Unit = self.clear
+  override def clear(): Unit = self.clear
 
   /** Returns an iterator over all elements on the stack. This iterator
    *  is stable with respect to state changes in the stack object; i.e.
diff --git a/src/library/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
index fc37575bac..652c6d535b 100644
--- a/src/library/scala/collection/mutable/SynchronizedBuffer.scala
+++ b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
@@ -164,7 +164,7 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
 
   /** Clears the buffer contents.
    */
-  abstract override def clear: Unit = synchronized {
+  abstract override def clear(): Unit = synchronized {
     super.clear
   }
 
diff --git a/src/library/scala/collection/mutable/SynchronizedMap.scala b/src/library/scala/collection/mutable/SynchronizedMap.scala
index 88b8d72404..785e061a4e 100644
--- a/src/library/scala/collection/mutable/SynchronizedMap.scala
+++ b/src/library/scala/collection/mutable/SynchronizedMap.scala
@@ -114,7 +114,7 @@ trait SynchronizedMap[A, B] extends Map[A, B] {
     super.excl(keys: _*)
   }
 
-  override def clear: Unit = synchronized {
+  override def clear(): Unit = synchronized {
     super.clear
   }
 
diff --git a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
index b4a8ebde19..26edf0d68d 100644
--- a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
+++ b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
@@ -69,7 +69,7 @@ class SynchronizedPriorityQueue[A <% Ordered[A]] extends PriorityQueue[A] {
   /** Removes all elements from the queue. After this operation is completed,
    *  the queue will be empty.
    */
-  override def clear: Unit = synchronized { super.clear }
+  override def clear(): Unit = synchronized { super.clear }
 
   /** Returns an iterator which yiels all the elements of the priority
    *  queue in descending priority order.
diff --git a/src/library/scala/collection/mutable/SynchronizedQueue.scala b/src/library/scala/collection/mutable/SynchronizedQueue.scala
index dece14cd5b..19f4813301 100644
--- a/src/library/scala/collection/mutable/SynchronizedQueue.scala
+++ b/src/library/scala/collection/mutable/SynchronizedQueue.scala
@@ -72,7 +72,7 @@ class SynchronizedQueue[A] extends Queue[A] {
   /** Removes all elements from the queue. After this operation is completed,
    *  the queue will be empty.
    */
-  override def clear: Unit = synchronized { super.clear }
+  override def clear(): Unit = synchronized { super.clear }
 
   /** Checks if two queues are structurally identical.
    *
diff --git a/src/library/scala/collection/mutable/SynchronizedSet.scala b/src/library/scala/collection/mutable/SynchronizedSet.scala
index 588f42853a..9c11519ba4 100644
--- a/src/library/scala/collection/mutable/SynchronizedSet.scala
+++ b/src/library/scala/collection/mutable/SynchronizedSet.scala
@@ -72,7 +72,7 @@ trait SynchronizedSet[A] extends Set[A] {
     super.intersect(that)
   }
 
-  abstract override def clear: Unit = synchronized {
+  abstract override def clear(): Unit = synchronized {
     super.clear
   }
 
diff --git a/src/library/scala/collection/mutable/SynchronizedStack.scala b/src/library/scala/collection/mutable/SynchronizedStack.scala
index 6b774f2dd2..c1acb68792 100644
--- a/src/library/scala/collection/mutable/SynchronizedStack.scala
+++ b/src/library/scala/collection/mutable/SynchronizedStack.scala
@@ -72,7 +72,7 @@ class SynchronizedStack[A] extends Stack[A] {
    * Removes all elements from the stack. After this operation completed,
    * the stack will be empty.
    */
-  override def clear: Unit = synchronized { super.clear }
+  override def clear(): Unit = synchronized { super.clear }
 
   /** Returns an iterator over all elements on the stack. This iterator
    *  is stable with respect to state changes in the stack object; i.e.