The last one... ChangeLog:
2008-05-07 Andrew John Hughes <[EMAIL PROTECTED]> 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. -- Andrew :) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: javax/swing/AbstractButton.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/AbstractButton.java,v retrieving revision 1.69 diff -u -r1.69 AbstractButton.java --- javax/swing/AbstractButton.java 16 Oct 2006 12:23:33 -0000 1.69 +++ javax/swing/AbstractButton.java 7 May 2008 01:16:13 -0000 @@ -37,6 +37,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Graphics; import java.awt.Image; @@ -2445,7 +2447,7 @@ */ protected String paramString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(super.paramString()); sb.append(",defaultIcon="); if (getIcon() != null) Index: javax/swing/JButton.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JButton.java,v retrieving revision 1.27 diff -u -r1.27 JButton.java --- javax/swing/JButton.java 19 Sep 2006 14:26:43 -0000 1.27 +++ javax/swing/JButton.java 7 May 2008 01:16:13 -0000 @@ -37,6 +37,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; @@ -225,7 +227,7 @@ 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); Index: javax/swing/JComboBox.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JComboBox.java,v retrieving revision 1.35 diff -u -r1.35 JComboBox.java --- javax/swing/JComboBox.java 10 Dec 2006 20:25:48 -0000 1.35 +++ javax/swing/JComboBox.java 7 May 2008 01:16:16 -0000 @@ -38,6 +38,8 @@ 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 @@ 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()); Index: javax/swing/JComponent.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JComponent.java,v retrieving revision 1.152 diff -u -r1.152 JComponent.java --- javax/swing/JComponent.java 21 Dec 2006 13:02:51 -0000 1.152 +++ javax/swing/JComponent.java 7 May 2008 01:16:19 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.applet.Applet; import java.awt.AWTEvent; import java.awt.Color; @@ -2405,7 +2407,7 @@ */ 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()); Index: javax/swing/JDesktopPane.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JDesktopPane.java,v retrieving revision 1.15 diff -u -r1.15 JDesktopPane.java --- javax/swing/JDesktopPane.java 20 Apr 2006 11:07:26 -0000 1.15 +++ javax/swing/JDesktopPane.java 7 May 2008 01:16:20 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.beans.PropertyVetoException; @@ -306,7 +308,7 @@ protected String paramString() { String superParamStr = super.paramString(); - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(",isOptimizedDrawingPossible="); sb.append(isOptimizedDrawingEnabled()); sb.append(",desktopManager="); Index: javax/swing/JFileChooser.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JFileChooser.java,v retrieving revision 1.35 diff -u -r1.35 JFileChooser.java --- javax/swing/JFileChooser.java 15 Jul 2006 21:37:53 -0000 1.35 +++ javax/swing/JFileChooser.java 7 May 2008 01:16:21 -0000 @@ -37,6 +37,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Frame; import java.awt.GraphicsEnvironment; @@ -1543,7 +1545,7 @@ */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",approveButtonText="); if (approveButtonText != null) sb.append(approveButtonText); Index: javax/swing/JFrame.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JFrame.java,v retrieving revision 1.38 diff -u -r1.38 JFrame.java --- javax/swing/JFrame.java 25 Dec 2007 01:26:23 -0000 1.38 +++ javax/swing/JFrame.java 7 May 2008 01:16:22 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.awt.BorderLayout; import java.awt.Component; @@ -341,7 +343,7 @@ */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",defaultCloseOperation="); sb.append(SwingUtilities.convertWindowConstantToString( getDefaultCloseOperation())); Index: javax/swing/JLabel.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JLabel.java,v retrieving revision 1.43 diff -u -r1.43 JLabel.java --- javax/swing/JLabel.java 9 Nov 2006 19:22:29 -0000 1.43 +++ javax/swing/JLabel.java 7 May 2008 01:16:23 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Font; import java.awt.FontMetrics; @@ -555,7 +557,7 @@ */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",defaultIcon="); if (icon != null) sb.append(icon); Index: javax/swing/JList.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JList.java,v retrieving revision 1.61 diff -u -r1.61 JList.java --- javax/swing/JList.java 10 Dec 2006 20:25:48 -0000 1.61 +++ javax/swing/JList.java 7 May 2008 01:16:27 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Color; import java.awt.Component; import java.awt.ComponentOrientation; @@ -2481,7 +2483,7 @@ */ 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="); Index: javax/swing/JMenuBar.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JMenuBar.java,v retrieving revision 1.26 diff -u -r1.26 JMenuBar.java --- javax/swing/JMenuBar.java 19 Sep 2006 14:41:52 -0000 1.26 +++ javax/swing/JMenuBar.java 7 May 2008 01:16:27 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Graphics; import java.awt.Insets; @@ -481,7 +483,7 @@ */ protected String paramString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(super.paramString()); sb.append(",margin="); if (getMargin() != null) Index: javax/swing/JPopupMenu.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JPopupMenu.java,v retrieving revision 1.39 diff -u -r1.39 JPopupMenu.java --- javax/swing/JPopupMenu.java 23 Aug 2006 22:03:23 -0000 1.39 +++ javax/swing/JPopupMenu.java 7 May 2008 01:16:28 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Dimension; import java.awt.Insets; @@ -767,7 +769,7 @@ */ protected String paramString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(super.paramString()); sb.append(",label="); if (getLabel() != null) Index: javax/swing/JProgressBar.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JProgressBar.java,v retrieving revision 1.21 diff -u -r1.21 JProgressBar.java --- javax/swing/JProgressBar.java 12 May 2006 11:40:49 -0000 1.21 +++ javax/swing/JProgressBar.java 7 May 2008 01:16:29 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Graphics; import java.beans.PropertyChangeEvent; @@ -786,7 +788,7 @@ protected String paramString() { String superParamStr = super.paramString(); - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append(",orientation="); if (orientation == HORIZONTAL) sb.append("HORIZONTAL"); Index: javax/swing/JScrollBar.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JScrollBar.java,v retrieving revision 1.18 diff -u -r1.18 JScrollBar.java --- javax/swing/JScrollBar.java 27 Mar 2007 09:01:47 -0000 1.18 +++ javax/swing/JScrollBar.java 7 May 2008 01:16:29 -0000 @@ -38,6 +38,8 @@ 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 @@ */ 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) Index: javax/swing/JSlider.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JSlider.java,v retrieving revision 1.32 diff -u -r1.32 JSlider.java --- javax/swing/JSlider.java 20 Nov 2006 19:59:50 -0000 1.32 +++ javax/swing/JSlider.java 7 May 2008 01:16:32 -0000 @@ -38,6 +38,8 @@ 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 @@ 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()); Index: javax/swing/JSplitPane.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JSplitPane.java,v retrieving revision 1.20 diff -u -r1.20 JSplitPane.java --- javax/swing/JSplitPane.java 9 Oct 2006 13:51:43 -0000 1.20 +++ javax/swing/JSplitPane.java 7 May 2008 01:16:32 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Graphics; import java.beans.PropertyChangeEvent; @@ -597,7 +599,7 @@ { // 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()); Index: javax/swing/JTabbedPane.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JTabbedPane.java,v retrieving revision 1.45 diff -u -r1.45 JTabbedPane.java --- javax/swing/JTabbedPane.java 21 Sep 2006 13:17:10 -0000 1.45 +++ javax/swing/JTabbedPane.java 7 May 2008 01:16:33 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Color; import java.awt.Component; import java.awt.Point; @@ -1692,7 +1694,7 @@ */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",tabPlacement="); if (tabPlacement == TOP) sb.append("TOP"); Index: javax/swing/JToolBar.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JToolBar.java,v retrieving revision 1.18 diff -u -r1.18 JToolBar.java --- javax/swing/JToolBar.java 5 May 2006 02:37:34 -0000 1.18 +++ javax/swing/JToolBar.java 7 May 2008 01:16:34 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.Component; import java.awt.Container; import java.awt.Dimension; @@ -766,7 +768,7 @@ */ 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) Index: javax/swing/JToolTip.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/JToolTip.java,v retrieving revision 1.16 diff -u -r1.16 JToolTip.java --- javax/swing/JToolTip.java 19 Dec 2006 01:14:22 -0000 1.16 +++ javax/swing/JToolTip.java 7 May 2008 01:16:34 -0000 @@ -38,6 +38,8 @@ package javax.swing; +import gnu.java.lang.CPStringBuilder; + import java.awt.AWTEvent; import java.beans.PropertyChangeEvent; @@ -179,7 +181,7 @@ */ protected String paramString() { - StringBuffer sb = new StringBuffer(super.paramString()); + CPStringBuilder sb = new CPStringBuilder(super.paramString()); sb.append(",tiptext="); if (text != null) sb.append(text); Index: javax/swing/UIManager.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/UIManager.java,v retrieving revision 1.40 diff -u -r1.40 UIManager.java --- javax/swing/UIManager.java 6 Sep 2006 15:47:30 -0000 1.40 +++ javax/swing/UIManager.java 7 May 2008 01:16:35 -0000 @@ -38,6 +38,8 @@ 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 String toString() { - StringBuffer s = new StringBuffer(); + CPStringBuilder s = new CPStringBuilder(); s.append(getClass().getName()); s.append('['); s.append(getName()); Index: javax/swing/event/EventListenerList.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/event/EventListenerList.java,v retrieving revision 1.19 diff -u -r1.19 EventListenerList.java --- javax/swing/event/EventListenerList.java 10 Dec 2006 20:25:48 -0000 1.19 +++ javax/swing/event/EventListenerList.java 7 May 2008 01:16:36 -0000 @@ -37,6 +37,8 @@ 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 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) Index: javax/swing/table/AbstractTableModel.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/table/AbstractTableModel.java,v retrieving revision 1.16 diff -u -r1.16 AbstractTableModel.java --- javax/swing/table/AbstractTableModel.java 10 Dec 2006 20:25:48 -0000 1.16 +++ javax/swing/table/AbstractTableModel.java 7 May 2008 01:16:37 -0000 @@ -38,6 +38,8 @@ package javax.swing.table; +import gnu.java.lang.CPStringBuilder; + import java.io.Serializable; import java.util.EventListener; @@ -80,7 +82,7 @@ */ public String getColumnName(int columnIndex) { - StringBuffer buffer = new StringBuffer(); + CPStringBuilder buffer = new CPStringBuilder(); while (columnIndex >= 0) { buffer.insert(0, (char) ('A' + columnIndex % 26)); Index: javax/swing/text/AbstractDocument.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/text/AbstractDocument.java,v retrieving revision 1.67 diff -u -r1.67 AbstractDocument.java --- javax/swing/text/AbstractDocument.java 19 Dec 2006 01:14:23 -0000 1.67 +++ javax/swing/text/AbstractDocument.java 7 May 2008 01:16:40 -0000 @@ -38,6 +38,8 @@ 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 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('<'); Index: javax/swing/text/DefaultEditorKit.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/text/DefaultEditorKit.java,v retrieving revision 1.35 diff -u -r1.35 DefaultEditorKit.java --- javax/swing/text/DefaultEditorKit.java 31 Aug 2006 19:48:39 -0000 1.35 +++ javax/swing/text/DefaultEditorKit.java 7 May 2008 01:16:42 -0000 @@ -38,6 +38,8 @@ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.awt.Toolkit; import java.awt.event.ActionEvent; @@ -1634,7 +1636,7 @@ BufferedReader reader = new BufferedReader(in); String line; - StringBuffer content = new StringBuffer(); + CPStringBuilder content = new CPStringBuilder(); while ((line = reader.readLine()) != null) { Index: javax/swing/text/DefaultStyledDocument.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/text/DefaultStyledDocument.java,v retrieving revision 1.74 diff -u -r1.74 DefaultStyledDocument.java --- javax/swing/text/DefaultStyledDocument.java 15 Oct 2007 18:25:37 -0000 1.74 +++ javax/swing/text/DefaultStyledDocument.java 7 May 2008 01:16:46 -0000 @@ -38,6 +38,8 @@ 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 String toString() { - StringBuilder b = new StringBuilder(); + CPStringBuilder b = new CPStringBuilder(); switch (type) { case StartTagType: @@ -2420,7 +2422,7 @@ 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 Index: javax/swing/text/JTextComponent.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/text/JTextComponent.java,v retrieving revision 1.62 diff -u -r1.62 JTextComponent.java --- javax/swing/text/JTextComponent.java 19 Dec 2006 01:14:23 -0000 1.62 +++ javax/swing/text/JTextComponent.java 7 May 2008 01:16:47 -0000 @@ -38,6 +38,8 @@ 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 @@ d.putProperty(Document.StreamDescriptionProperty, streamDescription); } - StringBuffer b = new StringBuffer(); + CPStringBuilder b = new CPStringBuilder(); int c; // Read till -1 (EOF). Index: javax/swing/text/MaskFormatter.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/text/MaskFormatter.java,v retrieving revision 1.4 diff -u -r1.4 MaskFormatter.java --- javax/swing/text/MaskFormatter.java 29 Aug 2006 19:50:39 -0000 1.4 +++ javax/swing/text/MaskFormatter.java 7 May 2008 01:16:47 -0000 @@ -38,6 +38,8 @@ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.text.ParseException; import javax.swing.JFormattedTextField; @@ -311,7 +313,7 @@ private String convertStringToValue(String value) throws ParseException { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); char valueChar; boolean isPlaceHolder; @@ -447,7 +449,7 @@ private String convertValueToString(String value) throws ParseException { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); char valueChar; boolean isPlaceHolder; Index: javax/swing/text/TabSet.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/text/TabSet.java,v retrieving revision 1.5 diff -u -r1.5 TabSet.java --- javax/swing/text/TabSet.java 25 Jul 2006 09:14:10 -0000 1.5 +++ javax/swing/text/TabSet.java 7 May 2008 01:16:47 -0000 @@ -37,6 +37,8 @@ package javax.swing.text; +import gnu.java.lang.CPStringBuilder; + import java.io.Serializable; /** @@ -194,7 +196,7 @@ */ public String toString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); sb.append("[ "); for (int i = 0; i < tabs.length; ++i) { Index: javax/swing/text/html/CSSParser.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/text/html/CSSParser.java,v retrieving revision 1.6 diff -u -r1.6 CSSParser.java --- javax/swing/text/html/CSSParser.java 21 Dec 2006 13:02:50 -0000 1.6 +++ javax/swing/text/html/CSSParser.java 7 May 2008 01:16:48 -0000 @@ -163,11 +163,6 @@ private int pushedChar; /** - * Temporary place to hold identifiers. - */ - private StringBuffer unitBuffer; - - /** * Used to indicate blocks. */ private int[] unitStack; @@ -212,7 +207,6 @@ */ CSSParser() { - unitBuffer = new StringBuffer(); tokenBuffer = new char[10]; } Index: javax/swing/text/html/HTMLWriter.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/text/html/HTMLWriter.java,v retrieving revision 1.2 diff -u -r1.2 HTMLWriter.java --- javax/swing/text/html/HTMLWriter.java 10 Nov 2006 16:29:10 -0000 1.2 +++ javax/swing/text/html/HTMLWriter.java 7 May 2008 01:16:50 -0000 @@ -37,6 +37,8 @@ package javax.swing.text.html; +import gnu.java.lang.CPStringBuilder; + import java.io.IOException; import java.io.Writer; @@ -574,7 +576,7 @@ 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 @@ 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 Index: javax/swing/tree/DefaultTreeSelectionModel.java =================================================================== RCS file: /sources/classpath/classpath/javax/swing/tree/DefaultTreeSelectionModel.java,v retrieving revision 1.36 diff -u -r1.36 DefaultTreeSelectionModel.java --- javax/swing/tree/DefaultTreeSelectionModel.java 17 Feb 2008 19:40:20 -0000 1.36 +++ javax/swing/tree/DefaultTreeSelectionModel.java 7 May 2008 01:16:51 -0000 @@ -38,6 +38,8 @@ 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 @@ 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])); Index: javax/xml/namespace/QName.java =================================================================== RCS file: /sources/classpath/classpath/javax/xml/namespace/QName.java,v retrieving revision 1.10 diff -u -r1.10 QName.java --- javax/xml/namespace/QName.java 27 Mar 2008 17:39:27 -0000 1.10 +++ javax/xml/namespace/QName.java 7 May 2008 01:16:51 -0000 @@ -38,6 +38,8 @@ package javax.xml.namespace; +import gnu.java.lang.CPStringBuilder; + import java.io.Serializable; import javax.xml.XMLConstants; @@ -126,7 +128,7 @@ { if (qName == null) { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); if (namespaceURI.length() > 0) { buf.append('{'); Index: javax/xml/transform/TransformerException.java =================================================================== RCS file: /sources/classpath/classpath/javax/xml/transform/TransformerException.java,v retrieving revision 1.4 diff -u -r1.4 TransformerException.java --- javax/xml/transform/TransformerException.java 19 Sep 2005 15:27:11 -0000 1.4 +++ javax/xml/transform/TransformerException.java 7 May 2008 01:16:51 -0000 @@ -34,8 +34,11 @@ 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 @@ 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=");