ChangeLog:
2008-05-05 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/21869
* gnu/java/security/OID.java,
* gnu/java/security/PolicyFile.java,
* gnu/java/security/der/BitString.java,
* gnu/java/security/der/DERReader.java,
* gnu/java/security/jce/sig/DSSParameters.java,
* gnu/java/security/provider/X509CertificateFactory.java,
* gnu/java/security/util/ByteArray.java,
* gnu/java/security/util/Util.java,
* gnu/java/security/x509/PolicyNodeImpl.java,
* gnu/java/security/x509/Util.java,
* gnu/java/security/x509/X500DistinguishedName.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: gnu/java/security/OID.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/OID.java,v
retrieving revision 1.8
diff -u -r1.8 OID.java
--- gnu/java/security/OID.java 13 Jul 2006 23:29:28 -0000 1.8
+++ gnu/java/security/OID.java 5 May 2008 16:49:25 -0000
@@ -38,6 +38,8 @@
package gnu.java.security;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.der.DEREncodingException;
import java.io.ByteArrayOutputStream;
@@ -359,7 +361,7 @@
return strRep;
else
{
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
for (int i = 0; i < components.length; i++)
{
buf.append((long) components[i] & 0xFFFFFFFFL);
Index: gnu/java/security/PolicyFile.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/PolicyFile.java,v
retrieving revision 1.9
diff -u -r1.9 PolicyFile.java
--- gnu/java/security/PolicyFile.java 11 Jul 2006 16:03:59 -0000 1.9
+++ gnu/java/security/PolicyFile.java 5 May 2008 16:49:26 -0000
@@ -39,6 +39,8 @@
import gnu.classpath.debug.Component;
import gnu.classpath.debug.SystemLogger;
+
+import gnu.java.lang.CPStringBuilder;
import gnu.java.security.action.GetPropertyAction;
import java.io.File;
@@ -629,8 +631,8 @@
*/
private static String expand(final String s)
{
- final StringBuffer result = new StringBuffer();
- final StringBuffer prop = new StringBuffer();
+ final CPStringBuilder result = new CPStringBuilder();
+ final CPStringBuilder prop = new CPStringBuilder();
int state = 0;
for (int i = 0; i < s.length(); i++)
{
Index: gnu/java/security/der/BitString.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/der/BitString.java,v
retrieving revision 1.4
diff -u -r1.4 BitString.java
--- gnu/java/security/der/BitString.java 1 Oct 2005 18:48:45 -0000
1.4
+++ gnu/java/security/der/BitString.java 5 May 2008 16:49:26 -0000
@@ -38,6 +38,8 @@
package gnu.java.security.der;
+import gnu.java.lang.CPStringBuilder;
+
import java.math.BigInteger;
import java.util.Arrays;
@@ -314,7 +316,7 @@
public String toString()
{
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
for (int i = 0, j = 7, k = 0; i < size(); i++)
{
sb.append((bytes[k] & 1 << j) != 0 ? "1" : "0");
Index: gnu/java/security/der/DERReader.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/der/DERReader.java,v
retrieving revision 1.7
diff -u -r1.7 DERReader.java
--- gnu/java/security/der/DERReader.java 14 Sep 2005 16:56:53 -0000
1.7
+++ gnu/java/security/der/DERReader.java 5 May 2008 16:49:27 -0000
@@ -38,6 +38,8 @@
package gnu.java.security.der;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.OID;
import java.io.BufferedInputStream;
@@ -286,7 +288,7 @@
private static String fromIso88591(byte[] bytes)
{
- StringBuffer str = new StringBuffer(bytes.length);
+ CPStringBuilder str = new CPStringBuilder(bytes.length);
for (int i = 0; i < bytes.length; i++)
str.append((char) (bytes[i] & 0xFF));
return str.toString();
@@ -296,7 +298,7 @@
{
if ((bytes.length & 0x01) != 0)
throw new IOException("UTF-16 bytes are odd in length");
- StringBuffer str = new StringBuffer(bytes.length / 2);
+ CPStringBuilder str = new CPStringBuilder(bytes.length / 2);
for (int i = 0; i < bytes.length; i += 2)
{
char c = (char) ((bytes[i] << 8) & 0xFF);
@@ -308,7 +310,7 @@
private static String fromUtf8(byte[] bytes) throws IOException
{
- StringBuffer str = new StringBuffer((int)(bytes.length / 1.5));
+ CPStringBuilder str = new CPStringBuilder((int)(bytes.length / 1.5));
for (int i = 0; i < bytes.length; )
{
char c = 0;
Index: gnu/java/security/jce/sig/DSSParameters.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/security/jce/sig/DSSParameters.java,v
retrieving revision 1.2
diff -u -r1.2 DSSParameters.java
--- gnu/java/security/jce/sig/DSSParameters.java 19 Jun 2006 12:43:48
-0000 1.2
+++ gnu/java/security/jce/sig/DSSParameters.java 5 May 2008 16:49:27
-0000
@@ -38,6 +38,8 @@
package gnu.java.security.jce.sig;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Registry;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
@@ -195,7 +197,7 @@
protected String engineToString()
{
- StringBuffer sb = new StringBuffer("p=");
+ CPStringBuilder sb = new CPStringBuilder("p=");
if (p == null)
sb.append("???");
else
Index: gnu/java/security/provider/X509CertificateFactory.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/security/provider/X509CertificateFactory.java,v
retrieving revision 1.5
diff -u -r1.5 X509CertificateFactory.java
--- gnu/java/security/provider/X509CertificateFactory.java 24 Jun 2006
00:09:26 -0000 1.5
+++ gnu/java/security/provider/X509CertificateFactory.java 5 May 2008
16:49:27 -0000
@@ -39,6 +39,7 @@
package gnu.java.security.provider;
import gnu.java.io.Base64InputStream;
+import gnu.java.lang.CPStringBuilder;
import gnu.java.security.x509.X509CRL;
import gnu.java.security.x509.X509CertPath;
import gnu.java.security.x509.X509Certificate;
@@ -193,7 +194,7 @@
if (i != 0x30)
{
inStream.reset();
- StringBuffer line = new StringBuffer(80);
+ CPStringBuilder line = new CPStringBuilder(80);
do
{
line.setLength(0);
@@ -252,7 +253,7 @@
if (i != 0x30)
{
inStream.reset();
- StringBuffer line = new StringBuffer(80);
+ CPStringBuilder line = new CPStringBuilder(80);
do
{
line.setLength(0);
Index: gnu/java/security/util/ByteArray.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/util/ByteArray.java,v
retrieving revision 1.1
diff -u -r1.1 ByteArray.java
--- gnu/java/security/util/ByteArray.java 11 Jul 2006 20:04:49 -0000
1.1
+++ gnu/java/security/util/ByteArray.java 5 May 2008 16:49:27 -0000
@@ -38,6 +38,8 @@
package gnu.java.security.util;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -86,7 +88,7 @@
public static String toHexString (byte[] buf, int off, int len, char sep)
{
- StringBuffer str = new StringBuffer();
+ CPStringBuilder str = new CPStringBuilder();
for (int i = 0; i < len; i++)
{
str.append (Character.forDigit (buf[i+off] >>> 4 & 0x0F, 16));
@@ -100,7 +102,7 @@
public static String formatInt (int value, int radix, int len)
{
String s = Integer.toString (value, radix);
- StringBuffer buf = new StringBuffer ();
+ CPStringBuilder buf = new CPStringBuilder ();
for (int j = 0; j < len - s.length(); j++)
buf.append ("0");
buf.append (s);
Index: gnu/java/security/util/Util.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/util/Util.java,v
retrieving revision 1.3
diff -u -r1.3 Util.java
--- gnu/java/security/util/Util.java 24 Jun 2006 00:09:26 -0000 1.3
+++ gnu/java/security/util/Util.java 5 May 2008 16:49:28 -0000
@@ -38,6 +38,8 @@
package gnu.java.security.util;
+import gnu.java.lang.CPStringBuilder;
+
import java.math.BigInteger;
/**
@@ -296,7 +298,7 @@
*/
public static final String toUnicodeString(byte[] ba, int offset, int length)
{
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
int i = 0;
int j = 0;
int k;
@@ -328,7 +330,7 @@
*/
public static String toUnicodeString(int[] ia)
{
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
int i = 0;
int j = 0;
int k;
@@ -385,7 +387,7 @@
{
if (data == null)
return m + "null\n";
- StringBuffer sb = new StringBuffer(length * 3);
+ CPStringBuilder sb = new CPStringBuilder(length * 3);
if (length > 32)
sb.append(m).append("Hexadecimal dump of ")
.append(length).append(" bytes...\n");
@@ -466,7 +468,7 @@
b2 = buffer[1];
break;
}
- StringBuffer sb = new StringBuffer();
+ CPStringBuilder sb = new CPStringBuilder();
int c;
boolean notleading = false;
do
Index: gnu/java/security/x509/PolicyNodeImpl.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/security/x509/PolicyNodeImpl.java,v
retrieving revision 1.2
diff -u -r1.2 PolicyNodeImpl.java
--- gnu/java/security/x509/PolicyNodeImpl.java 2 Jul 2005 20:32:14 -0000
1.2
+++ gnu/java/security/x509/PolicyNodeImpl.java 5 May 2008 16:49:30 -0000
@@ -38,6 +38,8 @@
package gnu.java.security.x509;
+import gnu.java.lang.CPStringBuilder;
+
import java.security.cert.PolicyNode;
import java.security.cert.PolicyQualifierInfo;
@@ -186,7 +188,7 @@
public String toString()
{
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
for (int i = 0; i < depth; i++)
buf.append(" ");
buf.append("(");
Index: gnu/java/security/x509/Util.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/x509/Util.java,v
retrieving revision 1.3
diff -u -r1.3 Util.java
--- gnu/java/security/x509/Util.java 4 Jun 2006 05:29:44 -0000 1.3
+++ gnu/java/security/x509/Util.java 5 May 2008 16:49:30 -0000
@@ -38,6 +38,8 @@
package gnu.java.security.x509;
+import gnu.java.lang.CPStringBuilder;
+
/**
* A collection of useful class methods.
*
@@ -65,7 +67,7 @@
*/
public static String toHexString(byte[] buf, int off, int len)
{
- StringBuffer str = new StringBuffer();
+ CPStringBuilder str = new CPStringBuilder();
for (int i = 0; i < len; i++)
{
str.append(HEX.charAt(buf[i+off] >>> 4 & 0x0F));
@@ -94,7 +96,7 @@
*/
public static String toHexString(byte[] buf, int off, int len, char sep)
{
- StringBuffer str = new StringBuffer();
+ CPStringBuilder str = new CPStringBuilder();
for (int i = 0; i < len; i++)
{
str.append(HEX.charAt(buf[i+off] >>> 4 & 0x0F));
@@ -130,7 +132,7 @@
public static String hexDump(byte[] buf, int off, int len, String prefix)
{
String nl = System.getProperty("line.separator");
- StringBuffer str = new StringBuffer();
+ CPStringBuilder str = new CPStringBuilder();
int i = 0;
while (i < len)
{
@@ -174,7 +176,7 @@
public static String formatInt(int i, int radix, int len)
{
String s = Integer.toString(i, radix);
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
for (int j = 0; j < len - s.length(); j++)
buf.append("0");
buf.append(s);
Index: gnu/java/security/x509/X500DistinguishedName.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/security/x509/X500DistinguishedName.java,v
retrieving revision 1.7
diff -u -r1.7 X500DistinguishedName.java
--- gnu/java/security/x509/X500DistinguishedName.java 29 Apr 2006 07:10:07
-0000 1.7
+++ gnu/java/security/x509/X500DistinguishedName.java 5 May 2008 16:49:30
-0000
@@ -38,6 +38,8 @@
package gnu.java.security.x509;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.OID;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
@@ -285,7 +287,7 @@
{
if (fixed && stringRep != null)
return stringRep;
- StringBuffer str = new StringBuffer();
+ CPStringBuilder str = new CPStringBuilder();
for (Iterator it = components.iterator(); it.hasNext(); )
{
Map m = (Map) it.next();
@@ -377,7 +379,7 @@
private String readAttributeType(Reader in) throws IOException
{
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
int ch;
while ((ch = in.read()) != '=')
{
@@ -399,7 +401,7 @@
private String readAttributeValue(Reader in) throws IOException
{
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
int ch = in.read();
if (ch == '#')
{
@@ -537,7 +539,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++)
{
