ChangeLog:
2008-05-06 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/21869
* java/util/AbstractCollection.java,
* java/util/BitSet.java,
* java/util/Collections.java,
* java/util/Locale.java,
* java/util/ResourceBundle.java,
* java/util/TimeZone.java,
* java/util/logging/FileHandler.java,
* java/util/logging/Logger.java,
* java/util/logging/SimpleFormatter.java,
* java/util/logging/XMLFormatter.java,
* java/util/prefs/AbstractPreferences.java,
* java/util/regex/PatternSyntaxException.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/util/AbstractCollection.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/AbstractCollection.java,v
retrieving revision 1.19
diff -u -r1.19 AbstractCollection.java
--- java/util/AbstractCollection.java 10 Dec 2006 20:25:46 -0000 1.19
+++ java/util/AbstractCollection.java 6 May 2008 22:45:12 -0000
@@ -38,6 +38,8 @@
package java.util;
+import gnu.java.lang.CPStringBuilder;
+
import java.lang.reflect.Array;
/**
@@ -434,7 +436,7 @@
public String toString()
{
Iterator itr = iterator();
- StringBuffer r = new StringBuffer("[");
+ CPStringBuilder r = new CPStringBuilder("[");
boolean hasNext = itr.hasNext();
while (hasNext)
{
Index: java/util/BitSet.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/BitSet.java,v
retrieving revision 1.23
diff -u -r1.23 BitSet.java
--- java/util/BitSet.java 21 Dec 2006 13:02:50 -0000 1.23
+++ java/util/BitSet.java 6 May 2008 22:45:12 -0000
@@ -36,6 +36,9 @@
exception statement from your version. */
package java.util;
+
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
@@ -687,7 +690,7 @@
*/
public String toString()
{
- StringBuffer r = new StringBuffer("{");
+ CPStringBuilder r = new CPStringBuilder("{");
boolean first = true;
for (int i = 0; i < bits.length; ++i)
{
Index: java/util/Collections.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/Collections.java,v
retrieving revision 1.51
diff -u -r1.51 Collections.java
--- java/util/Collections.java 7 Jan 2008 21:11:25 -0000 1.51
+++ java/util/Collections.java 6 May 2008 22:45:18 -0000
@@ -39,6 +39,8 @@
package java.util;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
/**
@@ -1135,7 +1137,7 @@
*/
public String toString()
{
- StringBuffer r = new StringBuffer("{");
+ CPStringBuilder r = new CPStringBuilder("{");
for (int i = n - 1; --i > 0; )
r.append(element).append(", ");
r.append(element).append("}");
Index: java/util/Locale.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/Locale.java,v
retrieving revision 1.40
diff -u -r1.40 Locale.java
--- java/util/Locale.java 23 Nov 2007 14:58:14 -0000 1.40
+++ java/util/Locale.java 6 May 2008 22:45:20 -0000
@@ -39,6 +39,9 @@
package java.util;
import gnu.classpath.SystemProperties;
+
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.locale.LocaleHelper;
import java.io.IOException;
@@ -548,7 +551,7 @@
return "";
else if (country.length() == 0 && variant.length() == 0)
return language;
- StringBuffer result = new StringBuffer(language);
+ CPStringBuilder result = new CPStringBuilder(language);
result.append('_').append(country);
if (variant.length() != 0)
result.append('_').append(variant);
@@ -922,7 +925,7 @@
*/
public String getDisplayName(Locale locale)
{
- StringBuffer result = new StringBuffer();
+ CPStringBuilder result = new CPStringBuilder();
int count = 0;
String[] delimiters = {"", " (", ","};
if (language.length() != 0)
Index: java/util/ResourceBundle.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/ResourceBundle.java,v
retrieving revision 1.39
diff -u -r1.39 ResourceBundle.java
--- java/util/ResourceBundle.java 10 Dec 2006 20:25:46 -0000 1.39
+++ java/util/ResourceBundle.java 6 May 2008 22:45:21 -0000
@@ -41,6 +41,8 @@
import gnu.classpath.VMStackWalker;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.IOException;
import java.io.InputStream;
@@ -515,9 +517,9 @@
int baseLen = baseName.length();
- // Build up a StringBuffer containing the complete bundle name, fully
+ // Build up a CPStringBuilder containing the complete bundle name, fully
// qualified by locale.
- StringBuffer sb = new StringBuffer(baseLen + variant.length() + 7);
+ CPStringBuilder sb = new CPStringBuilder(baseLen + variant.length() + 7);
sb.append(baseName);
Index: java/util/TimeZone.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/TimeZone.java,v
retrieving revision 1.37
diff -u -r1.37 TimeZone.java
--- java/util/TimeZone.java 23 Feb 2007 15:50:04 -0000 1.37
+++ java/util/TimeZone.java 6 May 2008 22:45:23 -0000
@@ -40,7 +40,9 @@
package java.util;
import gnu.classpath.SystemProperties;
+import gnu.java.lang.CPStringBuilder;
import gnu.java.util.ZoneInfo;
+
import java.io.File;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -1399,7 +1401,7 @@
offset += ((SimpleTimeZone) this).getDSTSavings();
}
- StringBuffer sb = new StringBuffer(9);
+ CPStringBuilder sb = new CPStringBuilder(9);
sb.append("GMT");
offset = offset / (1000 * 60);
@@ -1559,7 +1561,7 @@
}
// Custom IDs have to be normalized
- StringBuffer sb = new StringBuffer(9);
+ CPStringBuilder sb = new CPStringBuilder(9);
sb.append("GMT");
sb.append(offset_direction >= 0 ? '+' : '-');
Index: java/util/logging/FileHandler.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/logging/FileHandler.java,v
retrieving revision 1.15
diff -u -r1.15 FileHandler.java
--- java/util/logging/FileHandler.java 28 May 2006 21:07:14 -0000 1.15
+++ java/util/logging/FileHandler.java 6 May 2008 22:45:24 -0000
@@ -38,6 +38,8 @@
package java.util.logging;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.FilterOutputStream;
@@ -478,7 +480,7 @@
int uniqueNumber,
int count)
{
- StringBuffer buf = new StringBuffer(pattern);
+ CPStringBuilder buf = new CPStringBuilder(pattern);
String replaceWith;
boolean foundGeneration = false;
Index: java/util/logging/Logger.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/logging/Logger.java,v
retrieving revision 1.17
diff -u -r1.17 Logger.java
--- java/util/logging/Logger.java 18 Apr 2008 16:26:44 -0000 1.17
+++ java/util/logging/Logger.java 6 May 2008 22:45:24 -0000
@@ -38,6 +38,8 @@
package java.util.logging;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.List;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -776,7 +778,7 @@
{
if (isLoggable(Level.FINER))
{
- StringBuffer buf = new StringBuffer(80);
+ CPStringBuilder buf = new CPStringBuilder(80);
buf.append("ENTRY");
for (int i = 0; i < params.length; i++)
{
Index: java/util/logging/SimpleFormatter.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/logging/SimpleFormatter.java,v
retrieving revision 1.8
diff -u -r1.8 SimpleFormatter.java
--- java/util/logging/SimpleFormatter.java 31 Jan 2006 15:28:48 -0000
1.8
+++ java/util/logging/SimpleFormatter.java 6 May 2008 22:45:25 -0000
@@ -39,6 +39,8 @@
package java.util.logging;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.DateFormat;
@@ -98,7 +100,7 @@
*/
public String format(LogRecord record)
{
- StringBuffer buf = new StringBuffer(180);
+ CPStringBuilder buf = new CPStringBuilder(180);
if (dateFormat == null)
dateFormat = DateFormat.getDateTimeInstance();
Index: java/util/logging/XMLFormatter.java
===================================================================
RCS file: /sources/classpath/classpath/java/util/logging/XMLFormatter.java,v
retrieving revision 1.10
diff -u -r1.10 XMLFormatter.java
--- java/util/logging/XMLFormatter.java 27 Nov 2005 22:25:20 -0000 1.10
+++ java/util/logging/XMLFormatter.java 6 May 2008 22:45:25 -0000
@@ -39,6 +39,8 @@
package java.util.logging;
+import gnu.java.lang.CPStringBuilder;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.ResourceBundle;
@@ -86,10 +88,10 @@
/**
* Appends a line consisting of indentation, opening element tag,
* element content, closing element tag and line separator to
- * a StringBuffer, provided that the element content is
+ * a CPStringBuilder, provided that the element content is
* actually existing.
*
- * @param buf the StringBuffer to which the line will be appended.
+ * @param buf the CPStringBuilder to which the line will be appended.
*
* @param indent the indentation level.
*
@@ -98,7 +100,7 @@
* @param content the element content, or <code>null</code> to
* have no output whatsoever appended to <code>buf</code>.
*/
- private static void appendTag(StringBuffer buf, int indent,
+ private static void appendTag(CPStringBuilder buf, int indent,
String tag, String content)
{
int i;
@@ -163,9 +165,9 @@
/**
* Appends a line consisting of indentation, opening element tag,
* numeric element content, closing element tag and line separator
- * to a StringBuffer.
+ * to a CPStringBuilder.
*
- * @param buf the StringBuffer to which the line will be appended.
+ * @param buf the CPStringBuilder to which the line will be appended.
*
* @param indent the indentation level.
*
@@ -173,7 +175,7 @@
*
* @param content the element content.
*/
- private static void appendTag(StringBuffer buf, int indent,
+ private static void appendTag(CPStringBuilder buf, int indent,
String tag, long content)
{
appendTag(buf, indent, tag, Long.toString(content));
@@ -182,7 +184,7 @@
public String format(LogRecord record)
{
- StringBuffer buf = new StringBuffer(400);
+ CPStringBuilder buf = new CPStringBuilder(400);
Level level = record.getLevel();
long millis = record.getMillis();
Object[] params = record.getParameters();
@@ -314,10 +316,10 @@
*/
public String getHead(Handler h)
{
- StringBuffer buf;
+ CPStringBuilder buf;
String encoding;
- buf = new StringBuffer(80);
+ buf = new CPStringBuilder(80);
buf.append("<?xml version=\"1.0\" encoding=\"");
encoding = h.getEncoding();
Index: java/util/prefs/AbstractPreferences.java
===================================================================
RCS file:
/sources/classpath/classpath/java/util/prefs/AbstractPreferences.java,v
retrieving revision 1.18
diff -u -r1.18 AbstractPreferences.java
--- java/util/prefs/AbstractPreferences.java 26 Feb 2008 22:10:51 -0000
1.18
+++ java/util/prefs/AbstractPreferences.java 6 May 2008 22:45:28 -0000
@@ -39,6 +39,7 @@
package java.util.prefs;
import gnu.classpath.toolkit.DefaultDaemonThreadFactory;
+import gnu.java.lang.CPStringBuilder;
import gnu.java.util.prefs.NodeWriter;
import java.io.ByteArrayOutputStream;
@@ -843,7 +844,7 @@
* Helper method for encoding an array of bytes as a Base64 String.
*/
private static String encode64(byte[] b) {
- StringBuffer sb = new StringBuffer((b.length/3)*4);
+ CPStringBuilder sb = new CPStringBuilder((b.length/3)*4);
int i = 0;
int remaining = b.length;
Index: java/util/regex/PatternSyntaxException.java
===================================================================
RCS file:
/sources/classpath/classpath/java/util/regex/PatternSyntaxException.java,v
retrieving revision 1.5
diff -u -r1.5 PatternSyntaxException.java
--- java/util/regex/PatternSyntaxException.java 24 Jan 2006 15:44:28 -0000
1.5
+++ java/util/regex/PatternSyntaxException.java 6 May 2008 22:45:28 -0000
@@ -37,6 +37,8 @@
package java.util.regex;
+import gnu.java.lang.CPStringBuilder;
+
/**
* Indicates illegal pattern for regular expression.
* Includes state to inspect the pattern and what and where the expression
@@ -115,7 +117,7 @@
public String getMessage()
{
String lineSep = System.getProperty("line.separator");
- StringBuffer sb = new StringBuffer(desc);
+ CPStringBuilder sb = new CPStringBuilder(desc);
sb.append(lineSep);
sb.append('\t');
sb.append(pattern);
