Various tweaks to give us relief from those fil...

Various tweaks to give us relief from those files which are endlessly
recompiled by ant (mostly, whenever there is a source file which does
not generate a class of the same name.)

7 files changed, 24 insertions, 9 deletions

diff --git a/src/library/scala/collection/immutable/TreeHashMap.scala b/src/library/scala/collection/immutable/TreeHashMap.scala
index 0310088ccd..418003f7d3 100644
--- a/src/library/scala/collection/immutable/TreeHashMap.scala
+++ b/src/library/scala/collection/immutable/TreeHashMap.scala
@@ -1,4 +1,3 @@
-/* TODO: Reintegrate
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2008-2009, David MacIver         **
@@ -11,6 +10,11 @@
 
 package scala.collection.immutable
 
+// A dummy to fool ant until reintegration.
+class TreeHashMap
+
+/* TODO: Reintegrate
+
 object TreeHashMap {
   private[TreeHashMap] val _empty = new TreeHashMap[Any, Nothing](IntMap.empty[Nothing]);
   def empty[Key, Value] : TreeHashMap[Key, Value] = _empty.asInstanceOf[TreeHashMap[Key, Value]];
diff --git a/src/library/scala/collection/mutable/PriorityQueueProxy.scala b/src/library/scala/collection/mutable/PriorityQueueProxy.scala
index 1ac00081a8..ec5cbb8902 100644
--- a/src/library/scala/collection/mutable/PriorityQueueProxy.scala
+++ b/src/library/scala/collection/mutable/PriorityQueueProxy.scala
@@ -1,4 +1,3 @@
-/* TODO: Reintegrate
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2003-2009, LAMP/EPFL             **
@@ -9,9 +8,12 @@
 
 // $Id$
 
-
 package scala.collection.mutable
 
+// A dummy to fool ant until reintegration.
+abstract class PriorityQueueProxy
+
+/* TODO: Reintegrate
 
 /** This class implements priority queues using a heap. The
  *  elements of the queue have to be ordered in terms of the
diff --git a/src/library/scala/collection/mutable/QueueProxy.scala b/src/library/scala/collection/mutable/QueueProxy.scala
index cdd37c2ba2..b6ea063706 100644
--- a/src/library/scala/collection/mutable/QueueProxy.scala
+++ b/src/library/scala/collection/mutable/QueueProxy.scala
@@ -1,4 +1,3 @@
-/* TODO: Reintegrate
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2003-2009, LAMP/EPFL             **
@@ -12,6 +11,10 @@
 
 package scala.collection.mutable
 
+// A dummy to fool ant until reintegration.
+trait QueueProxy
+
+/* TODO: Reintegrate
 
 /** <code>Queue</code> objects implement data structures that allow to
  *  insert and retrieve elements in a first-in-first-out (FIFO) manner.
diff --git a/src/library/scala/collection/mutable/RevertibleHistory.scala b/src/library/scala/collection/mutable/RevertibleHistory.scala
index 7f79a74429..f9a9df9f5d 100644
--- a/src/library/scala/collection/mutable/RevertibleHistory.scala
+++ b/src/library/scala/collection/mutable/RevertibleHistory.scala
@@ -6,13 +6,13 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id: RevertableHistory.scala 16893 2009-01-13 13:09:22Z cunei $
+// $Id: RevertibleHistory.scala 16893 2009-01-13 13:09:22Z cunei $
 
 
 package scala.collection.mutable
 
 
-/** A revertable history is a <code>History</code> object which supports
+/** A revertible history is a <code>History</code> object which supports
  *  an undo operation. Type variable <code>A</code> refers to the type
  *  of the published events, <code>B</code> denotes the publisher type.
  *  Type <code>B</code> is typically a subtype of <code>Publisher</code>.
@@ -21,7 +21,7 @@ package scala.collection.mutable
  *  @version 1.0, 08/07/2003
  */
 @serializable
-class RevertableHistory[A <: Undoable, B] extends History[A, B] with Undoable {
+class RevertibleHistory[A <: Undoable, B] extends History[A, B] with Undoable {
 
   /** Rollback the full history.
    */
diff --git a/src/library/scala/collection/mutable/StackProxy.scala b/src/library/scala/collection/mutable/StackProxy.scala
index a421abce70..8c86bc95a8 100644
--- a/src/library/scala/collection/mutable/StackProxy.scala
+++ b/src/library/scala/collection/mutable/StackProxy.scala
@@ -1,4 +1,3 @@
-/* TODO: Reintegrate
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2003-2009, LAMP/EPFL             **
@@ -12,6 +11,10 @@
 
 package scala.collection.mutable
 
+// A dummy to fool ant until reintegration.
+trait StackProxy
+
+/* TODO: Reintegrate
 
 /** A stack implements a data structure which allows to store and retrieve
  *  objects in a last-in-first-out (LIFO) fashion.
diff --git a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
index e82e65a3d2..2025e2d16a 100644
--- a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
+++ b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
@@ -1,4 +1,3 @@
-/* TODO: Reintegrate
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2003-2009, LAMP/EPFL             **
@@ -12,6 +11,10 @@
 
 package scala.collection.mutable
 
+// A dummy to fool ant until reintegration.
+class SynchronizedPriorityQueue
+
+/* TODO: Reintegrate
 
 /** This class implements synchronized priority queues using a heap.
  *  The elements of the queue have to be ordered in terms of the
diff --git a/src/library/scala/util/ClassLoader.scala b/src/library/scala/util/ScalaClassLoader.scala
index 56ed6c70c2..56ed6c70c2 100644
--- a/src/library/scala/util/ClassLoader.scala
+++ b/src/library/scala/util/ScalaClassLoader.scala