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

	PR classpath/21869
	* java/awt/Component.java,
	* java/awt/Container.java,
	* java/awt/JobAttributes.java,
	* java/awt/event/ActionEvent.java,
	* java/awt/event/ComponentEvent.java,
	* java/awt/event/HierarchyEvent.java,
	* java/awt/event/InputEvent.java,
	* java/awt/event/InputMethodEvent.java,
	* java/awt/event/KeyEvent.java,
	* java/awt/event/MouseEvent.java,
	* java/awt/event/WindowEvent.java,
	* java/awt/font/TextLayout.java,
	* java/awt/image/BandedSampleModel.java,
	* java/awt/image/BufferedImage.java,
	* java/awt/image/MultiPixelPackedSampleModel.java,
	* java/awt/image/Raster.java,
	* java/awt/image/SinglePixelPackedSampleModel.java:
	Swap use of StringBuffer for CPStringBuilder.

18 files changed, 71 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index a296cd4e7..b5761ec49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2008-05-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
+	PR classpath/21869
+	* java/awt/Component.java,
+	* java/awt/Container.java,
+	* java/awt/JobAttributes.java,
+	* java/awt/event/ActionEvent.java,
+	* java/awt/event/ComponentEvent.java,
+	* java/awt/event/HierarchyEvent.java,
+	* java/awt/event/InputEvent.java,
+	* java/awt/event/InputMethodEvent.java,
+	* java/awt/event/KeyEvent.java,
+	* java/awt/event/MouseEvent.java,
+	* java/awt/event/WindowEvent.java,
+	* java/awt/font/TextLayout.java,
+	* java/awt/image/BandedSampleModel.java,
+	* java/awt/image/BufferedImage.java,
+	* java/awt/image/MultiPixelPackedSampleModel.java,
+	* java/awt/image/Raster.java,
+	* java/awt/image/SinglePixelPackedSampleModel.java:
+	Swap use of StringBuffer for CPStringBuilder.
+
+2008-05-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	PR classpath/35482
 	* java/lang/String.java:
 	(toLowerCase()): Fix calculation of number
diff --git a/java/awt/Component.java b/java/awt/Component.java
index fe4fb9b8b..dec8a82a6 100644
--- a/java/awt/Component.java
+++ b/java/awt/Component.java
@@ -43,6 +43,8 @@ package java.awt;
 
 import gnu.java.awt.ComponentReshapeEvent;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.dnd.DropTarget;
 import java.awt.event.ActionEvent;
 import java.awt.event.AdjustmentEvent;
@@ -4991,7 +4993,7 @@ public abstract class Component
    */
   protected String paramString()
   {
-    StringBuffer param = new StringBuffer();
+    CPStringBuilder param = new CPStringBuilder();
     String name = getName();
     if (name != null)
       param.append(name).append(",");
diff --git a/java/awt/Container.java b/java/awt/Container.java
index 1e5004048..263473511 100644
--- a/java/awt/Container.java
+++ b/java/awt/Container.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 
 package java.awt;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
 import java.awt.event.HierarchyEvent;
@@ -1341,7 +1343,7 @@ public class Container extends Component
     if (layoutMgr == null)
       return super.paramString();
 
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(super.paramString());
     sb.append(",layout=");
     sb.append(layoutMgr.getClass().getName());
diff --git a/java/awt/JobAttributes.java b/java/awt/JobAttributes.java
index 2acb3a01e..9ffc04878 100644
--- a/java/awt/JobAttributes.java
+++ b/java/awt/JobAttributes.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.awt;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * Needs documentation...
  *
@@ -479,7 +481,7 @@ public final class JobAttributes implements Cloneable
 
   public String toString()
   {
-    StringBuffer s = new StringBuffer("copies=").append(copies)
+    CPStringBuilder s = new CPStringBuilder("copies=").append(copies)
       .append(",defaultSelection=").append(selection).append(",destination=")
       .append(destination).append(",dialog=").append(dialog)
       .append(",fileName=").append(filename).append(",fromPage=")
diff --git a/java/awt/event/ActionEvent.java b/java/awt/event/ActionEvent.java
index 4bce7d45c..937d2cf53 100644
--- a/java/awt/event/ActionEvent.java
+++ b/java/awt/event/ActionEvent.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.awt.event;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.AWTEvent;
 import java.awt.EventQueue;
 
@@ -202,9 +204,9 @@ public class ActionEvent extends AWTEvent
    */
   public String paramString()
   {
-    StringBuffer s = new StringBuffer(id == ACTION_PERFORMED
-                                      ? "ACTION_PERFORMED,cmd="
-                                      : "unknown type,cmd=");
+    CPStringBuilder s = new CPStringBuilder(id == ACTION_PERFORMED
+					    ? "ACTION_PERFORMED,cmd="
+					    : "unknown type,cmd=");
     s.append(actionCommand).append(",when=").append(when).append(",modifiers");
     int len = s.length();
     s.setLength(len + 1);
diff --git a/java/awt/event/ComponentEvent.java b/java/awt/event/ComponentEvent.java
index 6d478055a..156a3e2ad 100644
--- a/java/awt/event/ComponentEvent.java
+++ b/java/awt/event/ComponentEvent.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.awt.event;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.AWTEvent;
 import java.awt.Component;
 
@@ -114,7 +116,7 @@ public class ComponentEvent extends AWTEvent
    */
   public String paramString()
   {
-    StringBuffer s = new StringBuffer();
+    CPStringBuilder s = new CPStringBuilder();
     
     // Unlike Sun, we don't throw NullPointerException or ClassCastException
     // when source was illegally changed.
diff --git a/java/awt/event/HierarchyEvent.java b/java/awt/event/HierarchyEvent.java
index e10cefbef..3237978f9 100644
--- a/java/awt/event/HierarchyEvent.java
+++ b/java/awt/event/HierarchyEvent.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.awt.event;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.Container;
@@ -226,7 +228,7 @@ public class HierarchyEvent extends AWTEvent
    */
   public String paramString()
   {
-    StringBuffer r = new StringBuffer();
+    CPStringBuilder r = new CPStringBuilder();
     switch (id)
       {
       case HIERARCHY_CHANGED:
diff --git a/java/awt/event/InputEvent.java b/java/awt/event/InputEvent.java
index 28cd90185..b9dad3278 100644
--- a/java/awt/event/InputEvent.java
+++ b/java/awt/event/InputEvent.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package java.awt.event;
 
 import gnu.java.awt.EventModifier;
+import gnu.java.lang.CPStringBuilder;
 
 import java.awt.Component;
 
@@ -376,7 +377,7 @@ public abstract class InputEvent extends ComponentEvent
     modifiers &= EventModifier.NEW_MASK;
     if (modifiers == 0)
       return "";
-    StringBuffer s = new StringBuffer();
+    CPStringBuilder s = new CPStringBuilder();
     if ((modifiers & META_DOWN_MASK) != 0)
       s.append("Meta+");
     if ((modifiers & CTRL_DOWN_MASK) != 0)
diff --git a/java/awt/event/InputMethodEvent.java b/java/awt/event/InputMethodEvent.java
index f6711a8fa..e0be40d5a 100644
--- a/java/awt/event/InputMethodEvent.java
+++ b/java/awt/event/InputMethodEvent.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.awt.event;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.EventQueue;
@@ -257,8 +259,8 @@ public class InputMethodEvent extends AWTEvent
    */
   public String paramString()
   {
-    StringBuffer s
-      = new StringBuffer(80 + (text == null ? 0
+    CPStringBuilder s
+      = new CPStringBuilder(80 + (text == null ? 0
                                : text.getEndIndex() - text.getBeginIndex()));
     s.append(id == INPUT_METHOD_TEXT_CHANGED ? "INPUT_METHOD_TEXT_CHANGED, "
              : "CARET_POSITION_CHANGED, ");
diff --git a/java/awt/event/KeyEvent.java b/java/awt/event/KeyEvent.java
index 42084d733..bb7ed4c2d 100644
--- a/java/awt/event/KeyEvent.java
+++ b/java/awt/event/KeyEvent.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package java.awt.event;
 
 import gnu.java.awt.EventModifier;
+import gnu.java.lang.CPStringBuilder;
 
 import java.awt.Component;
 import java.io.IOException;
@@ -1673,7 +1674,7 @@ public class KeyEvent extends InputEvent
    */
   public String paramString()
   {
-    StringBuffer s = new StringBuffer();
+    CPStringBuilder s = new CPStringBuilder();
 
     switch (id)
       {
diff --git a/java/awt/event/MouseEvent.java b/java/awt/event/MouseEvent.java
index 0ca833604..86a584c41 100644
--- a/java/awt/event/MouseEvent.java
+++ b/java/awt/event/MouseEvent.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package java.awt.event;
 
 import gnu.java.awt.EventModifier;
+import gnu.java.lang.CPStringBuilder;
 
 import java.awt.Component;
 import java.awt.Point;
@@ -434,7 +435,7 @@ public class MouseEvent extends InputEvent
    */
   public String paramString()
   {
-    StringBuffer s = new StringBuffer();
+    CPStringBuilder s = new CPStringBuilder();
     switch (id)
       {
       case MOUSE_CLICKED:
diff --git a/java/awt/event/WindowEvent.java b/java/awt/event/WindowEvent.java
index 2186889e6..1298e1ad8 100644
--- a/java/awt/event/WindowEvent.java
+++ b/java/awt/event/WindowEvent.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.awt.event;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Frame;
 import java.awt.Window;
 
@@ -270,7 +272,7 @@ public class WindowEvent extends ComponentEvent
    */
   public String paramString()
   {
-    StringBuffer s = new StringBuffer();
+    CPStringBuilder s = new CPStringBuilder();
     switch (id)
       {
       case WINDOW_OPENED:
diff --git a/java/awt/font/TextLayout.java b/java/awt/font/TextLayout.java
index dc0e537eb..4346ab91d 100644
--- a/java/awt/font/TextLayout.java
+++ b/java/awt/font/TextLayout.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.awt.font;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Shape;
@@ -362,7 +364,7 @@ public final class TextLayout implements Cloneable
 
   private static String getText(AttributedCharacterIterator iter)
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     int idx = iter.getIndex();
     for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) 
       sb.append(c);
diff --git a/java/awt/image/BandedSampleModel.java b/java/awt/image/BandedSampleModel.java
index afe62bdc4..94dbd8d46 100644
--- a/java/awt/image/BandedSampleModel.java
+++ b/java/awt/image/BandedSampleModel.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 package java.awt.image;
 
 import gnu.java.awt.Buffers;
+import gnu.java.lang.CPStringBuilder;
 
 /**
  * A sample model that reads each sample value from a separate band in the
@@ -742,7 +743,7 @@ public final class BandedSampleModel extends ComponentSampleModel
    */
   public String toString()
   {
-    StringBuffer result = new StringBuffer();
+    CPStringBuilder result = new CPStringBuilder();
     result.append(getClass().getName());
     result.append("[");
     result.append("scanlineStride=").append(scanlineStride);
diff --git a/java/awt/image/BufferedImage.java b/java/awt/image/BufferedImage.java
index 78623ccd9..260d254fd 100644
--- a/java/awt/image/BufferedImage.java
+++ b/java/awt/image/BufferedImage.java
@@ -41,6 +41,8 @@ package java.awt.image;
 import gnu.java.awt.Buffers;
 import gnu.java.awt.ClasspathGraphicsEnvironment;
 import gnu.java.awt.ComponentDataBlitOp;
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.GraphicsEnvironment;
@@ -778,9 +780,9 @@ public class BufferedImage extends Image
     
   public String toString()
   {
-    StringBuffer buf;
+    CPStringBuilder buf;
 
-    buf = new StringBuffer(/* estimated length */ 120);
+    buf = new CPStringBuilder(/* estimated length */ 120);
     buf.append("BufferedImage@");
     buf.append(Integer.toHexString(hashCode()));
     buf.append(": type=");
diff --git a/java/awt/image/MultiPixelPackedSampleModel.java b/java/awt/image/MultiPixelPackedSampleModel.java
index 8732e5765..8db26b52d 100644
--- a/java/awt/image/MultiPixelPackedSampleModel.java
+++ b/java/awt/image/MultiPixelPackedSampleModel.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 package java.awt.image;
 
 import gnu.java.awt.Buffers;
+import gnu.java.lang.CPStringBuilder;
 
 /**
  * MultiPixelPackedSampleModel provides a single band model that supports
@@ -587,7 +588,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
    */
   public String toString()
   {
-    StringBuffer result = new StringBuffer();
+    CPStringBuilder result = new CPStringBuilder();
     result.append(getClass().getName());
     result.append("[");
     result.append("scanlineStride=").append(scanlineStride);
diff --git a/java/awt/image/Raster.java b/java/awt/image/Raster.java
index fb0950dab..615155fb3 100644
--- a/java/awt/image/Raster.java
+++ b/java/awt/image/Raster.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package java.awt.image;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Point;
 import java.awt.Rectangle;
 
@@ -920,7 +922,7 @@ public class Raster
    */
   public String toString()
   {
-    StringBuffer result = new StringBuffer();
+    CPStringBuilder result = new CPStringBuilder();
     
     result.append(getClass().getName());
     result.append("[(");
diff --git a/java/awt/image/SinglePixelPackedSampleModel.java b/java/awt/image/SinglePixelPackedSampleModel.java
index 1b0ac3f79..225138651 100644
--- a/java/awt/image/SinglePixelPackedSampleModel.java
+++ b/java/awt/image/SinglePixelPackedSampleModel.java
@@ -39,6 +39,7 @@ package java.awt.image;
 import java.util.Arrays;
 
 import gnu.java.awt.BitMaskExtent;
+import gnu.java.lang.CPStringBuilder;
 
 /**
  * A <code>SampleModel</code> used when all samples are stored in a single
@@ -569,7 +570,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
    */
   public String toString()
   {
-    StringBuffer result = new StringBuffer();
+    CPStringBuilder result = new CPStringBuilder();
     result.append(getClass().getName());
     result.append("[");
     result.append("scanlineStride=").append(scanlineStride);