Removed various now-unnecessary java 1.4 workar...

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

1 files changed, 4 insertions, 21 deletions

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)