ChangeLog:
2008-05-06 Andrew John Hughes <[EMAIL PROTECTED]>
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.
--
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/security/CodeSource.java
===================================================================
RCS file: /sources/classpath/classpath/java/security/CodeSource.java,v
retrieving revision 1.8
diff -u -r1.8 CodeSource.java
--- java/security/CodeSource.java 2 Jul 2005 20:32:40 -0000 1.8
+++ java/security/CodeSource.java 6 May 2008 21:40:54 -0000
@@ -38,6 +38,8 @@
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 String toString()
{
- StringBuffer sb = new StringBuffer("(").append(location);
+ CPStringBuilder sb = new CPStringBuilder("(").append(location);
if (certs == null || certs.isEmpty())
sb.append(" <no certificates>");
else
Index: java/security/MessageDigest.java
===================================================================
RCS file: /sources/classpath/classpath/java/security/MessageDigest.java,v
retrieving revision 1.19
diff -u -r1.19 MessageDigest.java
--- java/security/MessageDigest.java 16 Mar 2008 22:44:40 -0000 1.19
+++ java/security/MessageDigest.java 6 May 2008 21:40:54 -0000
@@ -365,7 +365,7 @@
if (digest == null)
return "incomplete";
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
int len = digest.length;
for (int i = 0; i < len; ++i)
{
Index: java/security/Permission.java
===================================================================
RCS file: /sources/classpath/classpath/java/security/Permission.java,v
retrieving revision 1.10
diff -u -r1.10 Permission.java
--- java/security/Permission.java 9 Jan 2007 16:16:56 -0000 1.10
+++ java/security/Permission.java 6 May 2008 21:40:54 -0000
@@ -37,6 +37,8 @@
package java.security;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
/**
@@ -181,7 +183,7 @@
*/
public String toString()
{
- StringBuffer string = new StringBuffer();
+ CPStringBuilder string = new CPStringBuilder();
string = string.append('(');
string = string.append(getClass().getName());
Index: java/security/PermissionCollection.java
===================================================================
RCS file: /sources/classpath/classpath/java/security/PermissionCollection.java,v
retrieving revision 1.11
diff -u -r1.11 PermissionCollection.java
--- java/security/PermissionCollection.java 10 Dec 2006 20:25:45 -0000
1.11
+++ java/security/PermissionCollection.java 6 May 2008 21:40:54 -0000
@@ -37,6 +37,8 @@
package java.security;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.Serializable;
import java.util.Enumeration;
@@ -156,7 +158,7 @@
*/
public String toString()
{
- StringBuffer sb = new StringBuffer(super.toString());
+ CPStringBuilder sb = new CPStringBuilder(super.toString());
sb.append(" (\n");
Enumeration<Permission> e = elements();
Index: java/security/ProtectionDomain.java
===================================================================
RCS file: /sources/classpath/classpath/java/security/ProtectionDomain.java,v
retrieving revision 1.15
diff -u -r1.15 ProtectionDomain.java
--- java/security/ProtectionDomain.java 19 Jan 2006 09:51:53 -0000 1.15
+++ java/security/ProtectionDomain.java 6 May 2008 21:40:55 -0000
@@ -39,6 +39,8 @@
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 [EMAIL PROTECTED] CodeSource}.
Thus, any
@@ -204,7 +206,7 @@
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");
Index: java/security/cert/CertPath.java
===================================================================
RCS file: /sources/classpath/classpath/java/security/cert/CertPath.java,v
retrieving revision 1.4
diff -u -r1.4 CertPath.java
--- java/security/cert/CertPath.java 10 Dec 2006 20:25:45 -0000 1.4
+++ java/security/cert/CertPath.java 6 May 2008 21:40:55 -0000
@@ -37,6 +37,8 @@
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 @@
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');
Index: java/security/cert/PKIXBuilderParameters.java
===================================================================
RCS file:
/sources/classpath/classpath/java/security/cert/PKIXBuilderParameters.java,v
retrieving revision 1.3
diff -u -r1.3 PKIXBuilderParameters.java
--- java/security/cert/PKIXBuilderParameters.java 10 Dec 2006 20:25:45
-0000 1.3
+++ java/security/cert/PKIXBuilderParameters.java 6 May 2008 21:40:55
-0000
@@ -38,6 +38,8 @@
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 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();
}
Index: java/security/cert/PKIXCertPathBuilderResult.java
===================================================================
RCS file:
/sources/classpath/classpath/java/security/cert/PKIXCertPathBuilderResult.java,v
retrieving revision 1.3
diff -u -r1.3 PKIXCertPathBuilderResult.java
--- java/security/cert/PKIXCertPathBuilderResult.java 2 Jul 2005 20:32:41
-0000 1.3
+++ java/security/cert/PKIXCertPathBuilderResult.java 6 May 2008 21:40:55
-0000
@@ -38,6 +38,8 @@
package java.security.cert;
+import gnu.java.lang.CPStringBuilder;
+
/**
* The result of calling the [EMAIL PROTECTED]
* CertPathBuilder#build(java.security.cert.CertPathParameters)} method
@@ -95,7 +97,7 @@
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();
}
Index: java/security/cert/X509CRLSelector.java
===================================================================
RCS file: /sources/classpath/classpath/java/security/cert/X509CRLSelector.java,v
retrieving revision 1.7
diff -u -r1.7 X509CRLSelector.java
--- java/security/cert/X509CRLSelector.java 10 Dec 2006 20:25:45 -0000
1.7
+++ java/security/cert/X509CRLSelector.java 6 May 2008 21:40:55 -0000
@@ -39,6 +39,7 @@
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 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;
Index: java/security/cert/X509CertSelector.java
===================================================================
RCS file:
/sources/classpath/classpath/java/security/cert/X509CertSelector.java,v
retrieving revision 1.10
diff -u -r1.10 X509CertSelector.java
--- java/security/cert/X509CertSelector.java 31 Dec 2006 05:23:20 -0000
1.10
+++ java/security/cert/X509CertSelector.java 6 May 2008 21:40:56 -0000
@@ -39,6 +39,7 @@
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 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);
Index: org/ietf/jgss/Oid.java
===================================================================
RCS file: /sources/classpath/classpath/org/ietf/jgss/Oid.java,v
retrieving revision 1.3
diff -u -r1.3 Oid.java
--- org/ietf/jgss/Oid.java 2 Jul 2005 20:32:55 -0000 1.3
+++ org/ietf/jgss/Oid.java 6 May 2008 21:41:01 -0000
@@ -67,6 +67,8 @@
package org.ietf.jgss;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -241,7 +243,7 @@
{
if (strOid == null)
{
- StringBuffer buf = new StringBuffer();
+ CPStringBuilder buf = new CPStringBuilder();
for (int i = 0; i < components.length; i++)
{
buf.append(components[i]);
Index: org/omg/CORBA/portable/Delegate.java
===================================================================
RCS file: /sources/classpath/classpath/org/omg/CORBA/portable/Delegate.java,v
retrieving revision 1.4
diff -u -r1.4 Delegate.java
--- org/omg/CORBA/portable/Delegate.java 5 Sep 2006 12:44:06 -0000
1.4
+++ org/omg/CORBA/portable/Delegate.java 6 May 2008 21:41:02 -0000
@@ -38,6 +38,8 @@
package org.omg.CORBA.portable;
+import gnu.java.lang.CPStringBuilder;
+
import org.omg.CORBA.BAD_PARAM;
import org.omg.CORBA.Context;
import org.omg.CORBA.ContextList;
@@ -417,7 +419,7 @@
if (self instanceof ObjectImpl)
{
ObjectImpl x = (ObjectImpl) self;
- StringBuffer b = new StringBuffer(x.getClass().getName());
+ CPStringBuilder b = new CPStringBuilder(x.getClass().getName());
b.append(": [");
for (int i = 0; i < x._ids().length; i++)
{
