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

	PR classpath/21869
	* java/security/CodeSource.java,
	* java/security/MessageDigest.java,
	* java/security/Permission.java,
	* java/security/PermissionCollection.java,
	* java/security/ProtectionDomain.java,
	* java/security/cert/CertPath.java,
	* java/security/cert/PKIXBuilderParameters.java,
	* java/security/cert/PKIXCertPathBuilderResult.java,
	* java/security/cert/X509CRLSelector.java,
	* java/security/cert/X509CertSelector.java,
	* org/ietf/jgss/Oid.java,
	* org/omg/CORBA/portable/Delegate.java:
	Swap use of StringBuffer for CPStringBuilder.

10 files changed, 26 insertions, 10 deletions

diff --git a/java/security/CodeSource.java b/java/security/CodeSource.java
index b51617028..90eb08907 100644
--- a/java/security/CodeSource.java
+++ b/java/security/CodeSource.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.security;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -259,7 +261,7 @@ public class CodeSource implements Serializable
    */
   public String toString()
   {
-    StringBuffer sb = new StringBuffer("(").append(location);
+    CPStringBuilder sb = new CPStringBuilder("(").append(location);
     if (certs == null || certs.isEmpty())
       sb.append(" <no certificates>");
     else
diff --git a/java/security/MessageDigest.java b/java/security/MessageDigest.java
index f958055ee..d94d96b1a 100644
--- a/java/security/MessageDigest.java
+++ b/java/security/MessageDigest.java
@@ -365,7 +365,7 @@ public abstract class MessageDigest extends MessageDigestSpi
     if (digest == null)
       return "incomplete";
 
-    StringBuffer buf = new StringBuffer();
+    CPStringBuilder buf = new CPStringBuilder();
     int len = digest.length;
     for (int i = 0; i < len; ++i)
       {
diff --git a/java/security/Permission.java b/java/security/Permission.java
index 9072d9565..8f3e2a236 100644
--- a/java/security/Permission.java
+++ b/java/security/Permission.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package java.security;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 
 /**
@@ -181,7 +183,7 @@ public abstract class Permission implements Guard, Serializable
    */
   public String toString()
   {
-    StringBuffer string = new StringBuffer(); 
+    CPStringBuilder string = new CPStringBuilder(); 
     
     string = string.append('(');
     string = string.append(getClass().getName());
diff --git a/java/security/PermissionCollection.java b/java/security/PermissionCollection.java
index c5849830a..ef87cc7e1 100644
--- a/java/security/PermissionCollection.java
+++ b/java/security/PermissionCollection.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package java.security;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.Serializable;
 import java.util.Enumeration;
 
@@ -156,7 +158,7 @@ public abstract class PermissionCollection implements Serializable
    */
   public String toString()
   {
-    StringBuffer sb = new StringBuffer(super.toString());
+    CPStringBuilder sb = new CPStringBuilder(super.toString());
 
     sb.append(" (\n");
     Enumeration<Permission> e = elements();
diff --git a/java/security/ProtectionDomain.java b/java/security/ProtectionDomain.java
index 33af8fdb8..b1eb049e3 100644
--- a/java/security/ProtectionDomain.java
+++ b/java/security/ProtectionDomain.java
@@ -39,6 +39,8 @@ package java.security;
 
 import gnu.classpath.SystemProperties;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * This class represents a group of classes, along with their granted
  * permissions. The classes are identified by a {@link CodeSource}. Thus, any
@@ -204,7 +206,7 @@ public class ProtectionDomain
   public String toString()
   {
     String linesep = SystemProperties.getProperty("line.separator");
-    StringBuffer sb = new StringBuffer("ProtectionDomain (").append(linesep);
+    CPStringBuilder sb = new CPStringBuilder("ProtectionDomain (").append(linesep);
 
     if (code_source == null)
       sb.append("CodeSource:null");
diff --git a/java/security/cert/CertPath.java b/java/security/cert/CertPath.java
index 781eb3e27..7211647a4 100644
--- a/java/security/cert/CertPath.java
+++ b/java/security/cert/CertPath.java
@@ -37,6 +37,8 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.ByteArrayInputStream;
 import java.io.NotSerializableException;
 import java.io.ObjectStreamException;
@@ -196,7 +198,7 @@ public abstract class CertPath implements Serializable
     List l = getCertificates();
     int size = l.size();
     int i = 0;
-    StringBuffer result = new StringBuffer(type);
+    CPStringBuilder result = new CPStringBuilder(type);
     result.append(" Cert Path: length = ").append(size).append(".\n[\n");
     while (--size >= 0)
       result.append(l.get(i++)).append('\n');
diff --git a/java/security/cert/PKIXBuilderParameters.java b/java/security/cert/PKIXBuilderParameters.java
index 5e234cec1..fd5f1f87f 100644
--- a/java/security/cert/PKIXBuilderParameters.java
+++ b/java/security/cert/PKIXBuilderParameters.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -140,7 +142,7 @@ public class PKIXBuilderParameters extends PKIXParameters
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer(super.toString());
+    CPStringBuilder buf = new CPStringBuilder(super.toString());
     buf.insert(buf.length() - 2, "; Max Path Length=" + maxPathLength);
     return buf.toString();
   }
diff --git a/java/security/cert/PKIXCertPathBuilderResult.java b/java/security/cert/PKIXCertPathBuilderResult.java
index 5091dd412..fa160913c 100644
--- a/java/security/cert/PKIXCertPathBuilderResult.java
+++ b/java/security/cert/PKIXCertPathBuilderResult.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.security.cert;
 
+import gnu.java.lang.CPStringBuilder;
+
 /**
  * The result of calling the {@link
  * CertPathBuilder#build(java.security.cert.CertPathParameters)} method
@@ -95,7 +97,7 @@ public class PKIXCertPathBuilderResult extends PKIXCertPathValidatorResult
 
   public String toString()
   {
-    StringBuffer buf = new StringBuffer(super.toString());
+    CPStringBuilder buf = new CPStringBuilder(super.toString());
     buf.insert(buf.length() - 2, "; CertPath=" + certPath);
     return buf.toString();
   }
diff --git a/java/security/cert/X509CRLSelector.java b/java/security/cert/X509CRLSelector.java
index 56b171369..d412a1ae3 100644
--- a/java/security/cert/X509CRLSelector.java
+++ b/java/security/cert/X509CRLSelector.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package java.security.cert;
 
 import gnu.classpath.SystemProperties;
+import gnu.java.lang.CPStringBuilder;
 import gnu.java.security.der.DERReader;
 import gnu.java.security.der.DERValue;
 
@@ -335,7 +336,7 @@ public class X509CRLSelector implements CRLSelector, Cloneable
    */
   public String toString()
   {
-    StringBuffer str = new StringBuffer(X509CRLSelector.class.getName());
+    CPStringBuilder str = new CPStringBuilder(X509CRLSelector.class.getName());
     String nl = SystemProperties.getProperty("line.separator");
     String eol = ";" + nl;
 
diff --git a/java/security/cert/X509CertSelector.java b/java/security/cert/X509CertSelector.java
index 7a7db086b..4115fffac 100644
--- a/java/security/cert/X509CertSelector.java
+++ b/java/security/cert/X509CertSelector.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package java.security.cert;
 
 import gnu.classpath.SystemProperties;
+import gnu.java.lang.CPStringBuilder;
 import gnu.java.security.OID;
 import gnu.java.security.x509.GnuPKIExtension;
 import gnu.java.security.x509.ext.CertificatePolicies;
@@ -1251,7 +1252,7 @@ public class X509CertSelector implements CertSelector, Cloneable
   
   public String toString()
   {
-    StringBuffer str = new StringBuffer(X509CertSelector.class.getName());
+    CPStringBuilder str = new CPStringBuilder(X509CertSelector.class.getName());
     String nl = SystemProperties.getProperty("line.separator");
     String eol = ";" + nl;
     str.append(" {").append(nl);