ChangeLog:
2008-05-06 Andrew John Hughes <[EMAIL PROTECTED]>
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.
--
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: java/awt/Component.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.157
diff -u -r1.157 Component.java
--- java/awt/Component.java 27 Nov 2007 22:06:59 -0000 1.157
+++ java/awt/Component.java 6 May 2008 18:00:57 -0000
@@ -43,6 +43,8 @@
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 @@
*/
protected String paramString()
{
- StringBuffer param = new StringBuffer();
+ CPStringBuilder param = new CPStringBuilder();
String name = getName();
if (name != null)
param.append(name).append(",");
Index: java/awt/Container.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.113
diff -u -r1.113 Container.java
--- java/awt/Container.java 25 Dec 2007 00:21:02 -0000 1.113
+++ java/awt/Container.java 6 May 2008 18:00:58 -0000
@@ -39,6 +39,8 @@
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 @@
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());
Index: java/awt/JobAttributes.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/JobAttributes.java,v
retrieving revision 1.3
diff -u -r1.3 JobAttributes.java
--- java/awt/JobAttributes.java 2 Jul 2005 20:32:25 -0000 1.3
+++ java/awt/JobAttributes.java 6 May 2008 18:00:59 -0000
@@ -38,6 +38,8 @@
package java.awt;
+import gnu.java.lang.CPStringBuilder;
+
/**
* Needs documentation...
*
@@ -479,7 +481,7 @@
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=")
Index: java/awt/event/ActionEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/ActionEvent.java,v
retrieving revision 1.8
diff -u -r1.8 ActionEvent.java
--- java/awt/event/ActionEvent.java 2 Jul 2005 20:32:28 -0000 1.8
+++ java/awt/event/ActionEvent.java 6 May 2008 18:00:59 -0000
@@ -38,6 +38,8 @@
package java.awt.event;
+import gnu.java.lang.CPStringBuilder;
+
import java.awt.AWTEvent;
import java.awt.EventQueue;
@@ -202,9 +204,9 @@
*/
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);
Index: java/awt/event/ComponentEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/ComponentEvent.java,v
retrieving revision 1.8
diff -u -r1.8 ComponentEvent.java
--- java/awt/event/ComponentEvent.java 3 Nov 2006 15:14:31 -0000 1.8
+++ java/awt/event/ComponentEvent.java 6 May 2008 18:00:59 -0000
@@ -38,6 +38,8 @@
package java.awt.event;
+import gnu.java.lang.CPStringBuilder;
+
import java.awt.AWTEvent;
import java.awt.Component;
@@ -114,7 +116,7 @@
*/
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.
Index: java/awt/event/HierarchyEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/HierarchyEvent.java,v
retrieving revision 1.5
diff -u -r1.5 HierarchyEvent.java
--- java/awt/event/HierarchyEvent.java 2 Jul 2005 20:32:28 -0000 1.5
+++ java/awt/event/HierarchyEvent.java 6 May 2008 18:00:59 -0000
@@ -38,6 +38,8 @@
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 String paramString()
{
- StringBuffer r = new StringBuffer();
+ CPStringBuilder r = new CPStringBuilder();
switch (id)
{
case HIERARCHY_CHANGED:
Index: java/awt/event/InputEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/InputEvent.java,v
retrieving revision 1.11
diff -u -r1.11 InputEvent.java
--- java/awt/event/InputEvent.java 12 Sep 2005 03:46:42 -0000 1.11
+++ java/awt/event/InputEvent.java 6 May 2008 18:01:00 -0000
@@ -39,6 +39,7 @@
package java.awt.event;
import gnu.java.awt.EventModifier;
+import gnu.java.lang.CPStringBuilder;
import java.awt.Component;
@@ -376,7 +377,7 @@
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)
Index: java/awt/event/InputMethodEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/InputMethodEvent.java,v
retrieving revision 1.7
diff -u -r1.7 InputMethodEvent.java
--- java/awt/event/InputMethodEvent.java 2 Jul 2005 20:32:28 -0000
1.7
+++ java/awt/event/InputMethodEvent.java 6 May 2008 18:01:00 -0000
@@ -38,6 +38,8 @@
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 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, ");
Index: java/awt/event/KeyEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/KeyEvent.java,v
retrieving revision 1.15
diff -u -r1.15 KeyEvent.java
--- java/awt/event/KeyEvent.java 18 Jun 2006 03:45:28 -0000 1.15
+++ java/awt/event/KeyEvent.java 6 May 2008 18:01:01 -0000
@@ -39,6 +39,7 @@
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 String paramString()
{
- StringBuffer s = new StringBuffer();
+ CPStringBuilder s = new CPStringBuilder();
switch (id)
{
Index: java/awt/event/MouseEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/MouseEvent.java,v
retrieving revision 1.15
diff -u -r1.15 MouseEvent.java
--- java/awt/event/MouseEvent.java 15 Oct 2007 18:30:08 -0000 1.15
+++ java/awt/event/MouseEvent.java 6 May 2008 18:01:01 -0000
@@ -39,6 +39,7 @@
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 String paramString()
{
- StringBuffer s = new StringBuffer();
+ CPStringBuilder s = new CPStringBuilder();
switch (id)
{
case MOUSE_CLICKED:
Index: java/awt/event/WindowEvent.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/event/WindowEvent.java,v
retrieving revision 1.10
diff -u -r1.10 WindowEvent.java
--- java/awt/event/WindowEvent.java 2 Jul 2005 20:32:29 -0000 1.10
+++ java/awt/event/WindowEvent.java 6 May 2008 18:01:01 -0000
@@ -38,6 +38,8 @@
package java.awt.event;
+import gnu.java.lang.CPStringBuilder;
+
import java.awt.Frame;
import java.awt.Window;
@@ -270,7 +272,7 @@
*/
public String paramString()
{
- StringBuffer s = new StringBuffer();
+ CPStringBuilder s = new CPStringBuilder();
switch (id)
{
case WINDOW_OPENED:
Index: java/awt/font/TextLayout.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/font/TextLayout.java,v
retrieving revision 1.25
diff -u -r1.25 TextLayout.java
--- java/awt/font/TextLayout.java 10 Dec 2006 20:25:43 -0000 1.25
+++ java/awt/font/TextLayout.java 6 May 2008 18:01:03 -0000
@@ -38,6 +38,8 @@
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 @@
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);
Index: java/awt/image/BandedSampleModel.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/image/BandedSampleModel.java,v
retrieving revision 1.10
diff -u -r1.10 BandedSampleModel.java
--- java/awt/image/BandedSampleModel.java 26 Jul 2006 13:16:08 -0000
1.10
+++ java/awt/image/BandedSampleModel.java 6 May 2008 18:01:03 -0000
@@ -37,6 +37,7 @@
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 String toString()
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
result.append(getClass().getName());
result.append("[");
result.append("scanlineStride=").append(scanlineStride);
Index: java/awt/image/BufferedImage.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/image/BufferedImage.java,v
retrieving revision 1.27
diff -u -r1.27 BufferedImage.java
--- java/awt/image/BufferedImage.java 18 Sep 2007 21:52:34 -0000 1.27
+++ java/awt/image/BufferedImage.java 6 May 2008 18:01:04 -0000
@@ -41,6 +41,8 @@
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 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=");
Index: java/awt/image/MultiPixelPackedSampleModel.java
===================================================================
RCS file:
/sources/classpath/classpath/java/awt/image/MultiPixelPackedSampleModel.java,v
retrieving revision 1.13
diff -u -r1.13 MultiPixelPackedSampleModel.java
--- java/awt/image/MultiPixelPackedSampleModel.java 17 Jul 2006 13:33:08
-0000 1.13
+++ java/awt/image/MultiPixelPackedSampleModel.java 6 May 2008 18:01:04
-0000
@@ -37,6 +37,7 @@
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 String toString()
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
result.append(getClass().getName());
result.append("[");
result.append("scanlineStride=").append(scanlineStride);
Index: java/awt/image/Raster.java
===================================================================
RCS file: /sources/classpath/classpath/java/awt/image/Raster.java,v
retrieving revision 1.13
diff -u -r1.13 Raster.java
--- java/awt/image/Raster.java 7 Jan 2008 09:16:30 -0000 1.13
+++ java/awt/image/Raster.java 6 May 2008 18:01:05 -0000
@@ -37,6 +37,8 @@
package java.awt.image;
+import gnu.java.lang.CPStringBuilder;
+
import java.awt.Point;
import java.awt.Rectangle;
@@ -920,7 +922,7 @@
*/
public String toString()
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
result.append(getClass().getName());
result.append("[(");
Index: java/awt/image/SinglePixelPackedSampleModel.java
===================================================================
RCS file:
/sources/classpath/classpath/java/awt/image/SinglePixelPackedSampleModel.java,v
retrieving revision 1.17
diff -u -r1.17 SinglePixelPackedSampleModel.java
--- java/awt/image/SinglePixelPackedSampleModel.java 9 Mar 2007 10:18:49
-0000 1.17
+++ java/awt/image/SinglePixelPackedSampleModel.java 6 May 2008 18:01:05
-0000
@@ -39,6 +39,7 @@
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 String toString()
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
result.append(getClass().getName());
result.append("[");
result.append("scanlineStride=").append(scanlineStride);
