As subject.
ChangeLog:
2008-05-05 Andrew John Hughes <[EMAIL PROTECTED]>
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.
--
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: gnu/classpath/jdwp/util/Signature.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/util/Signature.java,v
retrieving revision 1.3
diff -u -r1.3 Signature.java
--- gnu/classpath/jdwp/util/Signature.java 7 Jul 2005 23:05:32 -0000
1.3
+++ gnu/classpath/jdwp/util/Signature.java 5 May 2008 02:50:53 -0000
@@ -39,6 +39,8 @@
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 static String computeClassSignature (Class theClass)
{
- StringBuffer sb = new StringBuffer ();
+ CPStringBuilder sb = new CPStringBuilder ();
_addToSignature (sb, theClass);
return sb.toString ();
}
@@ -93,7 +95,7 @@
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 @@
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.
Index: gnu/java/awt/font/opentype/GlyphNamer.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/awt/font/opentype/GlyphNamer.java,v
retrieving revision 1.1
diff -u -r1.1 GlyphNamer.java
--- gnu/java/awt/font/opentype/GlyphNamer.java 30 Apr 2006 09:45:11 -0000
1.1
+++ gnu/java/awt/font/opentype/GlyphNamer.java 5 May 2008 02:50:54 -0000
@@ -37,6 +37,8 @@
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 @@
return name;
}
- StringBuffer buf = new StringBuffer(numChars * 8);
+ CPStringBuilder buf = new CPStringBuilder(numChars * 8);
for (int i = 0; i < numChars; i++)
{
if (i > 0)
Index: gnu/java/awt/font/opentype/truetype/Fixed.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/awt/font/opentype/truetype/Fixed.java,v
retrieving revision 1.4
diff -u -r1.4 Fixed.java
--- gnu/java/awt/font/opentype/truetype/Fixed.java 16 Dec 2006 20:51:02
-0000 1.4
+++ gnu/java/awt/font/opentype/truetype/Fixed.java 5 May 2008 02:50:54
-0000
@@ -38,6 +38,7 @@
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 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(", ");
Index: gnu/java/awt/font/opentype/truetype/VirtualMachine.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java,v
retrieving revision 1.4
diff -u -r1.4 VirtualMachine.java
--- gnu/java/awt/font/opentype/truetype/VirtualMachine.java 21 Dec 2006
13:02:50 -0000 1.4
+++ gnu/java/awt/font/opentype/truetype/VirtualMachine.java 5 May 2008
02:50:55 -0000
@@ -37,6 +37,8 @@
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 @@
*/
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;
Index: gnu/java/awt/peer/gtk/GdkFontPeer.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,v
retrieving revision 1.26
diff -u -r1.26 GdkFontPeer.java
--- gnu/java/awt/peer/gtk/GdkFontPeer.java 8 Feb 2008 22:17:40 -0000
1.26
+++ gnu/java/awt/peer/gtk/GdkFontPeer.java 5 May 2008 02:50:55 -0000
@@ -45,6 +45,8 @@
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 @@
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 @@
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++)
{
Index: gnu/java/awt/peer/gtk/GtkClipboard.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkClipboard.java,v
retrieving revision 1.13
diff -u -r1.13 GtkClipboard.java
--- gnu/java/awt/peer/gtk/GtkClipboard.java 12 Feb 2007 21:39:20 -0000
1.13
+++ gnu/java/awt/peer/gtk/GtkClipboard.java 5 May 2008 02:50:56 -0000
@@ -38,10 +38,25 @@
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 @@
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)
