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

	PR classpath/21869
	* java/security/AlgorithmParameterGenerator.java,
	* java/security/AlgorithmParameters.java,
	* java/security/KeyFactory.java,
	* java/security/KeyPairGenerator.java,
	* java/security/MessageDigest.java,
	* java/security/SecureRandom.java,
	* java/security/Signature.java,
	* java/security/cert/CertPathBuilder.java,
	* java/security/cert/CertPathValidator.java,
	* java/security/cert/CertStore.java,
	* java/text/SimpleDateFormat.java,
	* java/util/AbstractMap.java,
	* java/util/Arrays.java,
	* java/util/Calendar.java,
	* java/util/Date.java,
	* java/util/Formatter.java,
	* java/util/Hashtable.java,
	* java/util/Properties.java,
	* java/util/TreeMap.java,
	* java/util/regex/Matcher.java:
	Use CPStringBuilder in preference to StringBuilder.

10 files changed, 29 insertions, 10 deletions

diff --git a/java/security/AlgorithmParameterGenerator.java b/java/security/AlgorithmParameterGenerator.java
index e2a17d4bf..da1ea46d2 100644
--- a/java/security/AlgorithmParameterGenerator.java
+++ b/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/java/security/AlgorithmParameters.java b/java/security/AlgorithmParameters.java
index f5e5063a1..3de8ad02c 100644
--- a/java/security/AlgorithmParameters.java
+++ b/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/java/security/KeyFactory.java b/java/security/KeyFactory.java
index 043dd59a1..f06004bad 100644
--- a/java/security/KeyFactory.java
+++ b/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/java/security/KeyPairGenerator.java b/java/security/KeyPairGenerator.java
index 6974035fd..f4ca20611 100644
--- a/java/security/KeyPairGenerator.java
+++ b/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/java/security/MessageDigest.java b/java/security/MessageDigest.java
index fb0461485..f958055ee 100644
--- a/java/security/MessageDigest.java
+++ b/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;
diff --git a/java/security/SecureRandom.java b/java/security/SecureRandom.java
index 005f4670e..f96578236 100644
--- a/java/security/SecureRandom.java
+++ b/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/java/security/Signature.java b/java/security/Signature.java
index 1245707f7..26333b686 100644
--- a/java/security/Signature.java
+++ b/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/java/security/cert/CertPathBuilder.java b/java/security/cert/CertPathBuilder.java
index 519ed2b6c..99f7c9752 100644
--- a/java/security/cert/CertPathBuilder.java
+++ b/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/java/security/cert/CertPathValidator.java b/java/security/cert/CertPathValidator.java
index bf7c9746e..af08b54a8 100644
--- a/java/security/cert/CertPathValidator.java
+++ b/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/java/security/cert/CertStore.java b/java/security/cert/CertStore.java
index a27086562..1ebdb5033 100644
--- a/java/security/cert/CertStore.java
+++ b/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;