Java 5 compatibility updates.

Author: dghgit

pg/src/main/java/org/bouncycastle/bcpg/ArmoredOutputStream.java

@@ -622,7 +622,7 @@ public Builder addComment(String comment)
          */
         private Builder setSingletonHeader(String key, String value)
         {
-            if (value == null || value.trim().isEmpty())
+            if (value == null || value.trim().length() == 0)
             {
                 this.headers.remove(key);
             }
@@ -647,7 +647,7 @@ private Builder setSingletonHeader(String key, String value)
          */
         private Builder addHeader(String key, String value)
         {
-            if (value == null || value.trim().isEmpty())
+            if (value == null || value.trim().length() == 0)
             {
                 return this;
             }
@@ -663,11 +663,12 @@ private Builder addHeader(String key, String value)
             String trimmed = value.trim();
             for (String line : trimmed.split("\n"))
             {
-                if (line.trim().isEmpty())
+                String lineTrim = line.trim();
+                if (lineTrim.length() == 0)
                 {
                     continue;
                 }
-                values.add(line.trim());
+                values.add(lineTrim);
             }
             return this;
         }
@@ -683,7 +684,7 @@ private Builder addHeader(String key, String value)
          */
         private Builder replaceHeader(String key, String value)
         {
-            if (value == null || value.trim().isEmpty())
+            if (value == null || value.trim().length() == 0)
             {
                 return this;
             }
@@ -694,11 +695,12 @@ private Builder replaceHeader(String key, String value)
             String trimmed = value.trim();
             for (String line : trimmed.split("\n"))
             {
-                if (line.trim().isEmpty())
+                String lineTrim = line.trim();
+                if (lineTrim.length() == 0)
                 {
                     continue;
                 }
-                values.add(line.trim());
+                values.add(lineTrim);
             }
 
             headers.put(key, values);

prov/src/test/java/org/bouncycastle/jcajce/provider/test/CompositeSignaturesTest.java

@@ -3,7 +3,6 @@
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -163,11 +162,11 @@ public void testSigningAndVerificationInternal()
             KeyPair keyPair = keyPairGenerator.generateKeyPair();
             Signature signature = Signature.getInstance(oid, "BC");
             signature.initSign(keyPair.getPrivate());
-            signature.update(messageToBeSigned.getBytes(StandardCharsets.UTF_8));
+            signature.update(Strings.toUTF8ByteArray(messageToBeSigned));
             byte[] signatureValue = signature.sign();
 
             signature.initVerify(keyPair.getPublic());
-            signature.update(messageToBeSigned.getBytes(StandardCharsets.UTF_8));
+            signature.update(Strings.toUTF8ByteArray(messageToBeSigned));
             TestCase.assertTrue(signature.verify(signatureValue));
         }
     }
@@ -181,7 +180,7 @@ public void testDecodingAndVerificationExternal()
         int count = 0;
         while ((line = reader.readLine()) != null)
         {
-            if (line.isEmpty())
+            if (line.length() == 0)
             {
                 continue;
             }