undid consolidation in object XML, and added im...

undid consolidation in object XML, and added import Predef._ to all
files that needed it. strange.

16 files changed, 29 insertions, 26 deletions

diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala
index 7b517f8c29..8a6a0cf9a5 100644
--- a/src/library/scala/collection/Map.scala
+++ b/src/library/scala/collection/Map.scala
@@ -11,6 +11,7 @@
 
 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).
@@ -30,7 +31,6 @@ trait Map[A, +B] extends AnyRef
       with PartialFunction[A, B]
       with Iterable[Pair[A, B]]
 {
-
     /** Compute the number of key-to-value mappings.
      *
      *  @return the number of mappings
diff --git a/src/library/scala/collection/mutable/DefaultMapModel.scala b/src/library/scala/collection/mutable/DefaultMapModel.scala
index d910a54f61..2c81163a54 100644
--- a/src/library/scala/collection/mutable/DefaultMapModel.scala
+++ b/src/library/scala/collection/mutable/DefaultMapModel.scala
@@ -11,6 +11,7 @@
 
 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>,
diff --git a/src/library/scala/collection/mutable/LinkedList.scala b/src/library/scala/collection/mutable/LinkedList.scala
index e5045950d6..d7e818c881 100644
--- a/src/library/scala/collection/mutable/LinkedList.scala
+++ b/src/library/scala/collection/mutable/LinkedList.scala
@@ -11,6 +11,7 @@
 
 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 5437311425..5c5384aede 100644
--- a/src/library/scala/collection/mutable/Map.scala
+++ b/src/library/scala/collection/mutable/Map.scala
@@ -11,6 +11,8 @@
 
 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
@@ -25,7 +27,6 @@ trait Map[A, B] extends AnyRef
       with collection.Map[A, B]
       with Scriptable[Message[Pair[A, B]]]
 {
-
   /** This method allows one to add a new mapping from <code>key</code>
    *  to <code>value</code> to the map. If the map already contains a
    *  mapping for <code>key</code>, it will be overridden by this
diff --git a/src/library/scala/collection/mutable/MutableList.scala b/src/library/scala/collection/mutable/MutableList.scala
index f7c8999feb..03a5f3f606 100644
--- a/src/library/scala/collection/mutable/MutableList.scala
+++ b/src/library/scala/collection/mutable/MutableList.scala
@@ -11,7 +11,7 @@
 
 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 0bb13bb7aa..43accba8a8 100644
--- a/src/library/scala/collection/mutable/Set.scala
+++ b/src/library/scala/collection/mutable/Set.scala
@@ -11,6 +11,7 @@
 
 package scala.collection.mutable;
 
+import Predef._
 
 /** This class represents mutable sets. Concrete set implementations
  *  just have to provide functionality for the abstract methods in
diff --git a/src/library/scala/collection/mutable/SingleLinkedList.scala b/src/library/scala/collection/mutable/SingleLinkedList.scala
index 00346e83db..3c4506ab0e 100644
--- a/src/library/scala/collection/mutable/SingleLinkedList.scala
+++ b/src/library/scala/collection/mutable/SingleLinkedList.scala
@@ -11,7 +11,7 @@
 
 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 ad0efa7111..b3126f15f2 100644
--- a/src/library/scala/collection/mutable/Stack.scala
+++ b/src/library/scala/collection/mutable/Stack.scala
@@ -11,6 +11,7 @@
 
 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 3858f21c26..b50c7a0dc1 100644
--- a/src/library/scala/util/Fluid.scala
+++ b/src/library/scala/util/Fluid.scala
@@ -10,6 +10,7 @@
 
 package scala.util
 
+import Predef._
 
 /** Fluids provide a binding mechanism where the current
   * value is found through <em>dynamic scope</em>, but where
diff --git a/src/library/scala/xml/PrettyPrinter.scala b/src/library/scala/xml/PrettyPrinter.scala
index ce906a56b4..904ff2fdb2 100644
--- a/src/library/scala/xml/PrettyPrinter.scala
+++ b/src/library/scala/xml/PrettyPrinter.scala
@@ -8,7 +8,6 @@
 
 // $Id$
 
-
 package scala.xml;
 
 
@@ -153,11 +152,10 @@ class PrettyPrinter( width:Int, step:Int ) {
         val test = {
 	  val sb = new StringBuffer();
 	  Utility.toXML(node, pscope, sb, false);
-          val tb = if(node.attribute(XML.namespace, XML.space) == XML.preserve)
+          if(node.attribute("http://www.w3.org/XML/1998/namespace", "space") == "preserve")
 	    sb.toString();
 	  else
-	    TextBuffer.fromString(sb.toString());
-	  tb.toText(0)._data
+	    TextBuffer.fromString(sb.toString()).toText(0)._data;
 	};
         if(childrenAreLeaves(node) && fits(test)) {
           makeBox( ind, test );
diff --git a/src/library/scala/xml/ProcInstr.scala b/src/library/scala/xml/ProcInstr.scala
index 11cf53f4d8..b9bdce1454 100644
--- a/src/library/scala/xml/ProcInstr.scala
+++ b/src/library/scala/xml/ProcInstr.scala
@@ -28,7 +28,7 @@ case class ProcInstr(target:String, proctext:String) extends SpecialNode {
 
   final override def typeTag$:Int = -2;
 
-  val z:Seq[Char] = target; z match {
+  val z:Seq[Char] = Predef.string2seq(target); z match {
     case Seq('X'|'x','M'|'m','L'|'l') =>
       throw new IllegalArgumentException(target+" is reserved");
     case _ =>
diff --git a/src/library/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala
index 7d22211cf2..10184fe5ce 100644
--- a/src/library/scala/xml/TopScope.scala
+++ b/src/library/scala/xml/TopScope.scala
@@ -18,14 +18,14 @@ import Predef._
 case object TopScope extends NamespaceBinding(null, null, null) {
 
   override def getURI(prefix1: String): String =
-    if(prefix1 == XML.prefix)
+    if(prefix1 == "xml" /*XML.xml*/)
       XML.namespace;
     else
       null;
 
   override def getPrefix(uri1: String): String =
-    if(uri1 == XML.namespace)
-	  XML.prefix;
+    if(uri1 == "http://www.w3.org/XML/1998/namespace" /*XML.namespace*/)
+	  "xml" //XML.xml
     else
       null;
 
diff --git a/src/library/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala
index c887568630..618f39e568 100644
--- a/src/library/scala/xml/Utility.scala
+++ b/src/library/scala/xml/Utility.scala
@@ -128,7 +128,7 @@ object Utility extends AnyRef with parsing.TokenTests {
 
   /** returns prefix of qualified name if any */
   final def prefix(name: String): Option[String] = {
-    val i = name.indexOf(':');
+    val i = name.indexOf(':'.asInstanceOf[Int]);
     if( i != -1 ) Some( name.substring(0, i) ) else None
   }
 
@@ -189,7 +189,7 @@ object Utility extends AnyRef with parsing.TokenTests {
    * @param sb
    */
   def appendQuoted(s: String, sb: StringBuffer) = {
-    val ch = if (s.indexOf('"') == -1) '"' else '\'';
+    val ch = if (s.indexOf('"'.asInstanceOf[Int]) == -1) '"' else '\'';
     sb.append(ch).append(s).append(ch)
   }
 
@@ -201,7 +201,7 @@ object Utility extends AnyRef with parsing.TokenTests {
    */
   def appendEscapedQuoted(s: String, sb: StringBuffer) = {
     sb.append('"');
-    val z:Seq[Char] = s;
+    val z:Seq[Char] = Predef.string2seq(s);
     for( val c <- z ) c match {
       case '"' => sb.append('\\'); sb.append('"');
       case _   => sb.append( c );
diff --git a/src/library/scala/xml/XML.scala b/src/library/scala/xml/XML.scala
index 84491843c8..9ca2943440 100644
--- a/src/library/scala/xml/XML.scala
+++ b/src/library/scala/xml/XML.scala
@@ -20,7 +20,7 @@ import org.xml.sax.InputSource;
 **/
 object XML  {
 
-  val prefix    = "xml"
+  val xml       = "xml"
   val xmlns     = "xmlns"
   val namespace = "http://www.w3.org/XML/1998/namespace"
   val preserve  = "preserve";
diff --git a/src/library/scala/xml/parsing/FactoryAdapter.scala b/src/library/scala/xml/parsing/FactoryAdapter.scala
index d98f13eec5..54a5f21c6e 100644
--- a/src/library/scala/xml/parsing/FactoryAdapter.scala
+++ b/src/library/scala/xml/parsing/FactoryAdapter.scala
@@ -11,7 +11,6 @@
 
 package scala.xml.parsing;
 
-
 import java.io._ ;
 import scala.collection.mutable.{HashMap,Stack};
 
@@ -124,7 +123,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
       tagStack.push(curTag);
       curTag = qname; //localName ;
 
-      val colon = qname.indexOf(':');
+      val colon = qname.indexOf(':'.asInstanceOf[Int]);
       val localName = if(-1 == colon) qname else qname.substring(colon+1,qname.length());
 
       //Console.println("FactoryAdapter::startElement - localName ="+localName);
@@ -139,18 +138,18 @@ abstract class FactoryAdapter extends DefaultHandler() {
         //val attrType = attributes.getType(i); // unused for now
         val qname = attributes.getQName(i);
         val value = attributes.getValue(i);
-        val colon = qname.indexOf(':');
+        val colon = qname.indexOf(':'.asInstanceOf[Int]);
         if(-1 != colon) {                     // prefixed attribute
           val pre = qname.substring(0, colon);
           val key = qname.substring(colon+1, qname.length());
-          if(XML.xmlns == pre)
+          if("xmlns" /*XML.xmlns*/ == pre)
             scpe = value.length() match {
               case 0 => new NamespaceBinding(key, null,  scpe);
               case _ => new NamespaceBinding(key, value, scpe);
             }
           else
               m = new PrefixedAttribute(pre, key, value, m);
-        } else if(XML.xmlns == qname)
+        } else if("xmlns" /*XML.xmlns*/ == qname)
           scpe = value.length() match {
             case 0 => new NamespaceBinding(null, null,  scpe);
             case _ => new NamespaceBinding(null, value, scpe);
@@ -195,7 +194,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
         child = hStack.pop;
       }
 
-      val colon = qname.indexOf(':');
+      val colon = qname.indexOf(':'.asInstanceOf[Int]);
       val localName = if(-1 == colon) qname else qname.substring(colon+1,qname.length());
 
       val scp = scopeStack.pop;
@@ -249,7 +248,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
 
         var systemId = ex.getSystemId();
         if (systemId != null) {
-            val index = systemId.lastIndexOf('/');
+            val index = systemId.lastIndexOf('/'.asInstanceOf[Int]);
             if (index != -1)
                 systemId = systemId.substring(index + 1);
             //System.err.print(systemId);
diff --git a/src/library/scala/xml/parsing/TokenTests.scala b/src/library/scala/xml/parsing/TokenTests.scala
index 1b5ec0b4ec..f5c2dc1be7 100644
--- a/src/library/scala/xml/parsing/TokenTests.scala
+++ b/src/library/scala/xml/parsing/TokenTests.scala
@@ -72,7 +72,7 @@ trait TokenTests {
    */
   def isName(s: String): Boolean = {
     if( s.length() > 0 ) {
-      val z:Seq[Char] = s;
+      val z:Seq[Char] = Predef.string2seq(s);
       val y           = z.elements;
       if (isNameStart(y.next)) {
         while (y.hasNext && isNameChar(y.next)) {};
@@ -126,13 +126,13 @@ trait TokenTests {
   } // isValidIANAEncoding(String): Boolean
 
   def checkSysID( s:String ): Boolean = {
-    s.indexOf('"') == -1 || s.indexOf('\'') == -1
+    s.indexOf('"'.asInstanceOf[Int]) == -1 || s.indexOf('\''.asInstanceOf[Int]) == -1
   }
 
   def checkPubID(s: String): Boolean = {
     //Console.println("checkPubID of \""+s+"\"");
     if (s.length() > 0) {
-      val z: Seq[Char] = s;
+      val z: Seq[Char] = Predef.string2seq(s);
       val y = z.elements;
       var c = ' ';
       while (y.hasNext && isPubIDChar(c)) {