Removed various now-unnecessary java 1.4 workar...

Removed various now-unnecessary java 1.4 workarounds and conditional
behavior.

6 files changed, 24 insertions, 68 deletions

diff --git a/src/library/scala/Math.scala b/src/library/scala/Math.scala
index 78d8b6c3fe..4b781c69eb 100644
--- a/src/library/scala/Math.scala
+++ b/src/library/scala/Math.scala
@@ -189,16 +189,15 @@ object Math {
                                       case y if y > 0 => 1}
 
   // from Java 1.5
-//   def log10(x: Double): Double = java.lang.Math.log10(x)
-//   def cbrt(x: Double): Double = java.lang.Math.cbrt(x)
-
-//   def ulp(x: Double): Double = java.lang.Math.ulp(x)
-//   def ulp(x: Float): Float = java.lang.Math.ulp(x)
-//   def sinh(x: Double): Double = java.lang.Math.sinh(x)
-//   def cosh(x: Double): Double = java.lang.Math.cosh(x)
-//   def tanh(x: Double):Double = java.lang.Math.tanh(x)
-//   def hypot(x: Double, y: Double): Double = java.lang.Math.hypot(x, y)
-//   def expm1(x: Double): Double = java.lang.Math.expm1(x)
-//   def log1p(x: Double): Double = java.lang.Math.log1p(x)
-
+  // def log10(x: Double): Double = java.lang.Math.log10(x)
+  // def cbrt(x: Double): Double = java.lang.Math.cbrt(x)
+  //
+  // def ulp(x: Double): Double = java.lang.Math.ulp(x)
+  // def ulp(x: Float): Float = java.lang.Math.ulp(x)
+  // def sinh(x: Double): Double = java.lang.Math.sinh(x)
+  // def cosh(x: Double): Double = java.lang.Math.cosh(x)
+  // def tanh(x: Double):Double = java.lang.Math.tanh(x)
+  // def hypot(x: Double, y: Double): Double = java.lang.Math.hypot(x, y)
+  // def expm1(x: Double): Double = java.lang.Math.expm1(x)
+  // def log1p(x: Double): Double = java.lang.Math.log1p(x)
 }
diff --git a/src/library/scala/StringBuilder.scala b/src/library/scala/StringBuilder.scala
index 8329ae9216..3d06a96c0f 100644
--- a/src/library/scala/StringBuilder.scala
+++ b/src/library/scala/StringBuilder.scala
@@ -791,8 +791,8 @@ final class StringBuilder(initCapacity: Int, private val initValue: String)
       val temp2 = value(n - j)
       if (!hasSurrogate)
         hasSurrogate =
-          (temp >= StringBuilder.MIN_SURROGATE && temp <= StringBuilder.MAX_SURROGATE) ||
-       	  (temp2 >= StringBuilder.MIN_SURROGATE && temp2 <= StringBuilder.MAX_SURROGATE)
+          (temp >= Character.MIN_HIGH_SURROGATE && temp <= Character.MAX_LOW_SURROGATE) ||
+       	  (temp2 >= Character.MIN_HIGH_SURROGATE && temp2 <= Character.MAX_LOW_SURROGATE)
       value(j) = temp2
       value(n - j) = temp
       j -= 1
@@ -802,9 +802,9 @@ final class StringBuilder(initCapacity: Int, private val initValue: String)
       var i = 0
       while (i < count - 1) {
         val c2 = value(i)
-	if (StringBuilder.isLowSurrogate(c2)) {
+	if (Character.isLowSurrogate(c2)) {
           val c1 = value(i + 1)
-          if (StringBuilder.isHighSurrogate(c1)) {
+          if (Character.isHighSurrogate(c1)) {
             value(i) = c1; i += 1
             value(i) = c2
           }
@@ -843,25 +843,8 @@ final class StringBuilder(initCapacity: Int, private val initValue: String)
 }
 
 
-object StringBuilder {
-
-  private val MIN_HIGH_SURROGATE = '\uD800'
-  private val MAX_HIGH_SURROGATE = '\uDBFF'
-
-  private val MIN_LOW_SURROGATE = '\uDC00'
-  private val MAX_LOW_SURROGATE = '\uDFFF'
-
-  // constants <code>java.langCharacter.MIN-/MAX_SURROGATE</code> exist since 1.5
-  private val MIN_SURROGATE = MIN_HIGH_SURROGATE
-  private val MAX_SURROGATE = MAX_LOW_SURROGATE
-
-  // methods <code>java.langCharacter.isLow-/isHighSurrogate</code> exist since 1.5
-  private def isLowSurrogate(ch: Char): Boolean =
-    MIN_LOW_SURROGATE <= ch && ch <= MAX_LOW_SURROGATE
-
-  private def isHighSurrogate(ch: Char): Boolean =
-    MIN_HIGH_SURROGATE <= ch && ch <= MAX_HIGH_SURROGATE
-
+object StringBuilder
+{
   // method <code>java.util.Arrays.copyOf</code> exists since 1.6
   private def copyOf(src: Array[Char], newLength: Int): Array[Char] = {
     val dest = new Array[Char](newLength)
diff --git a/src/library/scala/runtime/RichString.scala b/src/library/scala/runtime/RichString.scala
index caa0f6f036..0fb6ee403e 100644
--- a/src/library/scala/runtime/RichString.scala
+++ b/src/library/scala/runtime/RichString.scala
@@ -185,11 +185,7 @@ final class RichString(val self: String) extends Proxy with RandomAccessSeq[Char
    */
   def stripMargin: String = stripMargin('|')
 
-  // NB. "\\Q" + '\\' + "\\E" works on Java 1.5 and newer, but not on Java 1.4
-  private def escape(ch: Char): String = ch match {
-    case '\\' => "\\\\"
-    case _ => "\\Q"+ch+"\\E"
-  }
+  private def escape(ch: Char): String = "\\Q" + ch + "\\E"
 
   @throws(classOf[java.util.regex.PatternSyntaxException])
   def split(separator: Char): Array[String] = self.split(escape(separator))
@@ -224,7 +220,7 @@ final class RichString(val self: String) extends Proxy with RandomAccessSeq[Char
   /** <p>
    *  Uses the underlying string as a pattern (in a fashion similar to
    *  printf in C), and uses the supplied arguments to fill in the
-   *  holes.  Only works on Java 1.5 or higher!
+   *  holes.
    *  </p>
    *  <p>
    *    The interpretation of the formatting patterns is described in
diff --git a/src/library/scala/runtime/StringAdd.scala b/src/library/scala/runtime/StringAdd.scala
index 07224fc29e..7a0d54ec36 100644
--- a/src/library/scala/runtime/StringAdd.scala
+++ b/src/library/scala/runtime/StringAdd.scala
@@ -21,7 +21,6 @@ final class StringAdd(self: Any) {
   /** Returns string formatted according to given <code>format</code> string.
    *  Format strings are as for <code>String.format</code>
    *  (@see java.lang.String.format).
-   *  Only works on Java 1.5 or higher!
    */
   def formatted(fmtstr: String): String = fmtstr format self
 }
diff --git a/src/library/scalax/collection/mutable/StringBuilder.scala b/src/library/scalax/collection/mutable/StringBuilder.scala
index 30aeba4aed..386f316f27 100755
--- a/src/library/scalax/collection/mutable/StringBuilder.scala
+++ b/src/library/scalax/collection/mutable/StringBuilder.scala
@@ -816,8 +816,8 @@ final class StringBuilder(initCapacity: Int, private val initValue: String)
       val temp2 = array(n - j)
       if (!hasSurrogate)
         hasSurrogate =
-          (temp >= StringBuilder.MIN_SURROGATE && temp <= StringBuilder.MAX_SURROGATE) ||
-       	  (temp2 >= StringBuilder.MIN_SURROGATE && temp2 <= StringBuilder.MAX_SURROGATE)
+          (temp >= Character.MIN_HIGH_SURROGATE && temp <= Character.MAX_LOW_SURROGATE) ||
+       	  (temp2 >= Character.MIN_HIGH_SURROGATE && temp2 <= Character.MAX_LOW_SURROGATE)
       array(j) = temp2
       array(n - j) = temp
       j -= 1
@@ -827,9 +827,9 @@ final class StringBuilder(initCapacity: Int, private val initValue: String)
       var i = 0
       while (i < count - 1) {
         val c2 = array(i)
-	if (StringBuilder.isLowSurrogate(c2)) {
+	if (Character.isLowSurrogate(c2)) {
           val c1 = array(i + 1)
-          if (StringBuilder.isHighSurrogate(c1)) {
+          if (Character.isHighSurrogate(c1)) {
             array(i) = c1; i += 1
             array(i) = c2
           }
@@ -857,23 +857,6 @@ object StringBuilder {
 
   type Array[T] = scala.Array[T] // !!!
 
-  private val MIN_HIGH_SURROGATE = '\uD800'
-  private val MAX_HIGH_SURROGATE = '\uDBFF'
-
-  private val MIN_LOW_SURROGATE = '\uDC00'
-  private val MAX_LOW_SURROGATE = '\uDFFF'
-
-  // constants <code>java.langCharacter.MIN-/MAX_SURROGATE</code> exist since 1.5
-  private val MIN_SURROGATE = MIN_HIGH_SURROGATE
-  private val MAX_SURROGATE = MAX_LOW_SURROGATE
-
-  // methods <code>java.langCharacter.isLow-/isHighSurrogate</code> exist since 1.5
-  private def isLowSurrogate(ch: Char): Boolean =
-    MIN_LOW_SURROGATE <= ch && ch <= MAX_LOW_SURROGATE
-
-  private def isHighSurrogate(ch: Char): Boolean =
-    MIN_HIGH_SURROGATE <= ch && ch <= MAX_HIGH_SURROGATE
-
   // method <code>java.util.Arrays.copyOf</code> exists since 1.6
   private def copyOf(src: Array[Char], newLength: Int): Array[Char] = {
     val dest = new Array[Char](newLength)
diff --git a/src/library/scalax/runtime/BoxedString.scala b/src/library/scalax/runtime/BoxedString.scala
index 67ba804576..ef5a8b43c7 100644
--- a/src/library/scalax/runtime/BoxedString.scala
+++ b/src/library/scalax/runtime/BoxedString.scala
@@ -151,11 +151,7 @@ class BoxedString(val self: String) extends StringVector[Char] with Proxy with P
    */
   def stripMargin: String = stripMargin('|')
 
-  // NB. "\\Q" + '\\' + "\\E" works on Java 1.5 and newer, but not on Java 1.4
-  private def escape(ch: Char): String = ch match {
-    case '\\' => "\\\\"
-    case _ => "\\Q"+ch+"\\E"
-  }
+  private def escape(ch: Char): String = "\\Q" + ch + "\\E"
 
   @throws(classOf[java.util.regex.PatternSyntaxException])
   def split(separator: Char): Array[String] = self.split(escape(separator))