Java 4 Compatibility.

Author: dghgit

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

@@ -10,10 +10,10 @@
 
 import org.bouncycastle.bcpg.BCPGInputStream;
 import org.bouncycastle.bcpg.PacketTags;
-import org.bouncycastle.bcpg.TrustPacket;
 import org.bouncycastle.bcpg.UnknownPacket;
 import org.bouncycastle.bcpg.UnsupportedPacketVersionException;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
+import org.bouncycastle.util.Iterable;
 
 /**
  * General class for reading a PGP object stream.
@@ -38,7 +38,7 @@
  * </ul>
  */
 public class PGPObjectFactory
-    implements Iterable
+    implements Iterable<Object>
 {
     private BCPGInputStream in;
     private KeyFingerPrintCalculator fingerPrintCalculator;

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

@@ -1,10 +1,10 @@
 package org.bouncycastle.openpgp;
 
+import java.io.IOException;
+
 import org.bouncycastle.bcpg.BCPGInputStream;
 import org.bouncycastle.bcpg.TrustPacket;
-
-import java.io.IOException;
-import java.util.Arrays;
+import org.bouncycastle.util.Arrays;
 
 public class PGPTrust
 {
@@ -29,8 +29,6 @@ public TrustPacket getPacket()
 
     public byte[] getLevelAndTrust()
     {
-        return Arrays.copyOf(
-                packet.getLevelAndTrustAmount(),
-                packet.getLevelAndTrustAmount().length);
+        return Arrays.clone(packet.getLevelAndTrustAmount());
     }
 }