undid import Predef._, after resolving dependen...

undid import Predef._, after resolving dependency in TopScope.

10 files changed, 1 insertions, 20 deletions

diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala
index 8a6a0cf9a5..9f88c9dc71 100644
--- a/src/library/scala/collection/Map.scala
+++ b/src/library/scala/collection/Map.scala
@@ -11,8 +11,6 @@
 
 package scala.collection;
 
-import Predef._ // strange that we need this (buraq)
-
 /** This class defines the interface of collections that unambiguously map
  *  keys to values (i.e. a key is mapped to at least one value).
  *  Class <code>Map</code> may only be used for
diff --git a/src/library/scala/collection/mutable/DefaultMapModel.scala b/src/library/scala/collection/mutable/DefaultMapModel.scala
index 2c81163a54..de7da91eb2 100644
--- a/src/library/scala/collection/mutable/DefaultMapModel.scala
+++ b/src/library/scala/collection/mutable/DefaultMapModel.scala
@@ -11,8 +11,6 @@
 
 package scala.collection.mutable;
 
-import Predef._
-
 /** This class is used internally. It implements the mutable <code>Map</code>
  *  class in terms of three functions: <code>findEntry</code>,
  *  <code>addEntry</code>, and <code>entries</code>.
diff --git a/src/library/scala/collection/mutable/LinkedList.scala b/src/library/scala/collection/mutable/LinkedList.scala
index d7e818c881..905c2539a9 100644
--- a/src/library/scala/collection/mutable/LinkedList.scala
+++ b/src/library/scala/collection/mutable/LinkedList.scala
@@ -11,8 +11,6 @@
 
 package scala.collection.mutable;
 
-import Predef._
-
 /** This class implements single linked lists where both the head (<code>elem</code>)
  *  and the tail (<code>next</code>) are mutable.
  *
diff --git a/src/library/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala
index 5c5384aede..1b7bd844fc 100644
--- a/src/library/scala/collection/mutable/Map.scala
+++ b/src/library/scala/collection/mutable/Map.scala
@@ -11,9 +11,6 @@
 
 package scala.collection.mutable;
 
-import Predef._ // strange that we need this (buraq)
-//import scala.{Tuple2 => Pair}
-
 /** This class represents mutable maps. Concrete map implementations
  *  just have to provide functionality for the abstract methods in
  *  <code>scala.collection.Map</code> as well as for <code>update</code>,
diff --git a/src/library/scala/collection/mutable/MutableList.scala b/src/library/scala/collection/mutable/MutableList.scala
index 03a5f3f606..ae3965f534 100644
--- a/src/library/scala/collection/mutable/MutableList.scala
+++ b/src/library/scala/collection/mutable/MutableList.scala
@@ -11,7 +11,6 @@
 
 package scala.collection.mutable;
 
-import Predef._
 /** This class is used internally to represent mutable lists. It is the
  *  basis for the implementation of the classes <code>Buffer</code>,
  *  <code>Stack</code>, and <code>Queue</code>.
diff --git a/src/library/scala/collection/mutable/Set.scala b/src/library/scala/collection/mutable/Set.scala
index 43accba8a8..0e3eeed654 100644
--- a/src/library/scala/collection/mutable/Set.scala
+++ b/src/library/scala/collection/mutable/Set.scala
@@ -11,8 +11,6 @@
 
 package scala.collection.mutable;
 
-import Predef._
-
 /** This class represents mutable sets. Concrete set implementations
  *  just have to provide functionality for the abstract methods in
  *  <code>scala.collection.Set</code> as well as for <code>add</code>,
diff --git a/src/library/scala/collection/mutable/SingleLinkedList.scala b/src/library/scala/collection/mutable/SingleLinkedList.scala
index 3c4506ab0e..7569dfd49d 100644
--- a/src/library/scala/collection/mutable/SingleLinkedList.scala
+++ b/src/library/scala/collection/mutable/SingleLinkedList.scala
@@ -11,7 +11,6 @@
 
 package scala.collection.mutable;
 
-import Predef._
 /** This extensible class may be used as a basis for implementing linked
  *  list. Type variable <code>A</code> refers to the element type of the
  *  list, type variable <code>This</code> is used to model self types of
diff --git a/src/library/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala
index b3126f15f2..90806e0ba3 100644
--- a/src/library/scala/collection/mutable/Stack.scala
+++ b/src/library/scala/collection/mutable/Stack.scala
@@ -11,8 +11,6 @@
 
 package scala.collection.mutable;
 
-import Predef._;
-
 /** 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/util/Fluid.scala b/src/library/scala/util/Fluid.scala
index b50c7a0dc1..0369a9519d 100644
--- a/src/library/scala/util/Fluid.scala
+++ b/src/library/scala/util/Fluid.scala
@@ -10,8 +10,6 @@
 
 package scala.util
 
-import Predef._
-
 /** Fluids provide a binding mechanism where the current
   * value is found through <em>dynamic scope</em>, but where
   * access to the fluid itself is resolved through </em>static
diff --git a/src/library/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala
index 10184fe5ce..f517c51b2b 100644
--- a/src/library/scala/xml/TopScope.scala
+++ b/src/library/scala/xml/TopScope.scala
@@ -9,8 +9,6 @@
 // $Id$
 package scala.xml;
 
-import Predef._
-
 /** top level namespace scope. only contains the predefined binding
  *  for the &quot;xml&quot; prefix which is bound to
  *  &quot;http://www.w3.org/XML/1998/namespace&quot;
@@ -19,7 +17,7 @@ case object TopScope extends NamespaceBinding(null, null, null) {
 
   override def getURI(prefix1: String): String =
     if(prefix1 == "xml" /*XML.xml*/)
-      XML.namespace;
+      "http://www.w3.org/XML/1998/namespace"
     else
       null;