diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-05-06 19:49:33 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-05-06 19:49:33 +0000 |
commit | cf06685008c6dc7253938c294464211ef1a55028 (patch) | |
tree | 0167b54abbeca59ce354e00f9c99c28fff425b98 /java | |
parent | fc77df2c4a37d8615fc4f4032238adc483a465c7 (diff) | |
download | classpath-cf06685008c6dc7253938c294464211ef1a55028.tar.gz |
2008-05-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
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.
Diffstat (limited to 'java')
-rw-r--r-- | java/beans/Statement.java | 4 | ||||
-rw-r--r-- | java/io/File.java | 4 | ||||
-rw-r--r-- | java/io/StreamTokenizer.java | 8 | ||||
-rw-r--r-- | java/lang/Throwable.java | 6 | ||||
-rw-r--r-- | java/math/BigDecimal.java | 4 | ||||
-rw-r--r-- | java/math/BigInteger.java | 6 | ||||
-rw-r--r-- | java/net/Inet4Address.java | 4 | ||||
-rw-r--r-- | java/net/Inet6Address.java | 4 | ||||
-rw-r--r-- | java/net/NetworkInterface.java | 6 | ||||
-rw-r--r-- | java/net/SocketPermission.java | 4 | ||||
-rw-r--r-- | java/net/URLDecoder.java | 4 | ||||
-rw-r--r-- | java/net/URLStreamHandler.java | 4 | ||||
-rw-r--r-- | java/nio/channels/FileLock.java | 5 | ||||
-rw-r--r-- | java/rmi/dgc/VMID.java | 4 |
14 files changed, 46 insertions, 21 deletions
diff --git a/java/beans/Statement.java b/java/beans/Statement.java index 0a01798ad..5ecba37c8 100644 --- a/java/beans/Statement.java +++ b/java/beans/Statement.java @@ -38,6 +38,8 @@ exception statement from your version. */ 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 class Statement */ public String toString() { - StringBuffer result = new StringBuffer(); + CPStringBuilder result = new CPStringBuilder(); String targetName; if (target != null) diff --git a/java/io/File.java b/java/io/File.java index db56eba65..f02331044 100644 --- a/java/io/File.java +++ b/java/io/File.java @@ -41,6 +41,8 @@ package java.io; 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 @@ public class File implements Serializable, Comparable<File> return p; } - StringBuffer newpath = new StringBuffer(plen); + CPStringBuilder newpath = new CPStringBuilder(plen); int last = 0; while (dupIndex != -1) { diff --git a/java/io/StreamTokenizer.java b/java/io/StreamTokenizer.java index 759aa9a2f..87384f39f 100644 --- a/java/io/StreamTokenizer.java +++ b/java/io/StreamTokenizer.java @@ -37,6 +37,8 @@ exception statement from your version. */ 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 @@ public class StreamTokenizer } } - StringBuffer tokbuf = new StringBuffer(); + CPStringBuilder tokbuf = new CPStringBuilder(); tokbuf.append((char) ch); int decCount = 0; @@ -417,7 +419,7 @@ public class StreamTokenizer } 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 @@ public class StreamTokenizer 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) { diff --git a/java/lang/Throwable.java b/java/lang/Throwable.java index 72f9e7f52..f74851f0b 100644 --- a/java/lang/Throwable.java +++ b/java/lang/Throwable.java @@ -39,6 +39,8 @@ package java.lang; 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 @@ public class Throwable implements Serializable // 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 @@ public class Throwable implements Serializable // 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; diff --git a/java/math/BigDecimal.java b/java/math/BigDecimal.java index 4198ff2e9..eceaf8cdd 100644 --- a/java/math/BigDecimal.java +++ b/java/math/BigDecimal.java @@ -1244,8 +1244,8 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> 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. diff --git a/java/math/BigInteger.java b/java/math/BigInteger.java index b57fbde68..c6fb51471 100644 --- a/java/math/BigInteger.java +++ b/java/math/BigInteger.java @@ -39,6 +39,8 @@ exception statement from your version. */ 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 @@ public class BigInteger extends Number implements Comparable<BigInteger> 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 @@ public class BigInteger extends Number implements Comparable<BigInteger> 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(); } diff --git a/java/net/Inet4Address.java b/java/net/Inet4Address.java index a8a726ecf..1a50a4729 100644 --- a/java/net/Inet4Address.java +++ b/java/net/Inet4Address.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.net; +import gnu.java.lang.CPStringBuilder; + import java.io.ObjectStreamException; /* @@ -212,7 +214,7 @@ public final class Inet4Address extends InetAddress */ public String getHostAddress() { - StringBuffer sb = new StringBuffer(40); + CPStringBuilder sb = new CPStringBuilder(40); int len = addr.length; int i = 0; diff --git a/java/net/Inet6Address.java b/java/net/Inet6Address.java index f4893eb09..9a1c4ea96 100644 --- a/java/net/Inet6Address.java +++ b/java/net/Inet6Address.java @@ -38,6 +38,8 @@ exception statement from your version. */ 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 final class Inet6Address extends InetAddress */ public String getHostAddress() { - StringBuffer sbuf = new StringBuffer(40); + CPStringBuilder sbuf = new CPStringBuilder(40); for (int i = 0; i < 16; i += 2) { diff --git a/java/net/NetworkInterface.java b/java/net/NetworkInterface.java index a3a6058af..f7ea553ce 100644 --- a/java/net/NetworkInterface.java +++ b/java/net/NetworkInterface.java @@ -40,6 +40,8 @@ package java.net; 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 final class NetworkInterface 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()); diff --git a/java/net/SocketPermission.java b/java/net/SocketPermission.java index 64885438a..a5a848eee 100644 --- a/java/net/SocketPermission.java +++ b/java/net/SocketPermission.java @@ -38,6 +38,8 @@ exception statement from your version. */ 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 final class SocketPermission extends Permission implements Serializable */ public String getActions() { - StringBuffer sb = new StringBuffer(""); + CPStringBuilder sb = new CPStringBuilder(""); for (int i = 0; i < ACTIONS.length; i++) { diff --git a/java/net/URLDecoder.java b/java/net/URLDecoder.java index ca40c386a..fb7ab5916 100644 --- a/java/net/URLDecoder.java +++ b/java/net/URLDecoder.java @@ -37,6 +37,8 @@ exception statement from your version. */ package java.net; +import gnu.java.lang.CPStringBuilder; + import java.io.UnsupportedEncodingException; @@ -127,7 +129,7 @@ public class URLDecoder 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 diff --git a/java/net/URLStreamHandler.java b/java/net/URLStreamHandler.java index 9a5d73ad0..4748191e0 100644 --- a/java/net/URLStreamHandler.java +++ b/java/net/URLStreamHandler.java @@ -37,6 +37,8 @@ exception statement from your version. */ package java.net; +import gnu.java.lang.CPStringBuilder; + import java.io.File; import java.io.IOException; @@ -510,7 +512,7 @@ public abstract class URLStreamHandler // 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) { diff --git a/java/nio/channels/FileLock.java b/java/nio/channels/FileLock.java index c46695837..78210b34d 100644 --- a/java/nio/channels/FileLock.java +++ b/java/nio/channels/FileLock.java @@ -37,8 +37,9 @@ exception statement from your version. */ 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 abstract class FileLock */ public final String toString() { - StringBuffer buf = new StringBuffer(getClass().getName()); + CPStringBuilder buf = new CPStringBuilder(getClass().getName()); buf.append("["); buf.append(position); buf.append(":"); diff --git a/java/rmi/dgc/VMID.java b/java/rmi/dgc/VMID.java index dc989c265..22b737367 100644 --- a/java/rmi/dgc/VMID.java +++ b/java/rmi/dgc/VMID.java @@ -37,6 +37,8 @@ exception statement from your version. */ 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 final class VMID implements Serializable */ public String toString () { - StringBuffer buf = new StringBuffer ("[VMID: "); + CPStringBuilder buf = new CPStringBuilder ("[VMID: "); for (int i = 0; i < addr.length; i++) { |