Changeset 33869 in osm for applications

Timestamp:

2017-11-22T00:26:17+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12840

Location:

applications/editors/josm/plugins/trustosm

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/trustosm/data/TrustNode.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java (modified) (1 diff)

applications/editors/josm/plugins/trustosm/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="New plugin for digital signing osm data"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12671" />
+    <property name="plugin.main.version" value="12840" />
     <property name="plugin.author" value="Christoph Wagner" />
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.trustosm.TrustOSMplugin" />

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/TrustOSMplugin.java

@@ -270 +270 @@
         // This makes sense for example when we start the plugin for the first time
         if (!prefs.containsKey("trustosm.gpg")) Main.pref.put("trustosm.gpg", "gpg");
-        if (!prefs.containsKey("trustosm.gpg.separateHomedir")) Main.pref.put("trustosm.gpg.separateHomedir", true);
+        if (!prefs.containsKey("trustosm.gpg.separateHomedir")) Main.pref.putBoolean("trustosm.gpg.separateHomedir", true);
     }
 

applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/data/TrustNode.java

@@ -6 +6 @@
 
 import org.bouncycastle.openpgp.PGPSignature;
-import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -27 +27 @@
         LatLon point = node.getCoor();
         String sigtext = node.getUniqueId() + "(";
-        sigtext += point.latToString(CoordinateFormat.DECIMAL_DEGREES) + ",";
-        sigtext += point.lonToString(CoordinateFormat.DECIMAL_DEGREES) + ")";
+        sigtext += DecimalDegreesCoordinateFormat.INSTANCE.latToString(point) + ",";
+        sigtext += DecimalDegreesCoordinateFormat.INSTANCE.lonToString(point) + ")";
         return sigtext;
     }

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

@@ -70 +70 @@
     @Override
     public boolean ok() {
-        Main.pref.put("trustosm.gpg.showSignedDeleted", showSignedDeleted.isSelected());
-        Main.pref.put("trustosm.gpg.separateHomedir", separateHomedir.isSelected());
-        //        TrustOSMplugin.gpg.refreshGpg();
+        Main.pref.putBoolean("trustosm.gpg.showSignedDeleted", showSignedDeleted.isSelected());
+        Main.pref.putBoolean("trustosm.gpg.separateHomedir", separateHomedir.isSelected());
         return false;
     }