Changeset 31945 in osm for applications/editors

Timestamp:

2016-01-05T13:32:53+01:00 (9 years ago)

Author:

donvip

Message:

fix warnings

Location:

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm

Files:

• gui/KeyTreeTableModel.java (modified) (1 diff)
• util/TrustGPG.java (modified) (3 diffs)

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyTreeTableModel.java

@@ -138 +138 @@
         public String getOsmCertificate() {
             String cert = "";
-            for (NotationData nd : s.getHashedSubPackets().getNotationDataOccurences()){
+            for (NotationData nd : s.getHashedSubPackets().getNotationDataOccurrences()){
                 if (nd.getNotationName().equals("trustosm@openstreetmap.org")) {
                     cert += nd.getNotationValue();

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java

@@ -67 +67 @@
 import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
 import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRingCollection;
+import org.bouncycastle.openpgp.bc.BcPGPSecretKeyRingCollection;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
@@ -286 +288 @@
             //pubIn = new FileInputStream("/tmp/secring.gpg");
             //secIn = new FileInputStream("/tmp/pubring.gpg");
-            pgpSec = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(pubIn));
-            pgpPub = new PGPPublicKeyRingCollection(PGPUtil.getDecoderStream(secIn));
+            pgpSec = new BcPGPSecretKeyRingCollection(PGPUtil.getDecoderStream(pubIn));
+            pgpPub = new BcPGPPublicKeyRingCollection(PGPUtil.getDecoderStream(secIn));
         } catch (FileNotFoundException e) {
             System.err.println("No gpg files found in "+Main.pref.getPluginsDirectory().getPath() + "/trustosm/gnupg/secring.gpg");
@@ -462 +464 @@
      * @return found tolerance as double or 0 if no Tolerance is given
      */
-
     public static double searchTolerance(PGPSignature sig) {
         /** Take the first NotationData packet that seems to have Tolerance information */
-        for (NotationData nd : sig.getHashedSubPackets().getNotationDataOccurences()){
+        for (NotationData nd : sig.getHashedSubPackets().getNotationDataOccurrences()){
             if (nd.getNotationName().equals(TrustGPG.NOTATION_DATA_KEY)) {
                 String notation = nd.getNotationValue();