ChangeLog:
2008-05-07 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/21869
* javax/accessibility/AccessibleRelationSet.java,
* javax/accessibility/AccessibleStateSet.java,
* javax/imageio/plugins/jpeg/JPEGHuffmanTable.java,
* javax/imageio/plugins/jpeg/JPEGQTable.java,
* javax/imageio/stream/ImageInputStreamImpl.java,
* javax/management/ObjectName.java,
* javax/naming/BinaryRefAddr.java,
* javax/naming/CompositeName.java,
* javax/naming/CompoundName.java,
* javax/naming/NamingException.java,
* javax/naming/spi/NamingManager.java,
* javax/security/auth/x500/X500Principal.java,
* javax/security/sasl/SaslException.java,
* javax/sound/sampled/AudioFormat.java,
* javax/sound/sampled/CompoundControl.java,
* javax/sound/sampled/DataLine.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: javax/accessibility/AccessibleRelationSet.java
===================================================================
RCS file:
/sources/classpath/classpath/javax/accessibility/AccessibleRelationSet.java,v
retrieving revision 1.6
diff -u -r1.6 AccessibleRelationSet.java
--- javax/accessibility/AccessibleRelationSet.java 9 Jan 2008 20:42:40
-0000 1.6
+++ javax/accessibility/AccessibleRelationSet.java 7 May 2008 00:07:16
-0000
@@ -37,6 +37,8 @@
package javax.accessibility;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Locale;
import java.util.Vector;
@@ -216,7 +218,7 @@
if (i == 0)
return "";
// Pre-allocate an average of 10 chars per state.
- StringBuffer b = new StringBuffer(i * 10);
+ CPStringBuilder b = new CPStringBuilder(i * 10);
while (--i >= 0)
b.append(relations.get(i)).append(',');
return b.substring(0, b.length() - 1);
Index: javax/accessibility/AccessibleStateSet.java
===================================================================
RCS file:
/sources/classpath/classpath/javax/accessibility/AccessibleStateSet.java,v
retrieving revision 1.6
diff -u -r1.6 AccessibleStateSet.java
--- javax/accessibility/AccessibleStateSet.java 10 Dec 2006 20:25:46 -0000
1.6
+++ javax/accessibility/AccessibleStateSet.java 7 May 2008 00:07:16 -0000
@@ -37,6 +37,8 @@
package javax.accessibility;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Locale;
import java.util.Vector;
@@ -165,7 +167,7 @@
if (i == 0)
return "";
// Pre-allocate an average of 10 chars per state.
- StringBuffer b = new StringBuffer(i * 10);
+ CPStringBuilder b = new CPStringBuilder(i * 10);
while (--i >= 0)
b.append(states.get(i)).append(',');
return b.substring(0, b.length() - 1);
Index: javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
===================================================================
RCS file:
/sources/classpath/classpath/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java,v
retrieving revision 1.3
diff -u -r1.3 JPEGHuffmanTable.java
--- javax/imageio/plugins/jpeg/JPEGHuffmanTable.java 31 Mar 2006 21:52:30
-0000 1.3
+++ javax/imageio/plugins/jpeg/JPEGHuffmanTable.java 7 May 2008 00:07:18
-0000
@@ -38,6 +38,8 @@
package javax.imageio.plugins.jpeg;
+import gnu.java.lang.CPStringBuilder;
+
/**
* The JPEGHuffmanTable class represents a Huffman table read from a
* JPEG image file. The standard JPEG AC and DC chrominance and
@@ -263,7 +265,7 @@
*/
public String toString()
{
- StringBuffer buffer = new StringBuffer();
+ CPStringBuilder buffer = new CPStringBuilder();
buffer.append("JPEGHuffmanTable:\nlengths:");
Index: javax/imageio/plugins/jpeg/JPEGQTable.java
===================================================================
RCS file:
/sources/classpath/classpath/javax/imageio/plugins/jpeg/JPEGQTable.java,v
retrieving revision 1.2
diff -u -r1.2 JPEGQTable.java
--- javax/imageio/plugins/jpeg/JPEGQTable.java 31 Mar 2006 21:52:30 -0000
1.2
+++ javax/imageio/plugins/jpeg/JPEGQTable.java 7 May 2008 00:07:18 -0000
@@ -38,6 +38,8 @@
package javax.imageio.plugins.jpeg;
+import gnu.java.lang.CPStringBuilder;
+
/**
* The JPEGQTable class represents a quantization table that can be
* used to encode or decode a JPEG stream. The standard JPEG
@@ -178,7 +180,7 @@
*/
public String toString()
{
- StringBuffer buffer = new StringBuffer();
+ CPStringBuilder buffer = new CPStringBuilder();
buffer.append("JPEGQTable:\n");
for (int i = 0; i < 8; i++)
Index: javax/imageio/stream/ImageInputStreamImpl.java
===================================================================
RCS file:
/sources/classpath/classpath/javax/imageio/stream/ImageInputStreamImpl.java,v
retrieving revision 1.7
diff -u -r1.7 ImageInputStreamImpl.java
--- javax/imageio/stream/ImageInputStreamImpl.java 19 May 2006 04:00:49
-0000 1.7
+++ javax/imageio/stream/ImageInputStreamImpl.java 7 May 2008 00:07:18
-0000
@@ -38,6 +38,8 @@
package javax.imageio.stream;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.DataInputStream;
import java.io.EOFException;
import java.io.IOException;
@@ -341,7 +343,7 @@
int c = -1;
boolean eol = false;
- StringBuffer buffer = new StringBuffer();
+ CPStringBuilder buffer = new CPStringBuilder();
c = read();
if (c == -1)
Index: javax/management/ObjectName.java
===================================================================
RCS file: /sources/classpath/classpath/javax/management/ObjectName.java,v
retrieving revision 1.17
diff -u -r1.17 ObjectName.java
--- javax/management/ObjectName.java 18 Sep 2007 21:52:35 -0000 1.17
+++ javax/management/ObjectName.java 7 May 2008 00:07:19 -0000
@@ -37,6 +37,8 @@
package javax.management;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
import java.util.Hashtable;
@@ -476,7 +478,7 @@
*/
public String getCanonicalKeyPropertyListString()
{
- StringBuilder builder = new StringBuilder();
+ CPStringBuilder builder = new CPStringBuilder();
Iterator i = properties.entrySet().iterator();
while (i.hasNext())
{
@@ -795,7 +797,7 @@
*/
public static String quote(String string)
{
- StringBuilder builder = new StringBuilder();
+ CPStringBuilder builder = new CPStringBuilder();
builder.append('"');
for (int a = 0; a < string.length(); ++a)
{
@@ -863,7 +865,7 @@
throws IOException
{
out.defaultWriteObject();
- StringBuffer buffer = new StringBuffer(getDomain());
+ CPStringBuilder buffer = new CPStringBuilder(getDomain());
buffer.append(':');
String properties = getKeyPropertyListString();
buffer.append(properties);
@@ -924,7 +926,7 @@
if (q.charAt(q.length() - 1) != '"')
throw new IllegalArgumentException("The string does " +
"not end with a quote.");
- StringBuilder builder = new StringBuilder();
+ CPStringBuilder builder = new CPStringBuilder();
for (int a = 1; a < (q.length() - 1); ++a)
{
char n = q.charAt(a);
Index: javax/naming/BinaryRefAddr.java
===================================================================
RCS file: /sources/classpath/classpath/javax/naming/BinaryRefAddr.java,v
retrieving revision 1.5
diff -u -r1.5 BinaryRefAddr.java
--- javax/naming/BinaryRefAddr.java 2 Jul 2005 20:32:45 -0000 1.5
+++ javax/naming/BinaryRefAddr.java 7 May 2008 00:07:19 -0000
@@ -37,6 +37,8 @@
package javax.naming;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Arrays;
/**
@@ -139,7 +141,7 @@
*/
public String toString()
{
- StringBuffer sb = new StringBuffer("[RefAddr type: ");
+ CPStringBuilder sb = new CPStringBuilder("[RefAddr type: ");
sb.append(getType());
sb.append(" content: 0x");
byte[] b = (byte[]) getContent();
Index: javax/naming/CompositeName.java
===================================================================
RCS file: /sources/classpath/classpath/javax/naming/CompositeName.java,v
retrieving revision 1.8
diff -u -r1.8 CompositeName.java
--- javax/naming/CompositeName.java 17 Dec 2006 23:10:04 -0000 1.8
+++ javax/naming/CompositeName.java 7 May 2008 00:07:19 -0000
@@ -38,6 +38,8 @@
package javax.naming;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -85,7 +87,7 @@
final char no_quote = 'x'; // Use 'x' to mean no quoting.
char quote = no_quote;
boolean escaped = false;
- StringBuffer new_element = new StringBuffer ();
+ StringBuilder new_element = new StringBuilder ();
for (int i = 0; i < n.length (); ++i)
{
char c = n.charAt (i);
@@ -294,7 +296,7 @@
public String toString ()
{
- StringBuffer result = new StringBuffer ();
+ CPStringBuilder result = new CPStringBuilder ();
for (int i = 0; i < elts.size (); ++i)
{
// For simplicity we choose to always quote using escapes and
Index: javax/naming/CompoundName.java
===================================================================
RCS file: /sources/classpath/classpath/javax/naming/CompoundName.java,v
retrieving revision 1.13
diff -u -r1.13 CompoundName.java
--- javax/naming/CompoundName.java 17 Dec 2006 23:10:04 -0000 1.13
+++ javax/naming/CompoundName.java 7 May 2008 00:07:20 -0000
@@ -38,6 +38,8 @@
package javax.naming;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -95,7 +97,7 @@
mySyntax = syntax;
initializeSyntax ();
- StringBuffer new_element = new StringBuffer ();
+ StringBuilder new_element = new StringBuilder ();
int i = 0;
// QUOTE==null means no quoting right now. When it is set it is
// the value of the closing quote.
@@ -376,7 +378,7 @@
public String toString ()
{
- StringBuffer result = new StringBuffer ();
+ CPStringBuilder result = new CPStringBuilder ();
int size = elts.size ();
for (int i = 0; i < size; ++i)
{
Index: javax/naming/NamingException.java
===================================================================
RCS file: /sources/classpath/classpath/javax/naming/NamingException.java,v
retrieving revision 1.6
diff -u -r1.6 NamingException.java
--- javax/naming/NamingException.java 3 Mar 2006 22:50:55 -0000 1.6
+++ javax/naming/NamingException.java 7 May 2008 00:07:20 -0000
@@ -37,6 +37,8 @@
package javax.naming;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -237,7 +239,7 @@
*/
public String toString(boolean objectInfo)
{
- StringBuffer sb = new StringBuffer(super.toString());
+ CPStringBuilder sb = new CPStringBuilder(super.toString());
Throwable cause = getRootCause();
if (cause != null)
{
Index: javax/naming/spi/NamingManager.java
===================================================================
RCS file: /sources/classpath/classpath/javax/naming/spi/NamingManager.java,v
retrieving revision 1.15
diff -u -r1.15 NamingManager.java
--- javax/naming/spi/NamingManager.java 10 Dec 2006 20:25:47 -0000 1.15
+++ javax/naming/spi/NamingManager.java 7 May 2008 00:07:21 -0000
@@ -41,6 +41,8 @@
import gnu.classpath.VMStackWalker;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.StringTokenizer;
@@ -197,7 +199,7 @@
// The final default location, as specified in the documentation.
String finalPrefix = "com.sun.jndi.url";
- StringBuffer allPrefixes = new StringBuffer();
+ CPStringBuilder allPrefixes = new CPStringBuilder();
String prefixes;
if (environment != null)
Index: javax/security/auth/x500/X500Principal.java
===================================================================
RCS file:
/sources/classpath/classpath/javax/security/auth/x500/X500Principal.java,v
retrieving revision 1.12
diff -u -r1.12 X500Principal.java
--- javax/security/auth/x500/X500Principal.java 6 Apr 2006 17:15:14 -0000
1.12
+++ javax/security/auth/x500/X500Principal.java 7 May 2008 00:07:22 -0000
@@ -38,6 +38,8 @@
package javax.security.auth.x500;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.OID;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
@@ -200,7 +202,7 @@
boolean canon = CANONICAL.equalsIgnoreCase (format);
if (! (rfc2253 || rfc1779 || canon))
throw new IllegalArgumentException ("unsupported format " + format);
- StringBuffer str = new StringBuffer();
+ CPStringBuilder str = new CPStringBuilder();
for (Iterator it = components.iterator(); it.hasNext(); )
{
Map m = (Map) it.next();
@@ -323,7 +325,7 @@
private String readAttributeType(Reader in) throws IOException
{
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
int ch;
while ((ch = in.read()) != '=')
{
@@ -345,7 +347,7 @@
private String readAttributeValue(Reader in) throws IOException
{
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
int ch = in.read();
if (ch == '#')
{
@@ -518,7 +520,7 @@
private static String compressWS(String str)
{
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
char lastChar = 0;
for (int i = 0; i < str.length(); i++)
{
Index: javax/security/sasl/SaslException.java
===================================================================
RCS file: /sources/classpath/classpath/javax/security/sasl/SaslException.java,v
retrieving revision 1.5
diff -u -r1.5 SaslException.java
--- javax/security/sasl/SaslException.java 26 Sep 2005 00:15:09 -0000
1.5
+++ javax/security/sasl/SaslException.java 7 May 2008 00:07:22 -0000
@@ -38,6 +38,8 @@
package javax.security.sasl;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.IOException;
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -178,7 +180,7 @@
*/
public String toString()
{
- StringBuffer sb = new StringBuffer(this.getClass().getName())
+ CPStringBuilder sb = new CPStringBuilder(this.getClass().getName())
.append(": ").append(super.toString());
if (_exception != null)
sb.append("; caused by: ").append(_exception.toString());
Index: javax/sound/sampled/AudioFormat.java
===================================================================
RCS file: /sources/classpath/classpath/javax/sound/sampled/AudioFormat.java,v
retrieving revision 1.4
diff -u -r1.4 AudioFormat.java
--- javax/sound/sampled/AudioFormat.java 9 Jul 2007 16:32:23 -0000
1.4
+++ javax/sound/sampled/AudioFormat.java 7 May 2008 00:07:22 -0000
@@ -38,6 +38,8 @@
package javax.sound.sampled;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -329,7 +331,7 @@
*/
public String toString()
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
// usually at least encoding should be somewhat specified
result.append(encoding);
Index: javax/sound/sampled/CompoundControl.java
===================================================================
RCS file:
/sources/classpath/classpath/javax/sound/sampled/CompoundControl.java,v
retrieving revision 1.2
diff -u -r1.2 CompoundControl.java
--- javax/sound/sampled/CompoundControl.java 16 Mar 2006 16:01:22 -0000
1.2
+++ javax/sound/sampled/CompoundControl.java 7 May 2008 00:07:24 -0000
@@ -38,6 +38,8 @@
package javax.sound.sampled;
+import gnu.java.lang.CPStringBuilder;
+
/**
* A compound control provides control over several other controls.
* @since 1.3
@@ -88,7 +90,7 @@
*/
public String toString()
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
result.append(super.toString());
result.append(": ");
for (int i = 0; i < memberControls.length; ++i)
Index: javax/sound/sampled/DataLine.java
===================================================================
RCS file: /sources/classpath/classpath/javax/sound/sampled/DataLine.java,v
retrieving revision 1.3
diff -u -r1.3 DataLine.java
--- javax/sound/sampled/DataLine.java 9 Jul 2007 16:32:23 -0000 1.3
+++ javax/sound/sampled/DataLine.java 7 May 2008 00:07:24 -0000
@@ -37,6 +37,8 @@
package javax.sound.sampled;
+import gnu.java.lang.CPStringBuilder;
+
/**
* The DataLine interface adds data-related functionality to the Line
* interface. For example, it adds methods to start and stop the data
@@ -180,7 +182,7 @@
*/
public String toString()
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
result.append("formats: [");
for (int i = 0; i < formats.length; ++i)
{
