diff options
-rw-r--r-- | gnu/java/lang/reflect/TypeSignature.java | 4 | ||||
-rw-r--r-- | java/io/BufferedReader.java | 10 | ||||
-rw-r--r-- | java/io/DataInputStream.java | 4 | ||||
-rw-r--r-- | java/lang/StackTraceElement.java | 2 | ||||
-rw-r--r-- | java/lang/Throwable.java | 4 | ||||
-rw-r--r-- | java/lang/reflect/Proxy.java | 10 | ||||
-rw-r--r-- | java/net/URI.java | 21 | ||||
-rw-r--r-- | java/net/URLClassLoader.java | 4 | ||||
-rw-r--r-- | java/net/URLEncoder.java | 2 | ||||
-rw-r--r-- | java/text/SimpleDateFormat.java | 16 | ||||
-rw-r--r-- | java/util/AbstractMap.java | 2 | ||||
-rw-r--r-- | java/util/Calendar.java | 6 | ||||
-rw-r--r-- | java/util/Date.java | 2 | ||||
-rw-r--r-- | java/util/Hashtable.java | 10 |
14 files changed, 45 insertions, 52 deletions
diff --git a/gnu/java/lang/reflect/TypeSignature.java b/gnu/java/lang/reflect/TypeSignature.java index 842e5bdf0..78c171837 100644 --- a/gnu/java/lang/reflect/TypeSignature.java +++ b/gnu/java/lang/reflect/TypeSignature.java @@ -239,7 +239,7 @@ public class TypeSignature public static String getEncodingOfMethod(Method m) { Class[] paramTypes = m.getParameterTypes(); - StringBuffer buf = new StringBuffer().append('('); + StringBuilder buf = new StringBuilder("("); for (int i = 0; i < paramTypes.length; i++) buf.append(getEncodingOfClass(paramTypes[i].getName(), true)); buf.append(')').append(getEncodingOfClass(m.getReturnType().getName(), @@ -261,7 +261,7 @@ public class TypeSignature public static String getEncodingOfConstructor(Constructor c) { Class[] paramTypes = c.getParameterTypes(); - StringBuffer buf = new StringBuffer().append('('); + StringBuilder buf = new StringBuilder("("); for (int i = 0; i < paramTypes.length; i++) buf.append(getEncodingOfClass(paramTypes[i].getName(), true)); buf.append(")V"); diff --git a/java/io/BufferedReader.java b/java/io/BufferedReader.java index 4849949c9..c52d15ec6 100644 --- a/java/io/BufferedReader.java +++ b/java/io/BufferedReader.java @@ -89,11 +89,6 @@ public class BufferedReader extends Reader static final int DEFAULT_BUFFER_SIZE = 8192; /** - * The line buffer for <code>readLine</code>. - */ - private StringBuffer sbuf = null; - - /** * Create a new <code>BufferedReader</code> that will read from the * specified subordinate stream with a default buffer size of 8192 chars. * @@ -455,10 +450,7 @@ public class BufferedReader extends Reader pos++; return str; } - if (sbuf == null) - sbuf = new StringBuffer(200); - else - sbuf.setLength(0); + StringBuilder sbuf = new StringBuilder(200); sbuf.append(buffer, pos, i - pos); pos = i; // We only want to return null when no characters were read before diff --git a/java/io/DataInputStream.java b/java/io/DataInputStream.java index 8b223ea84..ad43498c8 100644 --- a/java/io/DataInputStream.java +++ b/java/io/DataInputStream.java @@ -350,7 +350,7 @@ public class DataInputStream extends FilterInputStream implements DataInput */ public final String readLine() throws IOException { - StringBuffer strb = new StringBuffer(); + StringBuilder strb = new StringBuilder(); while (true) { @@ -747,7 +747,7 @@ public class DataInputStream extends FilterInputStream implements DataInput { // Give StringBuffer an initial estimated size to avoid // enlarge buffer frequently - StringBuffer strbuf = new StringBuffer (buf.length / 2 + 2); + StringBuilder strbuf = new StringBuilder (buf.length / 2 + 2); for (int i = 0; i < buf.length; ) { diff --git a/java/lang/StackTraceElement.java b/java/lang/StackTraceElement.java index 746dd63db..73e1a463d 100644 --- a/java/lang/StackTraceElement.java +++ b/java/lang/StackTraceElement.java @@ -202,7 +202,7 @@ public final class StackTraceElement implements Serializable */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (declaringClass != null) { sb.append(declaringClass); diff --git a/java/lang/Throwable.java b/java/lang/Throwable.java index c47a14bf0..72f9e7f52 100644 --- a/java/lang/Throwable.java +++ b/java/lang/Throwable.java @@ -411,7 +411,7 @@ public class Throwable implements Serializable // different threads to get mixed up when written to the same PrintWriter. private String stackTraceString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); // Main stacktrace StackTraceElement[] stack = getStackTrace(); @@ -455,7 +455,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(StringBuffer sb, String name, + private static void stackTraceStringBuffer(StringBuilder sb, String name, StackTraceElement[] stack, int equal) { String nl = StaticData.nl; diff --git a/java/lang/reflect/Proxy.java b/java/lang/reflect/Proxy.java index 598617423..6c1e975a2 100644 --- a/java/lang/reflect/Proxy.java +++ b/java/lang/reflect/Proxy.java @@ -1033,7 +1033,7 @@ public class Proxy implements Serializable code_length += 9; // new, dup_x1, swap, invokespecial, athrow } int handler_pc = code_length - 1; - StringBuffer signature = new StringBuffer("("); + StringBuilder signature = new StringBuilder("("); for (int j = 0; j < paramtypes.length; j++) signature.append(TypeSignature.getEncodingOfClass(paramtypes[j])); signature.append(")").append(TypeSignature.getEncodingOfClass(ret_type)); @@ -1261,8 +1261,8 @@ public class Proxy implements Serializable // we're in the same package. m.flag = true; - Object[] args = {loader, qualName, bytecode, new Integer(0), - new Integer(bytecode.length), + Object[] args = {loader, qualName, bytecode, Integer.valueOf(0), + Integer.valueOf(bytecode.length), Object.class.getProtectionDomain() }; Class clazz = (Class) m.invoke(null, args); @@ -1492,7 +1492,7 @@ public class Proxy implements Serializable if (i == len) return str; - final StringBuffer sb = new StringBuffer(str); + final StringBuilder sb = new StringBuilder(str); sb.setLength(i); for ( ; i < len; i++) { @@ -1533,7 +1533,7 @@ public class Proxy implements Serializable int size = poolEntries.size() + 1; if (size >= 65535) throw new IllegalArgumentException("exceeds VM limitations"); - i = new Integer(size); + i = Integer.valueOf(size); poolEntries.put(sequence, i); pool.append(sequence); } diff --git a/java/net/URI.java b/java/net/URI.java index 4bf4db985..6dec48d8f 100644 --- a/java/net/URI.java +++ b/java/net/URI.java @@ -483,7 +483,7 @@ public final class URI */ private static String quote(String str, String legalCharacters) { - StringBuffer sb = new StringBuffer(str.length()); + StringBuilder sb = new StringBuilder(str.length()); for (int i = 0; i < str.length(); i++) { char c = str.charAt(i); @@ -778,8 +778,8 @@ public final class URI This follows the algorithm in section 5.2.4. of RFC3986, but doesn't modify the input buffer. */ - StringBuffer input = new StringBuffer(relativePath); - StringBuffer output = new StringBuffer(); + StringBuilder input = new StringBuilder(relativePath); + StringBuilder output = new StringBuilder(); int start = 0; while (start < input.length()) { @@ -853,7 +853,7 @@ public final class URI * * @param buffer the buffer containing the path. */ - private void removeLastSegment(StringBuffer buffer) + private void removeLastSegment(StringBuilder buffer) { int lastSlash = buffer.lastIndexOf("/"); if (lastSlash == -1) @@ -899,7 +899,7 @@ public final class URI path = ""; if (! (path.startsWith("/"))) { - StringBuffer basepath = new StringBuffer(this.path); + StringBuilder basepath = new StringBuilder(this.path); int i = this.path.lastIndexOf('/'); if (i >= 0) @@ -1321,7 +1321,8 @@ public final class URI int hCompare = host.compareTo(uri.getHost()); if (hCompare != 0) return hCompare; - return new Integer(port).compareTo(new Integer(uri.getPort())); + int uriPort = uri.getPort(); + return (uriPort == port) ? 0 : (uriPort < port) ? -1 : 1; } } if (rawPath == null && uri.getRawPath() != null) @@ -1387,8 +1388,8 @@ public final class URI { String strRep = toString(); boolean inNonAsciiBlock = false; - StringBuffer buffer = new StringBuffer(); - StringBuffer encBuffer = null; + StringBuilder buffer = new StringBuilder(); + StringBuilder encBuffer = null; for (int i = 0; i < strRep.length(); i++) { char c = strRep.charAt(i); @@ -1405,7 +1406,7 @@ public final class URI { if (!inNonAsciiBlock) { - encBuffer = new StringBuffer(); + encBuffer = new StringBuilder(); inNonAsciiBlock = true; } encBuffer.append(c); @@ -1427,7 +1428,7 @@ public final class URI { try { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); // this is far from optimal, but it works byte[] utf8 = str.getBytes("utf-8"); for (int j = 0; j < utf8.length; j++) diff --git a/java/net/URLClassLoader.java b/java/net/URLClassLoader.java index 346f51c5d..e1db2a18e 100644 --- a/java/net/URLClassLoader.java +++ b/java/net/URLClassLoader.java @@ -452,7 +452,7 @@ public class URLClassLoader extends SecureClassLoader { // Compute the name of the package as it may appear in the // Manifest. - StringBuffer xform = new StringBuffer(name); + StringBuilder xform = new StringBuilder(name); for (int i = xform.length () - 1; i >= 0; --i) if (xform.charAt(i) == '.') xform.setCharAt(i, '/'); @@ -641,7 +641,7 @@ public class URLClassLoader extends SecureClassLoader { if (thisString == null) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(this.getClass().getName()); sb.append("{urls=[" ); URL[] thisURLs = getURLs(); diff --git a/java/net/URLEncoder.java b/java/net/URLEncoder.java index dacc3848e..2f11c501b 100644 --- a/java/net/URLEncoder.java +++ b/java/net/URLEncoder.java @@ -113,7 +113,7 @@ public class URLEncoder int start = 0; int i = 0; - StringBuffer result = new StringBuffer(length); + StringBuilder result = new StringBuilder(length); while (true) { while (i < length && isSafe(s.charAt(i))) diff --git a/java/text/SimpleDateFormat.java b/java/text/SimpleDateFormat.java index f78fdcb89..934fb42e2 100644 --- a/java/text/SimpleDateFormat.java +++ b/java/text/SimpleDateFormat.java @@ -139,9 +139,9 @@ public class SimpleDateFormat extends DateFormat */ public String toString() { - StringBuffer builder; + StringBuilder builder; - builder = new StringBuffer(getClass().getName()); + builder = new StringBuilder(getClass().getName()); builder.append("[field="); builder.append(field); builder.append(", size="); @@ -322,7 +322,7 @@ public class SimpleDateFormat extends DateFormat // Look for the terminating quote. However, if we // see a '', that represents a literal quote and // we must iterate. - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); int oldPos = i + 1; do { @@ -346,7 +346,7 @@ public class SimpleDateFormat extends DateFormat else { // A special character - tokens.add(new Character(thisChar)); + tokens.add(Character.valueOf(thisChar)); } } else @@ -372,7 +372,7 @@ public class SimpleDateFormat extends DateFormat */ public String toString() { - StringBuffer output = new StringBuffer(getClass().getName()); + StringBuilder output = new StringBuilder(getClass().getName()); output.append("[tokens="); output.append(tokens); output.append(", formatData="); @@ -554,7 +554,7 @@ public class SimpleDateFormat extends DateFormat String oldChars, String newChars) { int len = pattern.length(); - StringBuffer buf = new StringBuffer(len); + StringBuilder buf = new StringBuilder(len); boolean quoted = false; for (int i = 0; i < len; i++) { @@ -1279,12 +1279,12 @@ public class SimpleDateFormat extends DateFormat // advance the index pos.setIndex(pos.getIndex() + matcher.end()); - return new Integer(offset); + return Integer.valueOf(offset); } else if (zoneString.startsWith("GMT")) { pos.setIndex(pos.getIndex() + 3); - return new Integer(0); + return Integer.valueOf(0); } return null; } diff --git a/java/util/AbstractMap.java b/java/util/AbstractMap.java index 2f58121ce..02a30a294 100644 --- a/java/util/AbstractMap.java +++ b/java/util/AbstractMap.java @@ -524,7 +524,7 @@ public abstract class AbstractMap<K, V> implements Map<K, V> public String toString() { Iterator<Map.Entry<K, V>> entries = entrySet().iterator(); - StringBuffer r = new StringBuffer("{"); + StringBuilder r = new StringBuilder("{"); for (int pos = size(); pos > 0; pos--) { Map.Entry<K, V> entry = entries.next(); diff --git a/java/util/Calendar.java b/java/util/Calendar.java index 8e6ea953a..712296b1a 100644 --- a/java/util/Calendar.java +++ b/java/util/Calendar.java @@ -572,7 +572,7 @@ public abstract class Calendar * Cache of locale->calendar-class mappings. This avoids having to do a ResourceBundle * lookup for every getInstance call. */ - private static HashMap<Locale,Class> cache = new HashMap<Locale,Class>(); + private static final HashMap<Locale,Class> cache = new HashMap<Locale,Class>(); /** Preset argument types for calendar-class constructor lookup. */ private static Class[] ctorArgTypes = new Class[] @@ -1328,8 +1328,8 @@ public abstract class Calendar */ public String toString() { - StringBuffer sb = new StringBuffer(); - sb.append(getClass().getName()).append('['); + StringBuilder sb = new StringBuilder(getClass().getName()); + sb.append('['); sb.append("time="); if (isTimeSet) sb.append(time); diff --git a/java/util/Date.java b/java/util/Date.java index 1ad128ebf..8646c1917 100644 --- a/java/util/Date.java +++ b/java/util/Date.java @@ -722,7 +722,7 @@ public class Date boolean localTimezone = true; // Trim out any nested stuff in parentheses now to make parsing easier. - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); int parenNesting = 0; int len = string.length(); for (int i = 0; i < len; i++) diff --git a/java/util/Hashtable.java b/java/util/Hashtable.java index a85674637..07bd94693 100644 --- a/java/util/Hashtable.java +++ b/java/util/Hashtable.java @@ -579,7 +579,7 @@ public class Hashtable<K, V> extends Dictionary<K, V> // would repeatedly re-lock/release the monitor, we directly use the // unsynchronized EntryIterator instead. Iterator<Map.Entry<K, V>> entries = new EntryIterator(); - StringBuffer r = new StringBuffer("{"); + StringBuilder r = new StringBuilder("{"); for (int pos = size; pos > 0; pos--) { r.append(entries.next()); @@ -1088,7 +1088,7 @@ public class Hashtable<K, V> extends Dictionary<K, V> * <code>next()</code> gives a different result, by returning just * the key rather than the whole element. */ - private EntryIterator iterator; + private final EntryIterator iterator; /** * Construct a new KeyIterator @@ -1153,7 +1153,7 @@ public class Hashtable<K, V> extends Dictionary<K, V> * <code>next()</code> gives a different result, by returning just * the value rather than the whole element. */ - private EntryIterator iterator; + private final EntryIterator iterator; /** * Construct a new KeyIterator @@ -1294,7 +1294,7 @@ public class Hashtable<K, V> extends Dictionary<K, V> * <code>nextElement()</code> gives a different result, by returning just * the key rather than the whole element. */ - private EntryEnumerator enumerator; + private final EntryEnumerator enumerator; /** * Construct a new KeyEnumerator @@ -1355,7 +1355,7 @@ public class Hashtable<K, V> extends Dictionary<K, V> * <code>nextElement()</code> gives a different result, by returning just * the value rather than the whole element. */ - private EntryEnumerator enumerator; + private final EntryEnumerator enumerator; /** * Construct a new ValueEnumerator |