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

	PR classpath/21869
	* gnu/classpath/jdwp/util/Signature.java,
	* gnu/java/awt/font/opentype/GlyphNamer.java,
	* gnu/java/awt/font/opentype/truetype/Fixed.java,
	* gnu/java/awt/font/opentype/truetype/VirtualMachine.java,
	* gnu/java/awt/peer/gtk/GdkFontPeer.java,
	* gnu/java/awt/peer/gtk/GtkClipboard.java:
	Swap use of StringBuffer for CPStringBuilder.

6 files changed, 35 insertions, 11 deletions

diff --git a/gnu/classpath/jdwp/util/Signature.java b/gnu/classpath/jdwp/util/Signature.java
index 36445c318..e7453bf01 100644
--- a/gnu/classpath/jdwp/util/Signature.java
+++ b/gnu/classpath/jdwp/util/Signature.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package gnu.classpath.jdwp.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
@@ -59,7 +61,7 @@ public class Signature
    */
   public static String computeClassSignature (Class theClass)
   {
-    StringBuffer sb = new StringBuffer ();
+    CPStringBuilder sb = new CPStringBuilder ();
     _addToSignature (sb, theClass);
     return sb.toString ();
   }
@@ -93,7 +95,7 @@ public class Signature
   private static String _computeSignature (Class returnType,
 					   Class[] paramTypes)
   {
-    StringBuffer sb = new StringBuffer ("(");
+    CPStringBuilder sb = new CPStringBuilder ("(");
     if (paramTypes != null)
       {
 	for (int i = 0; i < paramTypes.length; ++i)
@@ -104,7 +106,7 @@ public class Signature
     return sb.toString();
   }
 
-  private static void _addToSignature (StringBuffer sb, Class k)
+  private static void _addToSignature (CPStringBuilder sb, Class k)
   {
     // For some reason there's no easy way to get the signature of a
     // class.
diff --git a/gnu/java/awt/font/opentype/GlyphNamer.java b/gnu/java/awt/font/opentype/GlyphNamer.java
index ea4b8e2a1..c2b009de3 100644
--- a/gnu/java/awt/font/opentype/GlyphNamer.java
+++ b/gnu/java/awt/font/opentype/GlyphNamer.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.awt.font.opentype;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.nio.CharBuffer;
@@ -1077,7 +1079,7 @@ final class GlyphNamer
         return name;
     }
     
-    StringBuffer buf = new StringBuffer(numChars * 8);
+    CPStringBuilder buf = new CPStringBuilder(numChars * 8);
     for (int i = 0; i < numChars; i++)
     {
       if (i > 0)
diff --git a/gnu/java/awt/font/opentype/truetype/Fixed.java b/gnu/java/awt/font/opentype/truetype/Fixed.java
index 287593e43..87dfebd41 100644
--- a/gnu/java/awt/font/opentype/truetype/Fixed.java
+++ b/gnu/java/awt/font/opentype/truetype/Fixed.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package gnu.java.awt.font.opentype.truetype;
 
+import gnu.java.lang.CPStringBuilder;
 
 /**
  * A utility class for fixed-point arithmetics, where numbers are
@@ -164,7 +165,7 @@ public final class Fixed
 
   public static String toString(int x, int y)
   {
-    StringBuffer sbuf = new StringBuffer(40);
+    CPStringBuilder sbuf = new CPStringBuilder(40);
     sbuf.append('(');
     sbuf.append(((float) x) / 64);
     sbuf.append(", ");
diff --git a/gnu/java/awt/font/opentype/truetype/VirtualMachine.java b/gnu/java/awt/font/opentype/truetype/VirtualMachine.java
index 7e50b6678..c88d4c649 100644
--- a/gnu/java/awt/font/opentype/truetype/VirtualMachine.java
+++ b/gnu/java/awt/font/opentype/truetype/VirtualMachine.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package gnu.java.awt.font.opentype.truetype;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.FontFormatException;
 import java.awt.geom.AffineTransform;
 import java.nio.ByteBuffer;
@@ -514,7 +516,7 @@ class VirtualMachine
    */
   private void dumpInstruction(ByteBuffer inst)
   {
-    StringBuffer sbuf = new StringBuffer(40);
+    CPStringBuilder sbuf = new CPStringBuilder(40);
     int pc = inst.position();
     int bcode = inst.get(pc) & 0xff;
     int count;
diff --git a/gnu/java/awt/peer/gtk/GdkFontPeer.java b/gnu/java/awt/peer/gtk/GdkFontPeer.java
index 403671cc6..078255e68 100644
--- a/gnu/java/awt/peer/gtk/GdkFontPeer.java
+++ b/gnu/java/awt/peer/gtk/GdkFontPeer.java
@@ -45,6 +45,8 @@ import gnu.java.awt.ClasspathToolkit;
 import gnu.java.awt.peer.ClasspathFontPeer;
 import gnu.java.awt.font.opentype.NameDecoder;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Toolkit;
@@ -211,7 +213,7 @@ public class GdkFontPeer extends ClasspathFontPeer
 
   private String buildString(CharacterIterator iter)
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) 
       sb.append(c);
     return sb.toString();
@@ -219,7 +221,7 @@ public class GdkFontPeer extends ClasspathFontPeer
 
   private String buildString(CharacterIterator iter, int begin, int limit)
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     int i = 0;
     for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next(), i++) 
       {
diff --git a/gnu/java/awt/peer/gtk/GtkClipboard.java b/gnu/java/awt/peer/gtk/GtkClipboard.java
index e41754641..e248b6daf 100644
--- a/gnu/java/awt/peer/gtk/GtkClipboard.java
+++ b/gnu/java/awt/peer/gtk/GtkClipboard.java
@@ -38,10 +38,25 @@ exception statement from your version. */
 
 package gnu.java.awt.peer.gtk;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Image;
-import java.awt.datatransfer.*;
 
-import java.io.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.ClipboardOwner;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Reader;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
 
 import java.util.List;
 import java.util.Iterator;
@@ -247,7 +262,7 @@ public class GtkClipboard extends Clipboard
         Reader r = plainText.getReaderForText(contents);
         if (r != null)
           {
-            StringBuffer sb = new StringBuffer();
+            CPStringBuilder sb = new CPStringBuilder();
             char[] cs = new char[1024];
             int l = r.read(cs);
             while (l != -1)