2008-05-05 Andrew John Hughes <gnu_andrew@member.fsf.org>

	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.

11 files changed, 46 insertions, 25 deletions

diff --git a/gnu/java/security/OID.java b/gnu/java/security/OID.java
index f61cf0fc3..a3d70e220 100644
--- a/gnu/java/security/OID.java
+++ b/gnu/java/security/OID.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.security;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.security.der.DEREncodingException;
 
 import java.io.ByteArrayOutputStream;
@@ -359,7 +361,7 @@ public class OID implements Cloneable, Comparable, java.io.Serializable
       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);
diff --git a/gnu/java/security/PolicyFile.java b/gnu/java/security/PolicyFile.java
index 8da3a7d72..82ec0baa9 100644
--- a/gnu/java/security/PolicyFile.java
+++ b/gnu/java/security/PolicyFile.java
@@ -39,6 +39,8 @@ package gnu.java.security;
 
 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 @@ public final class PolicyFile extends Policy
    */
   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++)
       {
diff --git a/gnu/java/security/der/BitString.java b/gnu/java/security/der/BitString.java
index 02b1c0377..ac10be22e 100644
--- a/gnu/java/security/der/BitString.java
+++ b/gnu/java/security/der/BitString.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.security.der;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.math.BigInteger;
 import java.util.Arrays;
 
@@ -314,7 +316,7 @@ public class BitString implements Cloneable, Comparable
 
   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");
diff --git a/gnu/java/security/der/DERReader.java b/gnu/java/security/der/DERReader.java
index 09ec1e2df..cd552c8be 100644
--- a/gnu/java/security/der/DERReader.java
+++ b/gnu/java/security/der/DERReader.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.security.der;
 
+import gnu.java.lang.CPStringBuilder;
+
 import gnu.java.security.OID;
 
 import java.io.BufferedInputStream;
@@ -286,7 +288,7 @@ public class DERReader implements DER
 
   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 @@ public class DERReader implements DER
   {
     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 @@ public class DERReader implements DER
 
   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;
diff --git a/gnu/java/security/jce/sig/DSSParameters.java b/gnu/java/security/jce/sig/DSSParameters.java
index eaccb0095..8a1cb4ca5 100644
--- a/gnu/java/security/jce/sig/DSSParameters.java
+++ b/gnu/java/security/jce/sig/DSSParameters.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 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 @@ public class DSSParameters
 
   protected String engineToString()
   {
-    StringBuffer sb = new StringBuffer("p=");
+    CPStringBuilder sb = new CPStringBuilder("p=");
     if (p == null)
       sb.append("???");
     else
diff --git a/gnu/java/security/provider/X509CertificateFactory.java b/gnu/java/security/provider/X509CertificateFactory.java
index 7d61779f9..644033156 100644
--- a/gnu/java/security/provider/X509CertificateFactory.java
+++ b/gnu/java/security/provider/X509CertificateFactory.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 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 @@ public class X509CertificateFactory
     if (i != 0x30)
       {
         inStream.reset();
-        StringBuffer line = new StringBuffer(80);
+        CPStringBuilder line = new CPStringBuilder(80);
         do
           {
             line.setLength(0);
@@ -252,7 +253,7 @@ public class X509CertificateFactory
     if (i != 0x30)
       {
         inStream.reset();
-        StringBuffer line = new StringBuffer(80);
+        CPStringBuilder line = new CPStringBuilder(80);
         do
           {
             line.setLength(0);
diff --git a/gnu/java/security/util/ByteArray.java b/gnu/java/security/util/ByteArray.java
index 0d04d9127..514492043 100644
--- a/gnu/java/security/util/ByteArray.java
+++ b/gnu/java/security/util/ByteArray.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.security.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
@@ -86,7 +88,7 @@ public final class ByteArray
 
   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 final class ByteArray
   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);
diff --git a/gnu/java/security/util/Util.java b/gnu/java/security/util/Util.java
index c7a6810fb..50d4466d5 100644
--- a/gnu/java/security/util/Util.java
+++ b/gnu/java/security/util/Util.java
@@ -38,6 +38,8 @@ exception statement from your version.  */
 
 package gnu.java.security.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.math.BigInteger;
 
 /**
@@ -296,7 +298,7 @@ public class Util
    */
   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 class Util
    */
   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 @@ public class Util
   {
     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 @@ public class Util
         b2 = buffer[1];
         break;
       }
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     int c;
     boolean notleading = false;
     do
diff --git a/gnu/java/security/x509/PolicyNodeImpl.java b/gnu/java/security/x509/PolicyNodeImpl.java
index 72cb4a9ea..60d35574d 100644
--- a/gnu/java/security/x509/PolicyNodeImpl.java
+++ b/gnu/java/security/x509/PolicyNodeImpl.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 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 final class PolicyNodeImpl implements PolicyNode
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     for (int i = 0; i < depth; i++)
       buf.append("  ");
     buf.append("(");
diff --git a/gnu/java/security/x509/Util.java b/gnu/java/security/x509/Util.java
index 1bd268a51..7b6c89f6a 100644
--- a/gnu/java/security/x509/Util.java
+++ b/gnu/java/security/x509/Util.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.security.x509;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * A collection of useful class methods.
  *
@@ -65,7 +67,7 @@ public final class Util
    */
   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 final class Util
    */
   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 final class Util
   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 final class Util
   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);
diff --git a/gnu/java/security/x509/X500DistinguishedName.java b/gnu/java/security/x509/X500DistinguishedName.java
index 02adad7d2..e2e05c57e 100644
--- a/gnu/java/security/x509/X500DistinguishedName.java
+++ b/gnu/java/security/x509/X500DistinguishedName.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 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 @@ public class X500DistinguishedName implements Principal
   {
     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 @@ public class X500DistinguishedName implements Principal
 
   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 @@ public class X500DistinguishedName implements Principal
 
   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 @@ public class X500DistinguishedName implements Principal
 
   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++)
       {