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

	PR classpath/21869
	* java/util/AbstractCollection.java,
	* java/util/BitSet.java,
	* java/util/Collections.java,
	* java/util/Locale.java,
	* java/util/ResourceBundle.java,
	* java/util/TimeZone.java,
	* java/util/logging/FileHandler.java,
	* java/util/logging/Logger.java,
	* java/util/logging/SimpleFormatter.java,
	* java/util/logging/XMLFormatter.java,
	* java/util/prefs/AbstractPreferences.java,
	* java/util/regex/PatternSyntaxException.java:
	Swap use of StringBuffer for CPStringBuilder.

12 files changed, 48 insertions, 23 deletions

diff --git a/java/util/AbstractCollection.java b/java/util/AbstractCollection.java
index ef7434223..a11654ebb 100644
--- a/java/util/AbstractCollection.java
+++ b/java/util/AbstractCollection.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.lang.reflect.Array;
 
 /**
@@ -434,7 +436,7 @@ public abstract class AbstractCollection<E>
   public String toString()
   {
     Iterator itr = iterator();
-    StringBuffer r = new StringBuffer("[");
+    CPStringBuilder r = new CPStringBuilder("[");
     boolean hasNext = itr.hasNext();
     while (hasNext)
       {
diff --git a/java/util/BitSet.java b/java/util/BitSet.java
index e4f923b7f..13bf8a13c 100644
--- a/java/util/BitSet.java
+++ b/java/util/BitSet.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 java.util;
+
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
@@ -687,7 +690,7 @@ public class BitSet implements Cloneable, Serializable
    */
   public String toString()
   {
-    StringBuffer r = new StringBuffer("{");
+    CPStringBuilder r = new CPStringBuilder("{");
     boolean first = true;
     for (int i = 0; i < bits.length; ++i)
       {
diff --git a/java/util/Collections.java b/java/util/Collections.java
index ae2010f1c..066c9d538 100644
--- a/java/util/Collections.java
+++ b/java/util/Collections.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package java.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 /**
@@ -1135,7 +1137,7 @@ public class Collections
      */
     public String toString()
     {
-      StringBuffer r = new StringBuffer("{");
+      CPStringBuilder r = new CPStringBuilder("{");
       for (int i = n - 1; --i > 0; )
         r.append(element).append(", ");
       r.append(element).append("}");
diff --git a/java/util/Locale.java b/java/util/Locale.java
index cd372f245..c28709f95 100644
--- a/java/util/Locale.java
+++ b/java/util/Locale.java
@@ -39,6 +39,9 @@ exception statement from your version. */
 package java.util;
 
 import gnu.classpath.SystemProperties;
+
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.locale.LocaleHelper;
 
 import java.io.IOException;
@@ -548,7 +551,7 @@ public final class Locale implements Serializable, Cloneable
       return "";
     else if (country.length() == 0 && variant.length() == 0)
       return language;
-    StringBuffer result = new StringBuffer(language);
+    CPStringBuilder result = new CPStringBuilder(language);
     result.append('_').append(country);
     if (variant.length() != 0)
       result.append('_').append(variant);
@@ -922,7 +925,7 @@ public final class Locale implements Serializable, Cloneable
    */
   public String getDisplayName(Locale locale)
   {
-    StringBuffer result = new StringBuffer();
+    CPStringBuilder result = new CPStringBuilder();
     int count = 0;
     String[] delimiters = {"", " (", ","};
     if (language.length() != 0)
diff --git a/java/util/ResourceBundle.java b/java/util/ResourceBundle.java
index 9b82bc801..bbca937a8 100644
--- a/java/util/ResourceBundle.java
+++ b/java/util/ResourceBundle.java
@@ -41,6 +41,8 @@ package java.util;
 
 import gnu.classpath.VMStackWalker;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -515,9 +517,9 @@ public abstract class ResourceBundle
     
     int baseLen = baseName.length();
 
-    // Build up a StringBuffer containing the complete bundle name, fully
+    // Build up a CPStringBuilder containing the complete bundle name, fully
     // qualified by locale.
-    StringBuffer sb = new StringBuffer(baseLen + variant.length() + 7);
+    CPStringBuilder sb = new CPStringBuilder(baseLen + variant.length() + 7);
 
     sb.append(baseName);
     
diff --git a/java/util/TimeZone.java b/java/util/TimeZone.java
index 5fb46bf15..4e857946c 100644
--- a/java/util/TimeZone.java
+++ b/java/util/TimeZone.java
@@ -40,7 +40,9 @@ exception statement from your version. */
 package java.util;
 
 import gnu.classpath.SystemProperties;
+import gnu.java.lang.CPStringBuilder;
 import gnu.java.util.ZoneInfo;
+
 import java.io.File;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -1399,7 +1401,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
 	offset += ((SimpleTimeZone) this).getDSTSavings();
       }
 
-    StringBuffer sb = new StringBuffer(9);
+    CPStringBuilder sb = new CPStringBuilder(9);
     sb.append("GMT");
 
     offset = offset / (1000 * 60);
@@ -1559,7 +1561,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
 	      }
 
 	    // Custom IDs have to be normalized
-	    StringBuffer sb = new StringBuffer(9);
+	    CPStringBuilder sb = new CPStringBuilder(9);
 	    sb.append("GMT");
 
 	    sb.append(offset_direction >= 0 ? '+' : '-');
diff --git a/java/util/logging/FileHandler.java b/java/util/logging/FileHandler.java
index 357d51e14..deba5c2e5 100644
--- a/java/util/logging/FileHandler.java
+++ b/java/util/logging/FileHandler.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.util.logging;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FilterOutputStream;
@@ -478,7 +480,7 @@ public class FileHandler
 					       int uniqueNumber,
 					       int count)
   {
-    StringBuffer buf = new StringBuffer(pattern);
+    CPStringBuilder buf = new CPStringBuilder(pattern);
     String       replaceWith;
     boolean      foundGeneration = false;
 
diff --git a/java/util/logging/Logger.java b/java/util/logging/Logger.java
index f7157c176..cddc02d1c 100644
--- a/java/util/logging/Logger.java
+++ b/java/util/logging/Logger.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.util.logging;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.util.List;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
@@ -776,7 +778,7 @@ public class Logger
       {
         if (isLoggable(Level.FINER))
           {
-            StringBuffer buf = new StringBuffer(80);
+            CPStringBuilder buf = new CPStringBuilder(80);
             buf.append("ENTRY");
             for (int i = 0; i < params.length; i++)
               {
diff --git a/java/util/logging/SimpleFormatter.java b/java/util/logging/SimpleFormatter.java
index 2ebb1a148..da731f2b1 100644
--- a/java/util/logging/SimpleFormatter.java
+++ b/java/util/logging/SimpleFormatter.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package java.util.logging;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.text.DateFormat;
@@ -98,7 +100,7 @@ public class SimpleFormatter
    */
   public String format(LogRecord record)
   {
-    StringBuffer buf = new StringBuffer(180);
+    CPStringBuilder buf = new CPStringBuilder(180);
 
     if (dateFormat == null)
       dateFormat = DateFormat.getDateTimeInstance();
diff --git a/java/util/logging/XMLFormatter.java b/java/util/logging/XMLFormatter.java
index 8f5769be1..194fcd238 100644
--- a/java/util/logging/XMLFormatter.java
+++ b/java/util/logging/XMLFormatter.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package java.util.logging;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.ResourceBundle;
@@ -86,10 +88,10 @@ public class XMLFormatter
   /**
    * Appends a line consisting of indentation, opening element tag,
    * element content, closing element tag and line separator to
-   * a StringBuffer, provided that the element content is
+   * a CPStringBuilder, provided that the element content is
    * actually existing.
    *
-   * @param buf the StringBuffer to which the line will be appended.
+   * @param buf the CPStringBuilder to which the line will be appended.
    *
    * @param indent the indentation level.
    *
@@ -98,7 +100,7 @@ public class XMLFormatter
    * @param content the element content, or <code>null</code> to
    *        have no output whatsoever appended to <code>buf</code>.
    */
-  private static void appendTag(StringBuffer buf, int indent,
+  private static void appendTag(CPStringBuilder buf, int indent,
                                 String tag, String content)
   {
     int i;
@@ -163,9 +165,9 @@ public class XMLFormatter
   /**
    * Appends a line consisting of indentation, opening element tag,
    * numeric element content, closing element tag and line separator
-   * to a StringBuffer.
+   * to a CPStringBuilder.
    *
-   * @param buf the StringBuffer to which the line will be appended.
+   * @param buf the CPStringBuilder to which the line will be appended.
    *
    * @param indent the indentation level.
    *
@@ -173,7 +175,7 @@ public class XMLFormatter
    *
    * @param content the element content.
    */
-  private static void appendTag(StringBuffer buf, int indent,
+  private static void appendTag(CPStringBuilder buf, int indent,
                                 String tag, long content)
   {
     appendTag(buf, indent, tag, Long.toString(content));
@@ -182,7 +184,7 @@ public class XMLFormatter
 
   public String format(LogRecord record)
   {
-    StringBuffer    buf = new StringBuffer(400);
+    CPStringBuilder    buf = new CPStringBuilder(400);
     Level           level = record.getLevel();
     long            millis = record.getMillis();
     Object[]        params = record.getParameters();
@@ -314,10 +316,10 @@ public class XMLFormatter
    */
   public String getHead(Handler h)
   {
-    StringBuffer  buf;
+    CPStringBuilder  buf;
     String        encoding;
 
-    buf = new StringBuffer(80);
+    buf = new CPStringBuilder(80);
     buf.append("<?xml version=\"1.0\" encoding=\"");
 
     encoding = h.getEncoding();
diff --git a/java/util/prefs/AbstractPreferences.java b/java/util/prefs/AbstractPreferences.java
index 14b0cac63..9562e1bbf 100644
--- a/java/util/prefs/AbstractPreferences.java
+++ b/java/util/prefs/AbstractPreferences.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package java.util.prefs;
 
 import gnu.classpath.toolkit.DefaultDaemonThreadFactory;
+import gnu.java.lang.CPStringBuilder;
 import gnu.java.util.prefs.NodeWriter;
 
 import java.io.ByteArrayOutputStream;
@@ -843,7 +844,7 @@ public abstract class AbstractPreferences extends Preferences {
      * Helper method for encoding an array of bytes as a Base64 String.
      */
     private static String encode64(byte[] b) {
-        StringBuffer sb = new StringBuffer((b.length/3)*4);
+        CPStringBuilder sb = new CPStringBuilder((b.length/3)*4);
 
         int i = 0;
         int remaining = b.length;
diff --git a/java/util/regex/PatternSyntaxException.java b/java/util/regex/PatternSyntaxException.java
index 41e650d32..38e27db27 100644
--- a/java/util/regex/PatternSyntaxException.java
+++ b/java/util/regex/PatternSyntaxException.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package java.util.regex;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * Indicates illegal pattern for regular expression.
  * Includes state to inspect the pattern and what and where the expression
@@ -115,7 +117,7 @@ public class PatternSyntaxException extends IllegalArgumentException
   public String getMessage()
   {
     String lineSep = System.getProperty("line.separator");
-    StringBuffer sb = new StringBuffer(desc);
+    CPStringBuilder sb = new CPStringBuilder(desc);
     sb.append(lineSep);
     sb.append('\t');
     sb.append(pattern);