Yet more...
ChangeLog:
2008-05-06 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/21869
* java/beans/Statement.java,
* java/io/File.java,
* java/io/StreamTokenizer.java,
* java/lang/Throwable.java,
* java/math/BigDecimal.java,
* java/math/BigInteger.java,
* java/net/Inet4Address.java,
* java/net/Inet6Address.java,
* java/net/NetworkInterface.java,
* java/net/SocketPermission.java,
* java/net/URLDecoder.java,
* java/net/URLStreamHandler.java,
* java/nio/channels/FileLock.java,
* java/rmi/dgc/VMID.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/beans/Statement.java
===================================================================
RCS file: /sources/classpath/classpath/java/beans/Statement.java,v
retrieving revision 1.5
diff -u -r1.5 Statement.java
--- java/beans/Statement.java 16 Nov 2006 05:29:54 -0000 1.5
+++ java/beans/Statement.java 6 May 2008 19:32:30 -0000
@@ -38,6 +38,8 @@
package java.beans;
+import gnu.java.lang.CPStringBuilder;
+
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -353,7 +355,7 @@
*/
public String toString()
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
String targetName;
if (target != null)
Index: java/io/File.java
===================================================================
RCS file: /sources/classpath/classpath/java/io/File.java,v
retrieving revision 1.73
diff -u -r1.73 File.java
--- java/io/File.java 9 Apr 2008 20:23:15 -0000 1.73
+++ java/io/File.java 6 May 2008 19:32:30 -0000
@@ -41,6 +41,8 @@
import gnu.classpath.SystemProperties;
+import gnu.java.lang.CPStringBuilder;
+
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -317,7 +319,7 @@
return p;
}
- StringBuffer newpath = new StringBuffer(plen);
+ CPStringBuilder newpath = new CPStringBuilder(plen);
int last = 0;
while (dupIndex != -1)
{
Index: java/io/StreamTokenizer.java
===================================================================
RCS file: /sources/classpath/classpath/java/io/StreamTokenizer.java,v
retrieving revision 1.22
diff -u -r1.22 StreamTokenizer.java
--- java/io/StreamTokenizer.java 21 Dec 2006 13:02:50 -0000 1.22
+++ java/io/StreamTokenizer.java 6 May 2008 19:32:30 -0000
@@ -37,6 +37,8 @@
package java.io;
+import gnu.java.lang.CPStringBuilder;
+
/**
* This class parses streams of characters into tokens. There are a
* million-zillion flags that can be set to control the parsing, as
@@ -391,7 +393,7 @@
}
}
- StringBuffer tokbuf = new StringBuffer();
+ CPStringBuilder tokbuf = new CPStringBuilder();
tokbuf.append((char) ch);
int decCount = 0;
@@ -417,7 +419,7 @@
}
else if (isAlphabetic(ch))
{
- StringBuffer tokbuf = new StringBuffer();
+ CPStringBuilder tokbuf = new CPStringBuilder();
tokbuf.append((char) ch);
while (isAlphabetic(ch = in.read()) || isNumeric(ch))
tokbuf.append((char) ch);
@@ -440,7 +442,7 @@
else if (isQuote(ch))
{
ttype = ch;
- StringBuffer tokbuf = new StringBuffer();
+ CPStringBuilder tokbuf = new CPStringBuilder();
while ((ch = in.read()) != ttype && ch != '\n' && ch != '\r' &&
ch != TT_EOF)
{
Index: java/lang/Throwable.java
===================================================================
RCS file: /sources/classpath/classpath/java/lang/Throwable.java,v
retrieving revision 1.31
diff -u -r1.31 Throwable.java
--- java/lang/Throwable.java 5 Feb 2008 14:59:05 -0000 1.31
+++ java/lang/Throwable.java 6 May 2008 19:32:31 -0000
@@ -39,6 +39,8 @@
import gnu.classpath.SystemProperties;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Serializable;
@@ -411,7 +413,7 @@
// different threads to get mixed up when written to the same PrintWriter.
private String stackTraceString()
{
- StringBuilder sb = new StringBuilder();
+ CPStringBuilder sb = new CPStringBuilder();
// Main stacktrace
StackTraceElement[] stack = getStackTrace();
@@ -455,7 +457,7 @@
// Adds to the given StringBuffer a line containing the name and
// all stacktrace elements minus the last equal ones.
- private static void stackTraceStringBuffer(StringBuilder sb, String name,
+ private static void stackTraceStringBuffer(CPStringBuilder sb, String name,
StackTraceElement[] stack, int equal)
{
String nl = StaticData.nl;
Index: java/math/BigDecimal.java
===================================================================
RCS file: /sources/classpath/classpath/java/math/BigDecimal.java,v
retrieving revision 1.26
diff -u -r1.26 BigDecimal.java
--- java/math/BigDecimal.java 16 Mar 2008 22:04:51 -0000 1.26
+++ java/math/BigDecimal.java 6 May 2008 19:32:32 -0000
@@ -1244,8 +1244,8 @@
int point = bigStr.length() - scale - (negative ? 1 : 0);
- StringBuffer sb = new StringBuffer(bigStr.length() + 2
- + (point <= 0 ? (-point + 1) : 0));
+ CPStringBuilder sb = new CPStringBuilder(bigStr.length() + 2
+ + (point <= 0 ? (-point + 1) : 0));
if (point <= 0)
{
// We have to prepend zeros and a decimal point.
Index: java/math/BigInteger.java
===================================================================
RCS file: /sources/classpath/classpath/java/math/BigInteger.java,v
retrieving revision 1.34
diff -u -r1.34 BigInteger.java
--- java/math/BigInteger.java 28 Feb 2008 22:44:23 -0000 1.34
+++ java/math/BigInteger.java 6 May 2008 19:32:33 -0000
@@ -39,6 +39,8 @@
package java.math;
import gnu.classpath.Configuration;
+
+import gnu.java.lang.CPStringBuilder;
import gnu.java.math.MPN;
import java.io.IOException;
@@ -1756,7 +1758,7 @@
return shift(this, -n);
}
- private void format(int radix, StringBuffer buffer)
+ private void format(int radix, CPStringBuilder buffer)
{
if (words == null)
buffer.append(Integer.toString(ival, radix));
@@ -1833,7 +1835,7 @@
if (ival <= 2)
return Long.toString(longValue(), radix);
int buf_size = ival * (MPN.chars_per_word(radix) + 1);
- StringBuffer buffer = new StringBuffer(buf_size);
+ CPStringBuilder buffer = new CPStringBuilder(buf_size);
format(radix, buffer);
return buffer.toString();
}
Index: java/net/Inet4Address.java
===================================================================
RCS file: /sources/classpath/classpath/java/net/Inet4Address.java,v
retrieving revision 1.23
diff -u -r1.23 Inet4Address.java
--- java/net/Inet4Address.java 11 Sep 2006 11:44:24 -0000 1.23
+++ java/net/Inet4Address.java 6 May 2008 19:32:33 -0000
@@ -38,6 +38,8 @@
package java.net;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.ObjectStreamException;
/*
@@ -212,7 +214,7 @@
*/
public String getHostAddress()
{
- StringBuffer sb = new StringBuffer(40);
+ CPStringBuilder sb = new CPStringBuilder(40);
int len = addr.length;
int i = 0;
Index: java/net/Inet6Address.java
===================================================================
RCS file: /sources/classpath/classpath/java/net/Inet6Address.java,v
retrieving revision 1.17
diff -u -r1.17 Inet6Address.java
--- java/net/Inet6Address.java 24 Oct 2006 23:46:05 -0000 1.17
+++ java/net/Inet6Address.java 6 May 2008 19:32:33 -0000
@@ -38,6 +38,8 @@
package java.net;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Arrays;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -317,7 +319,7 @@
*/
public String getHostAddress()
{
- StringBuffer sbuf = new StringBuffer(40);
+ CPStringBuilder sbuf = new CPStringBuilder(40);
for (int i = 0; i < 16; i += 2)
{
Index: java/net/NetworkInterface.java
===================================================================
RCS file: /sources/classpath/classpath/java/net/NetworkInterface.java,v
retrieving revision 1.23
diff -u -r1.23 NetworkInterface.java
--- java/net/NetworkInterface.java 18 Dec 2006 21:37:39 -0000 1.23
+++ java/net/NetworkInterface.java 6 May 2008 19:32:34 -0000
@@ -40,6 +40,8 @@
import gnu.classpath.SystemProperties;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Vector;
@@ -247,10 +249,10 @@
public String toString()
{
// FIXME: check if this is correct
- StringBuffer result;
+ CPStringBuilder result;
String separator = SystemProperties.getProperty("line.separator");
- result = new StringBuffer();
+ result = new CPStringBuilder();
result.append("name: ");
result.append(getDisplayName());
Index: java/net/SocketPermission.java
===================================================================
RCS file: /sources/classpath/classpath/java/net/SocketPermission.java,v
retrieving revision 1.24
diff -u -r1.24 SocketPermission.java
--- java/net/SocketPermission.java 22 Sep 2006 13:24:32 -0000 1.24
+++ java/net/SocketPermission.java 6 May 2008 19:32:34 -0000
@@ -38,6 +38,8 @@
package java.net;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -431,7 +433,7 @@
*/
public String getActions()
{
- StringBuffer sb = new StringBuffer("");
+ CPStringBuilder sb = new CPStringBuilder("");
for (int i = 0; i < ACTIONS.length; i++)
{
Index: java/net/URLDecoder.java
===================================================================
RCS file: /sources/classpath/classpath/java/net/URLDecoder.java,v
retrieving revision 1.15
diff -u -r1.15 URLDecoder.java
--- java/net/URLDecoder.java 2 Jul 2005 20:32:39 -0000 1.15
+++ java/net/URLDecoder.java 6 May 2008 19:32:35 -0000
@@ -37,6 +37,8 @@
package java.net;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.UnsupportedEncodingException;
@@ -127,7 +129,7 @@
int start = 0;
byte[] bytes = null;
int length = str.length();
- StringBuffer result = new StringBuffer(length);
+ CPStringBuilder result = new CPStringBuilder(length);
while ((i = str.indexOf('%', start)) >= 0)
{
// Add all non-encoded characters to the result buffer
Index: java/net/URLStreamHandler.java
===================================================================
RCS file: /sources/classpath/classpath/java/net/URLStreamHandler.java,v
retrieving revision 1.37
diff -u -r1.37 URLStreamHandler.java
--- java/net/URLStreamHandler.java 27 Jul 2006 15:58:25 -0000 1.37
+++ java/net/URLStreamHandler.java 6 May 2008 19:32:35 -0000
@@ -37,6 +37,8 @@
package java.net;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.File;
import java.io.IOException;
@@ -510,7 +512,7 @@
// Guess a reasonable size for the string buffer so we have to resize
// at most once.
int size = protocol.length() + authority.length() + file.length() + 24;
- StringBuffer sb = new StringBuffer(size);
+ CPStringBuilder sb = new CPStringBuilder(size);
if (protocol.length() > 0)
{
Index: java/nio/channels/FileLock.java
===================================================================
RCS file: /sources/classpath/classpath/java/nio/channels/FileLock.java,v
retrieving revision 1.12
diff -u -r1.12 FileLock.java
--- java/nio/channels/FileLock.java 31 Jul 2005 16:00:42 -0000 1.12
+++ java/nio/channels/FileLock.java 6 May 2008 19:32:35 -0000
@@ -37,8 +37,9 @@
package java.nio.channels;
-import java.io.IOException;
+import gnu.java.lang.CPStringBuilder;
+import java.io.IOException;
/**
* @since 1.4
@@ -132,7 +133,7 @@
*/
public final String toString()
{
- StringBuffer buf = new StringBuffer(getClass().getName());
+ CPStringBuilder buf = new CPStringBuilder(getClass().getName());
buf.append("[");
buf.append(position);
buf.append(":");
Index: java/rmi/dgc/VMID.java
===================================================================
RCS file: /sources/classpath/classpath/java/rmi/dgc/VMID.java,v
retrieving revision 1.6
diff -u -r1.6 VMID.java
--- java/rmi/dgc/VMID.java 9 Mar 2006 22:28:54 -0000 1.6
+++ java/rmi/dgc/VMID.java 6 May 2008 19:32:35 -0000
@@ -37,6 +37,8 @@
package java.rmi.dgc;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -168,7 +170,7 @@
*/
public String toString ()
{
- StringBuffer buf = new StringBuffer ("[VMID: ");
+ CPStringBuilder buf = new CPStringBuilder ("[VMID: ");
for (int i = 0; i < addr.length; i++)
{
