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

	PR classpath/21869
	* javax/swing/AbstractButton.java,
	* javax/swing/JButton.java,
	* javax/swing/JComboBox.java,
	* javax/swing/JComponent.java,
	* javax/swing/JDesktopPane.java,
	* javax/swing/JFileChooser.java,
	* javax/swing/JFrame.java,
	* javax/swing/JLabel.java,
	* javax/swing/JList.java,
	* javax/swing/JMenuBar.java,
	* javax/swing/JPopupMenu.java,
	* javax/swing/JProgressBar.java,
	* javax/swing/JScrollBar.java,
	* javax/swing/JSlider.java,
	* javax/swing/JSplitPane.java,
	* javax/swing/JTabbedPane.java,
	* javax/swing/JToolBar.java,
	* javax/swing/JToolTip.java,
	* javax/swing/UIManager.java,
	* javax/swing/event/EventListenerList.java,
	* javax/swing/table/AbstractTableModel.java,
	* javax/swing/text/AbstractDocument.java,
	* javax/swing/text/DefaultEditorKit.java,
	* javax/swing/text/DefaultStyledDocument.java,
	* javax/swing/text/JTextComponent.java,
	* javax/swing/text/MaskFormatter.java,
	* javax/swing/text/TabSet.java,
	* javax/swing/text/html/CSSParser.java,
	* javax/swing/text/html/HTMLWriter.java,
	* javax/swing/tree/DefaultTreeSelectionModel.java,
	* javax/xml/namespace/QName.java,
	* javax/xml/transform/TransformerException.java:
	Swap use of StringBuffer for CPStringBuilder.

32 files changed, 97 insertions, 40 deletions

diff --git a/javax/swing/AbstractButton.java b/javax/swing/AbstractButton.java
index cb0f458b8..8764f6f8c 100644
--- a/javax/swing/AbstractButton.java
+++ b/javax/swing/AbstractButton.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -2445,7 +2447,7 @@ public abstract class AbstractButton extends JComponent
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(super.paramString());
     sb.append(",defaultIcon=");
     if (getIcon() != null)
diff --git a/javax/swing/JButton.java b/javax/swing/JButton.java
index 878cfa683..705a86381 100644
--- a/javax/swing/JButton.java
+++ b/javax/swing/JButton.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
@@ -225,7 +227,7 @@ public class JButton extends AbstractButton
     String superParam = super.paramString();
 
     // 41 is the maximum number of chars which may be needed.
-    StringBuffer sb = new StringBuffer(41);
+    CPStringBuilder sb = new CPStringBuilder(41);
     sb.append(",defaultButton=").append(isDefaultButton());
     sb.append(",defaultCapable=").append(defaultCapable);
 
diff --git a/javax/swing/JComboBox.java b/javax/swing/JComboBox.java
index fa6941cf9..74ff315ea 100644
--- a/javax/swing/JComboBox.java
+++ b/javax/swing/JComboBox.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.ItemSelectable;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -1104,7 +1106,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
   protected String paramString()
   {
     String superParamStr = super.paramString();
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(",isEditable=").append(isEditable());
     sb.append(",lightWeightPopupEnabled=").append(isLightWeightPopupEnabled());
     sb.append(",maximumRowCount=").append(getMaximumRowCount());
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index a22a92e3b..f71217867 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.applet.Applet;
 import java.awt.AWTEvent;
 import java.awt.Color;
@@ -2405,7 +2407,7 @@ public abstract class JComponent extends Container implements Serializable
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(super.paramString());
     sb.append(",alignmentX=").append(getAlignmentX());
     sb.append(",alignmentY=").append(getAlignmentY());
diff --git a/javax/swing/JDesktopPane.java b/javax/swing/JDesktopPane.java
index 454870ea6..b068a2998 100644
--- a/javax/swing/JDesktopPane.java
+++ b/javax/swing/JDesktopPane.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Component;
 import java.beans.PropertyVetoException;
 
@@ -306,7 +308,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
   protected String paramString()
   {
     String superParamStr = super.paramString();
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(",isOptimizedDrawingPossible=");
     sb.append(isOptimizedDrawingEnabled());
     sb.append(",desktopManager=");
diff --git a/javax/swing/JFileChooser.java b/javax/swing/JFileChooser.java
index a508b8fcb..b7615a58d 100644
--- a/javax/swing/JFileChooser.java
+++ b/javax/swing/JFileChooser.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Component;
 import java.awt.Frame;
 import java.awt.GraphicsEnvironment;
@@ -1543,7 +1545,7 @@ public class JFileChooser extends JComponent implements Accessible
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer(super.paramString());
+    CPStringBuilder sb = new CPStringBuilder(super.paramString());
     sb.append(",approveButtonText=");
     if (approveButtonText != null)
       sb.append(approveButtonText);
diff --git a/javax/swing/JFrame.java b/javax/swing/JFrame.java
index e54d453b8..0c956b396 100644
--- a/javax/swing/JFrame.java
+++ b/javax/swing/JFrame.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.AWTEvent;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -341,7 +343,7 @@ public class JFrame extends Frame
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer(super.paramString());
+    CPStringBuilder sb = new CPStringBuilder(super.paramString());
     sb.append(",defaultCloseOperation=");
     sb.append(SwingUtilities.convertWindowConstantToString(
         getDefaultCloseOperation()));
diff --git a/javax/swing/JLabel.java b/javax/swing/JLabel.java
index 721287b21..2bbd1ee5f 100644
--- a/javax/swing/JLabel.java
+++ b/javax/swing/JLabel.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -555,7 +557,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer(super.paramString());
+    CPStringBuilder sb = new CPStringBuilder(super.paramString());
     sb.append(",defaultIcon=");
     if (icon != null)
       sb.append(icon);
diff --git a/javax/swing/JList.java b/javax/swing/JList.java
index ff1b23921..bd744064c 100644
--- a/javax/swing/JList.java
+++ b/javax/swing/JList.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.ComponentOrientation;
@@ -2481,7 +2483,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer(super.paramString());
+    CPStringBuilder sb = new CPStringBuilder(super.paramString());
     sb.append(",fixedCellHeight=").append(getFixedCellHeight());
     sb.append(",fixedCellWidth=").append(getFixedCellWidth());
     sb.append(",selectionBackground=");
diff --git a/javax/swing/JMenuBar.java b/javax/swing/JMenuBar.java
index 73b409e42..030fc4cb8 100644
--- a/javax/swing/JMenuBar.java
+++ b/javax/swing/JMenuBar.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Insets;
@@ -481,7 +483,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(super.paramString());
     sb.append(",margin=");
     if (getMargin() != null)
diff --git a/javax/swing/JPopupMenu.java b/javax/swing/JPopupMenu.java
index 1ae8adad0..ac1a9ebf2 100644
--- a/javax/swing/JPopupMenu.java
+++ b/javax/swing/JPopupMenu.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Insets;
@@ -767,7 +769,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(super.paramString());
     sb.append(",label=");
     if (getLabel() != null)
diff --git a/javax/swing/JProgressBar.java b/javax/swing/JProgressBar.java
index ed2d0088d..b20b02a06 100644
--- a/javax/swing/JProgressBar.java
+++ b/javax/swing/JProgressBar.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Graphics;
 import java.beans.PropertyChangeEvent;
 
@@ -786,7 +788,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
   protected String paramString()
   {
     String superParamStr = super.paramString();
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(",orientation=");
     if (orientation == HORIZONTAL)
       sb.append("HORIZONTAL");
diff --git a/javax/swing/JScrollBar.java b/javax/swing/JScrollBar.java
index f55feb3f2..371bb60c6 100644
--- a/javax/swing/JScrollBar.java
+++ b/javax/swing/JScrollBar.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Adjustable;
 import java.awt.Dimension;
 import java.awt.event.AdjustmentEvent;
@@ -671,7 +673,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer(super.paramString());
+    CPStringBuilder sb = new CPStringBuilder(super.paramString());
     sb.append(",blockIncrement=").append(blockIncrement);
     sb.append(",orientation=");
     if (this.orientation == JScrollBar.HORIZONTAL)
diff --git a/javax/swing/JSlider.java b/javax/swing/JSlider.java
index 948a9629b..979707a72 100644
--- a/javax/swing/JSlider.java
+++ b/javax/swing/JSlider.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.MenuContainer;
 import java.awt.image.ImageObserver;
 import java.beans.PropertyChangeEvent;
@@ -1104,7 +1106,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   protected String paramString()
   {
     String superParamStr = super.paramString();
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(",isInverted=").append(getInverted());
     sb.append(",majorTickSpacing=").append(getMajorTickSpacing());
     sb.append(",minorTickSpacing=").append(getMinorTickSpacing());
diff --git a/javax/swing/JSplitPane.java b/javax/swing/JSplitPane.java
index fcdc1c041..5b6ec158e 100644
--- a/javax/swing/JSplitPane.java
+++ b/javax/swing/JSplitPane.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Component;
 import java.awt.Graphics;
 import java.beans.PropertyChangeEvent;
@@ -597,7 +599,7 @@ public class JSplitPane extends JComponent implements Accessible
   {
     // FIXME: the next line can be restored once PR27208 is fixed
     String superParamStr = ""; //super.paramString();
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append(",continuousLayout=").append(isContinuousLayout());
     sb.append(",dividerSize=").append(getDividerSize());
     sb.append(",lastDividerLocation=").append(getLastDividerLocation());
diff --git a/javax/swing/JTabbedPane.java b/javax/swing/JTabbedPane.java
index c7244bf2b..79521be3f 100644
--- a/javax/swing/JTabbedPane.java
+++ b/javax/swing/JTabbedPane.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Point;
@@ -1692,7 +1694,7 @@ public class JTabbedPane extends JComponent implements Serializable,
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer(super.paramString());
+    CPStringBuilder sb = new CPStringBuilder(super.paramString());
     sb.append(",tabPlacement=");
     if (tabPlacement == TOP)
       sb.append("TOP");
diff --git a/javax/swing/JToolBar.java b/javax/swing/JToolBar.java
index fe4d2ae20..33ebcfcaf 100644
--- a/javax/swing/JToolBar.java
+++ b/javax/swing/JToolBar.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
@@ -766,7 +768,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer(super.paramString());
+    CPStringBuilder sb = new CPStringBuilder(super.paramString());
     sb.append(",floatable=").append(floatable);
     sb.append(",margin=");
     if (margin != null)
diff --git a/javax/swing/JToolTip.java b/javax/swing/JToolTip.java
index 16bdd2d7e..f59ec95fb 100644
--- a/javax/swing/JToolTip.java
+++ b/javax/swing/JToolTip.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.AWTEvent;
 import java.beans.PropertyChangeEvent;
 
@@ -179,7 +181,7 @@ public class JToolTip extends JComponent implements Accessible
    */
   protected String paramString()
   {
-    StringBuffer sb = new StringBuffer(super.paramString());
+    CPStringBuilder sb = new CPStringBuilder(super.paramString());
     sb.append(",tiptext=");
     if (text != null)
       sb.append(text);
diff --git a/javax/swing/UIManager.java b/javax/swing/UIManager.java
index 3b1b3f72b..0369b6514 100644
--- a/javax/swing/UIManager.java
+++ b/javax/swing/UIManager.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -107,7 +109,7 @@ public class UIManager implements Serializable
      */
     public String toString()
     {
-      StringBuffer s = new StringBuffer();
+      CPStringBuilder s = new CPStringBuilder();
       s.append(getClass().getName());
       s.append('[');
       s.append(getName());
diff --git a/javax/swing/event/EventListenerList.java b/javax/swing/event/EventListenerList.java
index 1568039f0..8c76f7f87 100644
--- a/javax/swing/event/EventListenerList.java
+++ b/javax/swing/event/EventListenerList.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package javax.swing.event;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -295,7 +297,7 @@ public class EventListenerList
    */
   public String toString()
   {
-    StringBuffer buf = new StringBuffer("EventListenerList: ");
+    CPStringBuilder buf = new CPStringBuilder("EventListenerList: ");
     buf.append(listenerList.length / 2);
     buf.append(" listeners: ");
     for (int i = 0; i < listenerList.length; i += 2)
diff --git a/javax/swing/table/AbstractTableModel.java b/javax/swing/table/AbstractTableModel.java
index 66b6a0743..743e5d4dc 100644
--- a/javax/swing/table/AbstractTableModel.java
+++ b/javax/swing/table/AbstractTableModel.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.table;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 import java.util.EventListener;
 
@@ -80,7 +82,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
    */
   public String getColumnName(int columnIndex)
   {
-    StringBuffer buffer = new StringBuffer();
+    CPStringBuilder buffer = new CPStringBuilder();
     while (columnIndex >= 0)
       {
         buffer.insert(0, (char) ('A' + columnIndex % 26));
diff --git a/javax/swing/text/AbstractDocument.java b/javax/swing/text/AbstractDocument.java
index 72178f840..29b20b321 100644
--- a/javax/swing/text/AbstractDocument.java
+++ b/javax/swing/text/AbstractDocument.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.text;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.font.TextAttribute;
 import java.io.PrintStream;
 import java.io.Serializable;
@@ -2013,7 +2015,7 @@ public abstract class AbstractDocument implements Document, Serializable
      */
     public void dump(PrintStream stream, int indent)
     {
-      StringBuffer b = new StringBuffer();
+      CPStringBuilder b = new CPStringBuilder();
       for (int i = 0; i < indent; ++i)
         b.append(' ');
       b.append('<');
diff --git a/javax/swing/text/DefaultEditorKit.java b/javax/swing/text/DefaultEditorKit.java
index aa69deca5..0d999a380 100644
--- a/javax/swing/text/DefaultEditorKit.java
+++ b/javax/swing/text/DefaultEditorKit.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.text;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 
@@ -1634,7 +1636,7 @@ public class DefaultEditorKit extends EditorKit
     BufferedReader reader = new BufferedReader(in);
 
     String line;
-    StringBuffer content = new StringBuffer();
+    CPStringBuilder content = new CPStringBuilder();
 
     while ((line = reader.readLine()) != null)
       {
diff --git a/javax/swing/text/DefaultStyledDocument.java b/javax/swing/text/DefaultStyledDocument.java
index 341579e3d..8c70a8a3b 100644
--- a/javax/swing/text/DefaultStyledDocument.java
+++ b/javax/swing/text/DefaultStyledDocument.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.text;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.Color;
 import java.awt.Font;
 import java.io.Serializable;
@@ -374,7 +376,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
      */
     public String toString()
     {
-      StringBuilder b = new StringBuilder();
+      CPStringBuilder b = new CPStringBuilder();
       switch (type)
         {
         case StartTagType:
@@ -2420,7 +2422,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
         writeLock();
 
         // First we collect the content to be inserted.
-        StringBuffer contentBuffer = new StringBuffer();
+        CPStringBuilder contentBuffer = new CPStringBuilder();
         for (int i = 0; i < data.length; i++)
           {
             // Collect all inserts into one so we can get the correct
diff --git a/javax/swing/text/JTextComponent.java b/javax/swing/text/JTextComponent.java
index 8e70fe2bb..24035e35a 100644
--- a/javax/swing/text/JTextComponent.java
+++ b/javax/swing/text/JTextComponent.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.text;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.awt.AWTEvent;
 import java.awt.Color;
 import java.awt.Container;
@@ -2016,7 +2018,7 @@ public abstract class JTextComponent extends JComponent
           d.putProperty(Document.StreamDescriptionProperty, streamDescription);
       }
 
-    StringBuffer b = new StringBuffer();
+    CPStringBuilder b = new CPStringBuilder();
     int c;
 
     // Read till -1 (EOF).
diff --git a/javax/swing/text/MaskFormatter.java b/javax/swing/text/MaskFormatter.java
index 581cceb61..4ebf65b93 100644
--- a/javax/swing/text/MaskFormatter.java
+++ b/javax/swing/text/MaskFormatter.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.text;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.text.ParseException;
 
 import javax.swing.JFormattedTextField;
@@ -311,7 +313,7 @@ public class MaskFormatter extends DefaultFormatter
   private String convertStringToValue(String value)
     throws ParseException
   {
-    StringBuffer result = new StringBuffer();
+    CPStringBuilder result = new CPStringBuilder();
     char valueChar;
     boolean isPlaceHolder;
 
@@ -447,7 +449,7 @@ public class MaskFormatter extends DefaultFormatter
   private String convertValueToString(String value)
     throws ParseException
   {
-    StringBuffer result = new StringBuffer();
+    CPStringBuilder result = new CPStringBuilder();
     char valueChar;
     boolean isPlaceHolder;
 
diff --git a/javax/swing/text/TabSet.java b/javax/swing/text/TabSet.java
index 0f2c8c7c1..c08a650fb 100644
--- a/javax/swing/text/TabSet.java
+++ b/javax/swing/text/TabSet.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package javax.swing.text;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 /**
@@ -194,7 +196,7 @@ public class TabSet implements Serializable
    */
   public String toString()
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     sb.append("[ ");
     for (int i = 0; i < tabs.length; ++i)
       {
diff --git a/javax/swing/text/html/CSSParser.java b/javax/swing/text/html/CSSParser.java
index 54a16bcc5..d49ac3a6f 100644
--- a/javax/swing/text/html/CSSParser.java
+++ b/javax/swing/text/html/CSSParser.java
@@ -163,11 +163,6 @@ class CSSParser
   private int pushedChar;
 
   /**
-   * Temporary place to hold identifiers.
-   */
-  private StringBuffer unitBuffer;
-
-  /**
    * Used to indicate blocks.
    */
   private int[] unitStack;
@@ -212,7 +207,6 @@ class CSSParser
    */
   CSSParser()
   {
-    unitBuffer = new StringBuffer();
     tokenBuffer = new char[10];
   }
 
diff --git a/javax/swing/text/html/HTMLWriter.java b/javax/swing/text/html/HTMLWriter.java
index 44119c732..6cc23df9a 100644
--- a/javax/swing/text/html/HTMLWriter.java
+++ b/javax/swing/text/html/HTMLWriter.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package javax.swing.text.html;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.IOException;
 import java.io.Writer;
 
@@ -574,7 +576,7 @@ public class HTMLWriter
   protected void output(char[] chars, int off, int len)
    throws IOException
   {
-    StringBuffer strBuffer = new StringBuffer();
+    CPStringBuilder strBuffer = new CPStringBuilder();
 
     for (int i = 0; i < chars.length; i++)
       {
@@ -1081,4 +1083,4 @@ public class HTMLWriter
       return ret_str;
   } // private String escapeCharHtmlEntity(char param_char)
 
-} // public class HTMLWriter extends AbstractWriter
\ No newline at end of file
+} // public class HTMLWriter extends AbstractWriter
diff --git a/javax/swing/tree/DefaultTreeSelectionModel.java b/javax/swing/tree/DefaultTreeSelectionModel.java
index 2bb0d0045..b2806f272 100644
--- a/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.tree;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -224,7 +226,7 @@ public class DefaultTreeSelectionModel
       return "[selection empty]";
     else
       {
-        StringBuffer b = new StringBuffer("selected rows: [");
+        CPStringBuilder b = new CPStringBuilder("selected rows: [");
         for (int i = 0; i < selection.length; i++)
           {
             b.append(getRow(selection[i]));
diff --git a/javax/xml/namespace/QName.java b/javax/xml/namespace/QName.java
index 18dee79bb..3c7562378 100644
--- a/javax/xml/namespace/QName.java
+++ b/javax/xml/namespace/QName.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.xml.namespace;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 import javax.xml.XMLConstants;
@@ -126,7 +128,7 @@ public class QName implements Serializable
   {
     if (qName == null)
       {
-	StringBuffer buf = new StringBuffer();
+	CPStringBuilder buf = new CPStringBuilder();
 	if (namespaceURI.length() > 0)
 	  {
 	    buf.append('{');
diff --git a/javax/xml/transform/TransformerException.java b/javax/xml/transform/TransformerException.java
index 3d97eda1b..7a0b5ad98 100644
--- a/javax/xml/transform/TransformerException.java
+++ b/javax/xml/transform/TransformerException.java
@@ -34,8 +34,11 @@ or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
+
 package javax.xml.transform;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
@@ -179,7 +182,7 @@ public class TransformerException
     String systemId = locator.getSystemId();
     int lineNumber = locator.getLineNumber();
     int columnNumber = locator.getColumnNumber();
-    StringBuffer buffer = new StringBuffer ();
+    CPStringBuilder buffer = new CPStringBuilder ();
     if (publicId != null)
       {
         buffer.append ("publicId=");