Refactored portability support

Author: mihaylov

src/library/scala/xml/Comment.scala

@@ -11,8 +11,8 @@
 
 package scala.xml
 
+
 import compat.StringBuilder
-import compat.Platform.IllegalArgumentException
 
 /** an XML node for comments.
  *

src/library/scala/xml/Elem.scala

@@ -12,8 +12,6 @@
 package scala.xml;
 
 
-import compat.Platform.IllegalArgumentException
-
 /** The case class <code>Elem</code> extends the Node class,
  *  providing an immutable data object representing an XML element.
  *

src/library/scala/xml/Group.scala

@@ -13,7 +13,6 @@ package scala.xml
 
 
 import compat.StringBuilder
-import compat.Platform.UnsupportedOperationException
 
 /** A hack to group XML nodes in one node for output.
  *

src/library/scala/xml/NamespaceBinding.scala

@@ -12,8 +12,8 @@
 package scala.xml
 
 
+import Predef.IllegalArgumentException
 import compat.StringBuilder
-import compat.Platform.IllegalArgumentException
 
 /** The class <code>NamespaceBinding</code> represents namespace bindings
  *  and scopes. The binding for the default namespace is treated as a null

src/library/scala/xml/PrefixedAttribute.scala

@@ -12,7 +12,6 @@
 package scala.xml
 
 import compat.StringBuilder
-import compat.Platform.UnsupportedOperationException
 
 /** prefixed attributes always have a non-null namespace.
  *  @param value the attribute value, which may not be null

src/library/scala/xml/ProcInstr.scala

@@ -13,7 +13,6 @@ package scala.xml;
 
 
 import compat.StringBuilder
-import compat.Platform.IllegalArgumentException
 
 /** an XML node for processing instructions (PI)
  *

src/library/scala/xml/Utility.scala

@@ -67,7 +67,7 @@ object Utility extends AnyRef with parsing.TokenTests {
       case "gt"   => s.append('>')
       case "amp"  => s.append('&')
       case "quot" => s.append('"')
-      case "apos" => s.append(''')
+      case "apos" => s.append('\'')
       case _   => null
     }
 
@@ -426,20 +426,20 @@ object Utility extends AnyRef with parsing.TokenTests {
     while (ch() != ';') {
       ch() match {
         case '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' =>
-          i = i * base + Character.digit(ch(), base)
+          i = i * base + ch().asDigit
         case 'a' | 'b' | 'c' | 'd' | 'e' | 'f'
            | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' =>
           if (! hex)
             reportSyntaxError("hex char not allowed in decimal char ref\n" +
                               "Did you mean to write &#x ?")
           else
-            i = i * base + Character.digit(ch(), base)
+            i = i * base + ch().asDigit
         case _ =>
           reportSyntaxError("character '" + ch() + " not allowed in char ref\n")
       }
       nextch()
     }
-    String.valueOf(i.asInstanceOf[char])
+    i.asInstanceOf[char].toString()
   }
 
 }

src/library/scala/xml/dtd/Decl.scala

@@ -13,7 +13,6 @@ package scala.xml.dtd;
 
 
 import compat.StringBuilder
-import compat.Platform.IllegalArgumentException
 
 abstract class Decl;
 

src/library/scala/xml/dtd/DocType.scala

@@ -12,8 +12,6 @@
 package scala.xml.dtd;
 
 
-import compat.Platform.IllegalArgumentException
-
 /** an XML node for document type declaration
  *
  * @author Burak Emir

src/library/scala/xml/dtd/ExternalID.scala

@@ -13,7 +13,6 @@ package scala.xml.dtd;
 
 
 import compat.StringBuilder
-import compat.Platform.IllegalArgumentException
 
 /** an ExternalIDs - either PublicID or SystemID
  *

src/library/scala/xml/parsing/FactoryAdapter.scala

@@ -13,6 +13,7 @@ package scala.xml.parsing
 
 import java.io._
 import scala.collection.mutable.{HashMap,Stack}
+import compat.StringBuilder
 
 import org.xml.sax.Attributes
 import org.xml.sax.ContentHandler
@@ -38,7 +39,7 @@ import javax.xml.parsers.SAXParser
  */
 abstract class FactoryAdapter extends DefaultHandler() {
 
-  val buffer      = new StringBuffer()
+  val buffer      = new StringBuilder()
   val attribStack = new Stack[MetaData]
   val hStack      = new Stack[Node]   // [ element ] contains siblings
   val tagStack    = new Stack[String]
@@ -87,7 +88,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
 	var i: Int = offset
         var ws = false
         while (i < offset + length) {
-          if (Character.isWhitespace(ch(i))) {
+          if (ch(i).isWhitespace) {
             if (!ws) {
               buffer.append(' ')
               ws = true
@@ -235,27 +236,28 @@ abstract class FactoryAdapter extends DefaultHandler() {
   //
 
   /** Prints the error message */
-  protected def printError(errtype: String, ex: SAXParseException): Unit = {
-    System.err.print("[")
-    System.err.print(errtype)
-    System.err.print("] ")
+  protected def printError(errtype: String, ex: SAXParseException): Unit =
+    Console.withOut(Console.err) {
+    Console.print("[")
+    Console.print(errtype)
+    Console.print("] ")
 
     var systemId = ex.getSystemId()
     if (systemId != null) {
       val index = systemId.lastIndexOf('/'.asInstanceOf[Int])
       if (index != -1)
         systemId = systemId.substring(index + 1)
-      //System.err.print(systemId)
+      //Console.print(systemId)
     }
 
-    System.err.print(':')
-    System.err.print(ex.getLineNumber())
-    System.err.print(':')
-    System.err.print(ex.getColumnNumber())
-    System.err.print(": ")
-    System.err.print(ex.getMessage())
-    System.err.println()
-    System.err.flush()
+    Console.print(':')
+    Console.print(ex.getLineNumber())
+    Console.print(':')
+    Console.print(ex.getColumnNumber())
+    Console.print(": ")
+    Console.print(ex.getMessage())
+    Console.println
+    Console.flush
   }
 
   var rootElem: Node = null:Node
@@ -276,13 +278,13 @@ abstract class FactoryAdapter extends DefaultHandler() {
       f.newSAXParser()
     } catch {
       case e: Exception =>
-        System.err.println("error: Unable to instantiate parser")
+        Console.err.println("error: Unable to instantiate parser")
         exit(1)
     }
 
     // parse file
     //try {
-      //System.err.println("[parsing \"" + source + "\"]");
+      //Console.err.println("[parsing \"" + source + "\"]");
       scopeStack.push(TopScope)
       parser.parse(source, this)
       scopeStack.pop
@@ -292,7 +294,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
         // ignore
       }
       case ( e:Exception ) => {
-        System.err.println("error: Parse error occurred - " + e.getMessage());
+        Console.err.println("error: Parse error occurred - " + e.getMessage());
         if (e.isInstanceOf[ SAXException ]) {
           (e.asInstanceOf[ SAXException ])
 	  .getException()
@@ -303,7 +305,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
       }
     } // catch
 */
-    //System.err.println("[FactoryAdapter: total #elements = "+elemCount+"]");
+    //Console.err.println("[FactoryAdapter: total #elements = "+elemCount+"]");
     rootElem
   } // loadXML
 

src/library/scala/xml/pull/XMLEventReader.scala

@@ -11,6 +11,9 @@
 
 package scala.xml.pull
 
+
+import java.lang.{Runnable, Thread}
+
 import scala.io.Source
 import scala.xml.parsing.{MarkupParser, MarkupHandler,ExternalSources}
 

src/library/scala/xml/transform/BasicTransformer.scala

@@ -12,8 +12,6 @@
 package scala.xml.transform
 
 
-import compat.Platform.UnsupportedOperationException
-
 /** A class for XML transformations.
  *
  *  @author  Burak Emir