java 4 updates

Author: dghgit

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

@@ -141,51 +141,51 @@ public static void writeKeyID(long keyID, byte[] bytes)
     public static String prettifyFingerprint(byte[] fingerprint)
     {
         // -DM Hex.toHexString
-        String hex = Hex.toHexString(fingerprint).toUpperCase();
+        char[] hex = Hex.toHexString(fingerprint).toUpperCase().toCharArray();
         StringBuilder sb = new StringBuilder();
-        switch (hex.length())
+        switch (hex.length)
         {
             case 32:
                 // v3 keys
                 for (int i = 0; i < 4; i++)
                 {
-                    sb.append(hex, i * 4, (i + 1) * 4).append(' ');
+                    sb.append(hex, i * 4, 4).append(' ');
                 }
                 sb.append(' ');
                 for (int i = 4; i < 7; i++)
                 {
-                    sb.append(hex, i * 4, (i + 1) * 4).append(' ');
+                    sb.append(hex, i * 4, 4).append(' ');
                 }
-                sb.append(hex, 28, 32);
+                sb.append(hex, 28, 4);
                 return sb.toString();
             case 40:
                 // v4 keys
                 for (int i = 0; i <= 4; i++)
                 {
-                    sb.append(hex, i * 4, (i + 1) * 4).append(' ');
+                    sb.append(hex, i * 4, 4).append(' ');
                 }
                 sb.append(' ');
                 for (int i = 5; i <= 8; i++)
-                {
-                    sb.append(hex, i * 4, (i + 1) * 4).append(' ');
+                { 
+                    sb.append(hex, i * 4, 4).append(' ');
                 }
-                sb.append(hex, 36, 40);
+                sb.append(hex, 36, 4);
                 return sb.toString();
             case 64:
                 // v5, v6 keys
                 for (int i = 0; i < 4; i++)
                 {
-                    sb.append(hex, i * 8, (i + 1) * 8).append(' ');
+                    sb.append(hex, i * 8, 8).append(' ');
                 }
                 sb.append(' ');
                 for (int i = 4; i < 7; i++)
                 {
-                    sb.append(hex, i * 8, (i + 1) * 8).append(' ');
+                    sb.append(hex, i * 8, 8).append(' ');
                 }
-                sb.append(hex, 56, 64);
+                sb.append(hex, 56, 8);
                 return sb.toString();
             default:
-                return hex;
+                return new String(hex);
         }
     }
 }

pg/src/main/java/org/bouncycastle/bcpg/sig/PreferredAEADCiphersuites.java

@@ -197,7 +197,7 @@ public Builder addCombination(int symmetricAlgorithmId, int aeadAlgorithmId)
          */
         public PreferredAEADCiphersuites build()
         {
-            return new PreferredAEADCiphersuites(isCritical, combinations.toArray(new Combination[0]));
+            return new PreferredAEADCiphersuites(isCritical, (Combination[])combinations.toArray(new Combination[0]));
         }
     }
 

pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java

@@ -572,7 +572,7 @@ public Iterator<PGPSignature> getSignaturesForKey(KeyIdentifier identifier)
         List<PGPSignature> sigs = new ArrayList<PGPSignature>();
         for (Iterator<PGPSignature> it = getSignatures(); it.hasNext(); )
         {
-            PGPSignature sig = it.next();
+            PGPSignature sig = (PGPSignature)it.next();
             if (identifier.isPresentIn(sig.getKeyIdentifiers()))
             {
                 sigs.add(sig);

pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketVector.java

@@ -53,7 +53,7 @@ public static PGPSignatureSubpacketVector fromSubpackets(Collection<SignatureSub
         }
         else
         {
-            return fromSubpackets(packets.toArray(new SignatureSubpacket[0]));
+            return fromSubpackets((SignatureSubpacket[])packets.toArray(new SignatureSubpacket[0]));
         }
     }