diff options
Diffstat (limited to 'libjava/classpath/java/security')
20 files changed, 59 insertions, 24 deletions
diff --git a/libjava/classpath/java/security/AlgorithmParameterGenerator.java b/libjava/classpath/java/security/AlgorithmParameterGenerator.java index e2a17d4bf9c..da1ea46d214 100644 --- a/libjava/classpath/java/security/AlgorithmParameterGenerator.java +++ b/libjava/classpath/java/security/AlgorithmParameterGenerator.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.lang.reflect.InvocationTargetException; @@ -171,7 +173,7 @@ public class AlgorithmParameterGenerator Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder() + CPStringBuilder sb = new CPStringBuilder() .append("AlgorithmParameterGenerator for algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] could not be created"); diff --git a/libjava/classpath/java/security/AlgorithmParameters.java b/libjava/classpath/java/security/AlgorithmParameters.java index f5e5063a17d..3de8ad02c05 100644 --- a/libjava/classpath/java/security/AlgorithmParameters.java +++ b/libjava/classpath/java/security/AlgorithmParameters.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.io.IOException; @@ -175,7 +177,7 @@ public class AlgorithmParameters Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("AlgorithmParameters for algorithm [") + CPStringBuilder sb = new CPStringBuilder("AlgorithmParameters for algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] could not be created"); Throwable cause; diff --git a/libjava/classpath/java/security/CodeSource.java b/libjava/classpath/java/security/CodeSource.java index b516170281c..90eb089079d 100644 --- a/libjava/classpath/java/security/CodeSource.java +++ b/libjava/classpath/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/libjava/classpath/java/security/KeyFactory.java b/libjava/classpath/java/security/KeyFactory.java index 043dd59a151..f06004bad7e 100644 --- a/libjava/classpath/java/security/KeyFactory.java +++ b/libjava/classpath/java/security/KeyFactory.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.lang.reflect.InvocationTargetException; @@ -165,7 +167,7 @@ public class KeyFactory public static KeyFactory getInstance(String algorithm, Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("KeyFactory for algorithm [") + CPStringBuilder sb = new CPStringBuilder("KeyFactory for algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] could not be created"); Throwable cause; diff --git a/libjava/classpath/java/security/KeyPairGenerator.java b/libjava/classpath/java/security/KeyPairGenerator.java index 6974035fd6b..f4ca20611e1 100644 --- a/libjava/classpath/java/security/KeyPairGenerator.java +++ b/libjava/classpath/java/security/KeyPairGenerator.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.lang.reflect.InvocationTargetException; @@ -165,7 +167,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("KeyPairGenerator for algorithm [") + CPStringBuilder sb = new CPStringBuilder("KeyPairGenerator for algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] "); Object o; diff --git a/libjava/classpath/java/security/MessageDigest.java b/libjava/classpath/java/security/MessageDigest.java index 0f8e934e5e9..d94d96b1aa6 100644 --- a/libjava/classpath/java/security/MessageDigest.java +++ b/libjava/classpath/java/security/MessageDigest.java @@ -37,6 +37,8 @@ exception statement from your version. */ package java.security; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.nio.ByteBuffer; @@ -146,7 +148,7 @@ public abstract class MessageDigest extends MessageDigestSpi public static MessageDigest getInstance(String algorithm, Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("MessageDigest for algorithm [") + CPStringBuilder sb = new CPStringBuilder("MessageDigest for algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] "); Object o; @@ -235,7 +237,7 @@ public abstract class MessageDigest extends MessageDigestSpi * @param input The input byte buffer. * @since 1.5 */ - public void update (ByteBuffer input) + public final void update (ByteBuffer input) { engineUpdate (input); } @@ -363,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/libjava/classpath/java/security/Permission.java b/libjava/classpath/java/security/Permission.java index 9072d95652e..8f3e2a23646 100644 --- a/libjava/classpath/java/security/Permission.java +++ b/libjava/classpath/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/libjava/classpath/java/security/PermissionCollection.java b/libjava/classpath/java/security/PermissionCollection.java index c5849830ad7..ef87cc7e1d5 100644 --- a/libjava/classpath/java/security/PermissionCollection.java +++ b/libjava/classpath/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/libjava/classpath/java/security/ProtectionDomain.java b/libjava/classpath/java/security/ProtectionDomain.java index 33af8fdb843..b1eb049e3f2 100644 --- a/libjava/classpath/java/security/ProtectionDomain.java +++ b/libjava/classpath/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/libjava/classpath/java/security/SecureRandom.java b/libjava/classpath/java/security/SecureRandom.java index 005f4670efc..f965782369c 100644 --- a/libjava/classpath/java/security/SecureRandom.java +++ b/libjava/classpath/java/security/SecureRandom.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.security; import gnu.classpath.SystemProperties; +import gnu.java.lang.CPStringBuilder; import gnu.java.security.Engine; import gnu.java.security.action.GetSecurityPropertyAction; import gnu.java.security.jce.prng.Sha160RandomSpi; @@ -262,7 +263,7 @@ public class SecureRandom extends Random public static SecureRandom getInstance(String algorithm, Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("SecureRandom for algorithm [") + CPStringBuilder sb = new CPStringBuilder("SecureRandom for algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] could not be created"); Throwable cause; diff --git a/libjava/classpath/java/security/Signature.java b/libjava/classpath/java/security/Signature.java index 1245707f7af..26333b68687 100644 --- a/libjava/classpath/java/security/Signature.java +++ b/libjava/classpath/java/security/Signature.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.lang.reflect.InvocationTargetException; @@ -198,7 +200,7 @@ public abstract class Signature extends SignatureSpi public static Signature getInstance(String algorithm, Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("Signature algorithm [") + CPStringBuilder sb = new CPStringBuilder("Signature algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] "); Object o; diff --git a/libjava/classpath/java/security/cert/CertPath.java b/libjava/classpath/java/security/cert/CertPath.java index 781eb3e2776..7211647a40e 100644 --- a/libjava/classpath/java/security/cert/CertPath.java +++ b/libjava/classpath/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/libjava/classpath/java/security/cert/CertPathBuilder.java b/libjava/classpath/java/security/cert/CertPathBuilder.java index 519ed2b6c52..99f7c975252 100644 --- a/libjava/classpath/java/security/cert/CertPathBuilder.java +++ b/libjava/classpath/java/security/cert/CertPathBuilder.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security.cert; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.lang.reflect.InvocationTargetException; @@ -182,7 +184,7 @@ public class CertPathBuilder public static CertPathBuilder getInstance(String algorithm, Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("CertPathBuilder for algorithm [") + CPStringBuilder sb = new CPStringBuilder("CertPathBuilder for algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] could not be created"); Throwable cause; diff --git a/libjava/classpath/java/security/cert/CertPathValidator.java b/libjava/classpath/java/security/cert/CertPathValidator.java index bf7c9746e24..af08b54a84e 100644 --- a/libjava/classpath/java/security/cert/CertPathValidator.java +++ b/libjava/classpath/java/security/cert/CertPathValidator.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security.cert; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.lang.reflect.InvocationTargetException; @@ -196,7 +198,7 @@ public class CertPathValidator { Provider provider) throws NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("CertPathValidator for algorithm [") + CPStringBuilder sb = new CPStringBuilder("CertPathValidator for algorithm [") .append(algorithm).append("] from provider[") .append(provider).append("] could not be created"); Throwable cause; diff --git a/libjava/classpath/java/security/cert/CertStore.java b/libjava/classpath/java/security/cert/CertStore.java index a27086562e6..1ebdb50337b 100644 --- a/libjava/classpath/java/security/cert/CertStore.java +++ b/libjava/classpath/java/security/cert/CertStore.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.security.cert; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Engine; import java.lang.reflect.InvocationTargetException; @@ -207,7 +209,7 @@ public class CertStore Provider provider) throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { - StringBuilder sb = new StringBuilder("CertStore of type [") + CPStringBuilder sb = new CPStringBuilder("CertStore of type [") .append(type).append("] from provider[") .append(provider).append("] could not be created"); Throwable cause; diff --git a/libjava/classpath/java/security/cert/PKIXBuilderParameters.java b/libjava/classpath/java/security/cert/PKIXBuilderParameters.java index 5e234cec158..fd5f1f87fd0 100644 --- a/libjava/classpath/java/security/cert/PKIXBuilderParameters.java +++ b/libjava/classpath/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/libjava/classpath/java/security/cert/PKIXCertPathBuilderResult.java b/libjava/classpath/java/security/cert/PKIXCertPathBuilderResult.java index 5091dd41298..fa160913c7d 100644 --- a/libjava/classpath/java/security/cert/PKIXCertPathBuilderResult.java +++ b/libjava/classpath/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/libjava/classpath/java/security/cert/PolicyQualifierInfo.java b/libjava/classpath/java/security/cert/PolicyQualifierInfo.java index b50f3f31245..d4d9f99844d 100644 --- a/libjava/classpath/java/security/cert/PolicyQualifierInfo.java +++ b/libjava/classpath/java/security/cert/PolicyQualifierInfo.java @@ -124,7 +124,7 @@ PolicyQualifierId ::= OBJECT IDENTIFIER * * @return This structure's OID field. */ - public String getPolicyQualifierId() + public final String getPolicyQualifierId() { return oid.toString(); } @@ -137,7 +137,7 @@ PolicyQualifierId ::= OBJECT IDENTIFIER * * @return The encoded form. */ - public byte[] getEncoded() + public final byte[] getEncoded() { return (byte[]) encoded.clone(); } @@ -149,7 +149,7 @@ PolicyQualifierId ::= OBJECT IDENTIFIER * * @return The encoded qualifier. */ - public byte[] getPolicyQualifier() + public final byte[] getPolicyQualifier() { if (qualifier == null) return new byte[0]; diff --git a/libjava/classpath/java/security/cert/X509CRLSelector.java b/libjava/classpath/java/security/cert/X509CRLSelector.java index 56b171369fb..d412a1ae39e 100644 --- a/libjava/classpath/java/security/cert/X509CRLSelector.java +++ b/libjava/classpath/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/libjava/classpath/java/security/cert/X509CertSelector.java b/libjava/classpath/java/security/cert/X509CertSelector.java index 7a7db086b0a..4115fffacfa 100644 --- a/libjava/classpath/java/security/cert/X509CertSelector.java +++ b/libjava/classpath/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); |
