2008-05-05 Andrew John Hughes <gnu_andrew@member.fsf.org>

	PR classpath/21869
	* gnu/java/util/Base64.java,
	* gnu/java/util/prefs/NodeWriter.java,
	* gnu/java/util/regex/RE.java,
	* gnu/java/util/regex/REException.java,
	* gnu/java/util/regex/REMatch.java,
	* gnu/java/util/regex/REMatchEnumeration.java,
	* gnu/java/util/regex/REToken.java,
	* gnu/java/util/regex/RETokenAny.java,
	* gnu/java/util/regex/RETokenBackRef.java,
	* gnu/java/util/regex/RETokenChar.java,
	* gnu/java/util/regex/RETokenEnd.java,
	* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
	* gnu/java/util/regex/RETokenEndSub.java,
	* gnu/java/util/regex/RETokenIndependent.java,
	* gnu/java/util/regex/RETokenLookAhead.java,
	* gnu/java/util/regex/RETokenLookBehind.java,
	* gnu/java/util/regex/RETokenNamedProperty.java,
	* gnu/java/util/regex/RETokenOneOf.java,
	* gnu/java/util/regex/RETokenPOSIX.java,
	* gnu/java/util/regex/RETokenRange.java,
	* gnu/java/util/regex/RETokenRepeated.java,
	* gnu/java/util/regex/RETokenStart.java,
	* gnu/java/util/regex/RETokenWordBoundary.java:
	Swap use of StringBuffer for CPStringBuilder,

23 files changed, 95 insertions, 38 deletions

diff --git a/gnu/java/util/Base64.java b/gnu/java/util/Base64.java
index 592696bcc..4401a151a 100644
--- a/gnu/java/util/Base64.java
+++ b/gnu/java/util/Base64.java
@@ -83,6 +83,8 @@ DAMAGES.  */
 
 package gnu.java.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
@@ -143,7 +145,7 @@ public final class Base64
     int srcLength = buf.length - offset;
     byte[] input = new byte[3];
     int[] output = new int[4];
-    StringBuffer out = new StringBuffer();
+    CPStringBuilder out = new CPStringBuilder();
     int i = offset;
     int chars = 0;
 
diff --git a/gnu/java/util/prefs/NodeWriter.java b/gnu/java/util/prefs/NodeWriter.java
index 231c047da..d3c095351 100644
--- a/gnu/java/util/prefs/NodeWriter.java
+++ b/gnu/java/util/prefs/NodeWriter.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.prefs;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -273,7 +275,7 @@ public class NodeWriter {
                                     throws BackingStoreException, IOException
     {
         // construct String used for indentation
-        StringBuffer indentBuffer = new StringBuffer(2*indent);
+        CPStringBuilder indentBuffer = new CPStringBuilder(2*indent);
         for (int i=0; i < indent; i++)
             indentBuffer.append("  ");
         String indentString = indentBuffer.toString();
diff --git a/gnu/java/util/regex/RE.java b/gnu/java/util/regex/RE.java
index 421640ff2..2b0348848 100644
--- a/gnu/java/util/regex/RE.java
+++ b/gnu/java/util/regex/RE.java
@@ -36,6 +36,9 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.InputStream;
 import java.io.Serializable;
 import java.util.Locale;
@@ -348,6 +351,12 @@ public class RE extends REToken {
     } else if (patternObj instanceof StringBuffer) {
       pattern = new char [((StringBuffer) patternObj).length()];
       ((StringBuffer) patternObj).getChars(0,pattern.length,pattern,0);
+    } else if (patternObj instanceof StringBuilder) {
+      pattern = new char [((StringBuilder) patternObj).length()];
+      ((StringBuilder) patternObj).getChars(0,pattern.length,pattern,0);
+    } else if (patternObj instanceof CPStringBuilder) {
+      pattern = new char [((CPStringBuilder) patternObj).length()];
+      ((CPStringBuilder) patternObj).getChars(0,pattern.length,pattern,0);
     } else {
 	pattern = patternObj.toString().toCharArray();
     }
@@ -1237,7 +1246,7 @@ public class RE extends REToken {
 	    }
 	    ++index;
 	  } else if ((ch == '[') && (syntax.get(RESyntax.RE_CHAR_CLASSES)) && (index < pLength) && (pattern[index] == ':')) {
-	    StringBuffer posixSet = new StringBuffer();
+	    CPStringBuilder posixSet = new CPStringBuilder();
 	    index = getPosixSet(pattern,index+1,posixSet);
 	    int posixId = RETokenPOSIX.intValue(posixSet.toString());
 	    if (posixId != -1) {
@@ -1727,11 +1736,11 @@ public class RE extends REToken {
    * @param eflags The logical OR of any execution flags above.
    * @param buffer The StringBuffer to save pre-match text in.
    * @return An REMatch instance referencing the match, or null if none.  */
-  public REMatch getMatch(Object input, int index, int eflags, StringBuffer buffer) {
+  public REMatch getMatch(Object input, int index, int eflags, CPStringBuilder buffer) {
     return getMatchImpl(makeCharIndexed(input,index),index,eflags,buffer);
   }
 
-  REMatch getMatchImpl(CharIndexed input, int anchor, int eflags, StringBuffer buffer) {
+  REMatch getMatchImpl(CharIndexed input, int anchor, int eflags, CPStringBuilder buffer) {
       boolean tryEntireMatch = ((eflags & REG_TRY_ENTIRE_MATCH) != 0);
       boolean doMove = ((eflags & REG_FIX_STARTING_POSITION) == 0);
       RE re = (tryEntireMatch ? (RE) this.clone() : this);
@@ -1880,7 +1889,7 @@ public class RE extends REToken {
   }
 
   private String substituteImpl(CharIndexed input,String replace,int index,int eflags) {
-    StringBuffer buffer = new StringBuffer();
+    CPStringBuilder buffer = new CPStringBuilder();
     REMatch m = getMatchImpl(input,index,eflags,buffer);
     if (m==null) return buffer.toString();
     buffer.append(getReplacement(replace, m, eflags));
@@ -1941,7 +1950,7 @@ public class RE extends REToken {
   }
 
   private String substituteAllImpl(CharIndexed input,String replace,int index,int eflags) {
-    StringBuffer buffer = new StringBuffer();
+    CPStringBuilder buffer = new CPStringBuilder();
     REMatch m;
     while ((m = getMatchImpl(input,index,eflags,buffer)) != null) {
       buffer.append(getReplacement(replace, m, eflags));
@@ -1965,7 +1974,7 @@ public class RE extends REToken {
       return replace;
     else {
       if ((eflags & REG_REPLACE_USE_BACKSLASHESCAPE) > 0) {
-        StringBuffer sb = new StringBuffer();
+        CPStringBuilder sb = new CPStringBuilder();
         int l = replace.length();
         for (int i = 0; i < l; i++) {
 	    char c = replace.charAt(i);
@@ -2019,7 +2028,7 @@ public class RE extends REToken {
     return new RETokenRepeated(current.subIndex,current,min,max);
   }
 
-  private static int getPosixSet(char[] pattern,int index,StringBuffer buf) {
+  private static int getPosixSet(char[] pattern,int index,CPStringBuilder buf) {
     // Precondition: pattern[index-1] == ':'
     // we will return pos of closing ']'.
     int i;
@@ -2045,7 +2054,7 @@ public class RE extends REToken {
     
     int min,max=0;
     CharUnit unit = new CharUnit();
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     
     // Read string of digits
     do {
@@ -2072,7 +2081,7 @@ public class RE extends REToken {
       else
         return startIndex;
     else if ((unit.ch == ',') && !unit.bk) {
-      buf = new StringBuffer();
+      buf = new CPStringBuilder();
       // Read string of digits
       while (((index = getCharUnit(input,index,unit,false)) != input.length) && Character.isDigit(unit.ch))
 	buf.append(unit.ch);
@@ -2106,12 +2115,12 @@ public class RE extends REToken {
     * useful for debugging.
     */
    public String toString() {
-     StringBuffer sb = new StringBuffer();
+     CPStringBuilder sb = new CPStringBuilder();
      dump(sb);
      return sb.toString();
    }
 
-  void dump(StringBuffer os) {
+  void dump(CPStringBuilder os) {
     os.append("(?#startRE subIndex=" + subIndex + ")");
     if (subIndex == 0)
       os.append("?:");
diff --git a/gnu/java/util/regex/REException.java b/gnu/java/util/regex/REException.java
index 7a277ca3a..80cf61150 100644
--- a/gnu/java/util/regex/REException.java
+++ b/gnu/java/util/regex/REException.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.text.MessageFormat;
 
 /**
@@ -178,7 +180,7 @@ public class REException extends Exception {
    */
   public String getMessage() {
     Object[] args = {new Integer(pos)};
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     String prefix = RE.getLocalizedMessage("error.prefix");
     sb.append(MessageFormat.format(prefix, args));
     sb.append('\n');
diff --git a/gnu/java/util/regex/REMatch.java b/gnu/java/util/regex/REMatch.java
index d89948293..58c875d53 100644
--- a/gnu/java/util/regex/REMatch.java
+++ b/gnu/java/util/regex/REMatch.java
@@ -37,6 +37,9 @@ exception statement from your version. */
 
 
 package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 /**
@@ -114,7 +117,7 @@ public final class REMatch implements Serializable, Cloneable {
 
     void finish(CharIndexed text) {
 	start[0] = 0;
-	StringBuffer sb = new StringBuffer();
+	CPStringBuilder sb = new CPStringBuilder();
 	int i;
 	for (i = 0; i < end[0]; i++)
 	    sb.append(text.charAt(i));
@@ -199,7 +202,7 @@ public final class REMatch implements Serializable, Cloneable {
 	    return (matchedText.substring(start[sub],end[sub]));
 	else {
 	// This case occurs with RETokenLookAhead or RETokenLookBehind.
-	    StringBuffer sb = new StringBuffer();
+	    CPStringBuilder sb = new CPStringBuilder();
 	    int s = start[sub];
 	    int e = end[sub];
 	    if (s < 0) s += 1;
@@ -282,7 +285,7 @@ public final class REMatch implements Serializable, Cloneable {
      */
     public String substituteInto(String input) {
 	// a la Perl, $0 is whole thing, $1 - $9 are subexpressions
-	StringBuffer output = new StringBuffer();
+	CPStringBuilder output = new CPStringBuilder();
 	int pos;
 	for (pos = 0; pos < input.length()-1; pos++) {
 	    if ((input.charAt(pos) == '$') && (Character.isDigit(input.charAt(pos+1)))) {
diff --git a/gnu/java/util/regex/REMatchEnumeration.java b/gnu/java/util/regex/REMatchEnumeration.java
index bc700beac..a9142a220 100644
--- a/gnu/java/util/regex/REMatchEnumeration.java
+++ b/gnu/java/util/regex/REMatchEnumeration.java
@@ -36,6 +36,9 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
@@ -101,7 +104,7 @@ public class REMatchEnumeration implements Enumeration, Serializable {
    * Saves the text leading up to the match (or to the end of the input)
    * in the specified buffer.
    */
-  public boolean hasMoreMatches(StringBuffer buffer) {
+  public boolean hasMoreMatches(CPStringBuilder buffer) {
     if (more == MAYBE) {
 	match = expr.getMatchImpl(input,index,eflags,buffer);
 	if (match != null) {
diff --git a/gnu/java/util/regex/REToken.java b/gnu/java/util/regex/REToken.java
index addc62225..41b4c633c 100644
--- a/gnu/java/util/regex/REToken.java
+++ b/gnu/java/util/regex/REToken.java
@@ -36,6 +36,9 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 abstract class REToken implements Serializable, Cloneable {
@@ -160,15 +163,15 @@ abstract class REToken implements Serializable, Cloneable {
       return true; // Token was accepted
   }
 
-  abstract void dump(StringBuffer os);
+  abstract void dump(CPStringBuilder os);
 
-  void dumpAll(StringBuffer os) {
+  void dumpAll(CPStringBuilder os) {
     dump(os);
     if (next != null) next.dumpAll(os);
   }
 
   public String toString() {
-    StringBuffer os = new StringBuffer();
+    CPStringBuilder os = new CPStringBuilder();
     dump(os);
     return os.toString();
   }
diff --git a/gnu/java/util/regex/RETokenAny.java b/gnu/java/util/regex/RETokenAny.java
index b99a54717..9950ceaa9 100644
--- a/gnu/java/util/regex/RETokenAny.java
+++ b/gnu/java/util/regex/RETokenAny.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 final class RETokenAny extends REToken {
   /** True if '.' can match a newline (RE_DOT_NEWLINE) */
   private boolean newline; 
@@ -92,7 +94,7 @@ final class RETokenAny extends REToken {
     return numRepeats;
   }
 
-  void dump(StringBuffer os) {
+  void dump(CPStringBuilder os) {
     os.append('.');
   }
 }
diff --git a/gnu/java/util/regex/RETokenBackRef.java b/gnu/java/util/regex/RETokenBackRef.java
index 3a912f9bb..4e068fac9 100644
--- a/gnu/java/util/regex/RETokenBackRef.java
+++ b/gnu/java/util/regex/RETokenBackRef.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 final class RETokenBackRef extends REToken {
   private int num;
   private boolean insens;
@@ -78,7 +80,7 @@ final class RETokenBackRef extends REToken {
 	return mymatch;
     }
     
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	os.append('\\').append(num);
     }
 }
diff --git a/gnu/java/util/regex/RETokenChar.java b/gnu/java/util/regex/RETokenChar.java
index 42dcd9326..f3afe8859 100644
--- a/gnu/java/util/regex/RETokenChar.java
+++ b/gnu/java/util/regex/RETokenChar.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 final class RETokenChar extends REToken {
   private char[] ch;
   private boolean insens;
@@ -127,7 +129,7 @@ final class RETokenChar extends REToken {
     } else return super.chain(next);
   }
 
-  void dump(StringBuffer os) {
+  void dump(CPStringBuilder os) {
     os.append(ch);
   }
 }
diff --git a/gnu/java/util/regex/RETokenEnd.java b/gnu/java/util/regex/RETokenEnd.java
index 294e32085..fdfe17060 100644
--- a/gnu/java/util/regex/RETokenEnd.java
+++ b/gnu/java/util/regex/RETokenEnd.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 final class RETokenEnd extends REToken {
     /**
      * Indicates whether this token should match on a line break.
@@ -118,7 +120,7 @@ final class RETokenEnd extends REToken {
 	else return 0;
     }
 
-  void dump(StringBuffer os) {
+  void dump(CPStringBuilder os) {
     os.append('$');
   }
 }
diff --git a/gnu/java/util/regex/RETokenEndOfPreviousMatch.java b/gnu/java/util/regex/RETokenEndOfPreviousMatch.java
index ea5580e16..33e5ab001 100644
--- a/gnu/java/util/regex/RETokenEndOfPreviousMatch.java
+++ b/gnu/java/util/regex/RETokenEndOfPreviousMatch.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 class RETokenEndOfPreviousMatch extends RETokenStart {
 
     RETokenEndOfPreviousMatch(int subIndex) {
@@ -66,7 +68,7 @@ class RETokenEndOfPreviousMatch extends RETokenStart {
 	else return 0;
     }
     
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	os.append("\\G");
     }
 }
diff --git a/gnu/java/util/regex/RETokenEndSub.java b/gnu/java/util/regex/RETokenEndSub.java
index b3a28a3e8..95254e86c 100644
--- a/gnu/java/util/regex/RETokenEndSub.java
+++ b/gnu/java/util/regex/RETokenEndSub.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 final class RETokenEndSub extends REToken {
     RETokenEndSub(int subIndex) {
 	super(subIndex);
@@ -62,7 +64,7 @@ final class RETokenEndSub extends REToken {
 	// Do nothing
     }
 
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	// handled by RE
 	// But add something for debugging.
 	os.append("(?#RETokenEndSub subIndex=" + subIndex + ")");
diff --git a/gnu/java/util/regex/RETokenIndependent.java b/gnu/java/util/regex/RETokenIndependent.java
index 48f865612..9b567ba79 100644
--- a/gnu/java/util/regex/RETokenIndependent.java
+++ b/gnu/java/util/regex/RETokenIndependent.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * @author Ito Kazumitsu
  */
@@ -69,7 +71,7 @@ final class RETokenIndependent extends REToken
     return null;
   }
 
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	os.append("(?>");
 	re.dumpAll(os);
 	os.append(')');
diff --git a/gnu/java/util/regex/RETokenLookAhead.java b/gnu/java/util/regex/RETokenLookAhead.java
index 134f17c60..39defd715 100644
--- a/gnu/java/util/regex/RETokenLookAhead.java
+++ b/gnu/java/util/regex/RETokenLookAhead.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * @since gnu.regexp 1.1.3
  * @author Shashank Bapat
@@ -70,7 +72,7 @@ final class RETokenLookAhead extends REToken
     }
   }
 
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	os.append("(?");
 	os.append(negative ? '!' : '=');
 	re.dumpAll(os);
diff --git a/gnu/java/util/regex/RETokenLookBehind.java b/gnu/java/util/regex/RETokenLookBehind.java
index a01a15bc9..400cebdad 100644
--- a/gnu/java/util/regex/RETokenLookBehind.java
+++ b/gnu/java/util/regex/RETokenLookBehind.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * @author Ito Kazumitsu
  */
@@ -89,7 +91,7 @@ final class RETokenLookBehind extends REToken
     }
   }
 
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	os.append("(?<");
 	os.append(negative ? '!' : '=');
 	re.dumpAll(os);
@@ -111,7 +113,7 @@ final class RETokenLookBehind extends REToken
 	    return (index == mymatch.index ? mymatch : null);
 	}
 
-        void dump(StringBuffer os) {}
+        void dump(CPStringBuilder os) {}
 
     }
 }
diff --git a/gnu/java/util/regex/RETokenNamedProperty.java b/gnu/java/util/regex/RETokenNamedProperty.java
index 0051f1643..17efb6d5c 100644
--- a/gnu/java/util/regex/RETokenNamedProperty.java
+++ b/gnu/java/util/regex/RETokenNamedProperty.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
@@ -147,7 +149,7 @@ final class RETokenNamedProperty extends REToken {
     return numRepeats;
   }
 
-  void dump(StringBuffer os) {
+  void dump(CPStringBuilder os) {
     os.append("\\")
       .append(negate ? "P" : "p")
       .append("{" + name + "}");
diff --git a/gnu/java/util/regex/RETokenOneOf.java b/gnu/java/util/regex/RETokenOneOf.java
index 239c2201c..dacc2e9d8 100644
--- a/gnu/java/util/regex/RETokenOneOf.java
+++ b/gnu/java/util/regex/RETokenOneOf.java
@@ -36,6 +36,9 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package gnu.java.util.regex;
+
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.Vector;
 import java.util.Stack;
 
@@ -270,7 +273,7 @@ final class RETokenOneOf extends REToken {
       return numRepeats;
   }
 
-  void dump(StringBuffer os) {
+  void dump(CPStringBuilder os) {
     os.append(negative ? "[^" : "(?:");
     for (int i = 0; i < options.size(); i++) {
       if (!negative && (i > 0)) os.append('|');
diff --git a/gnu/java/util/regex/RETokenPOSIX.java b/gnu/java/util/regex/RETokenPOSIX.java
index 072989583..e7525cb8b 100644
--- a/gnu/java/util/regex/RETokenPOSIX.java
+++ b/gnu/java/util/regex/RETokenPOSIX.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 final class RETokenPOSIX extends REToken {
   int type;
   boolean insens;
@@ -160,7 +162,7 @@ final class RETokenPOSIX extends REToken {
       return numRepeats;
   }
 
-  void dump(StringBuffer os) {
+  void dump(CPStringBuilder os) {
     if (negated) os.append('^');
     os.append("[:" + s_nameTable[type] + ":]");
   }
diff --git a/gnu/java/util/regex/RETokenRange.java b/gnu/java/util/regex/RETokenRange.java
index 8a65f77f1..09924a339 100644
--- a/gnu/java/util/regex/RETokenRange.java
+++ b/gnu/java/util/regex/RETokenRange.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 final class RETokenRange extends REToken {
   private char lo, hi;
   private boolean insens;
@@ -93,7 +95,7 @@ final class RETokenRange extends REToken {
         return numRepeats;
     }
     
-  void dump(StringBuffer os) {
+  void dump(CPStringBuilder os) {
     os.append(lo).append('-').append(hi);
   }
 }
diff --git a/gnu/java/util/regex/RETokenRepeated.java b/gnu/java/util/regex/RETokenRepeated.java
index 7f5e5626f..2d6746ea8 100644
--- a/gnu/java/util/regex/RETokenRepeated.java
+++ b/gnu/java/util/regex/RETokenRepeated.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.ArrayList;
 
 final class RETokenRepeated extends REToken {
@@ -509,7 +511,7 @@ final class RETokenRepeated extends REToken {
 	}
     }		    
 
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	os.append("(?:");
 	token.dumpAll(os);
 	os.append(')');
diff --git a/gnu/java/util/regex/RETokenStart.java b/gnu/java/util/regex/RETokenStart.java
index aa5f0c914..c3c133c9b 100644
--- a/gnu/java/util/regex/RETokenStart.java
+++ b/gnu/java/util/regex/RETokenStart.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 class RETokenStart extends REToken {
     private String newline; // matches after a newline
     private boolean check_java_line_terminators;
@@ -115,7 +117,7 @@ class RETokenStart extends REToken {
 	else return 0;
     }
     
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	os.append('^');
     }
 }
diff --git a/gnu/java/util/regex/RETokenWordBoundary.java b/gnu/java/util/regex/RETokenWordBoundary.java
index 538c6bef4..6a8e2ad57 100644
--- a/gnu/java/util/regex/RETokenWordBoundary.java
+++ b/gnu/java/util/regex/RETokenWordBoundary.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * Represents a combination lookahead/lookbehind for POSIX [:alnum:].
  */
@@ -104,7 +106,7 @@ final class RETokenWordBoundary extends REToken {
 	else return 0;
     }
     
-    void dump(StringBuffer os) {
+    void dump(CPStringBuilder os) {
 	if (where == (BEGIN | END)) {
 	    os.append( negated ? "\\B" : "\\b" );
 	} else if (where == BEGIN) {