Changeset 35762 in osm

Timestamp:

2021-05-17T21:12:13+02:00 (3 years ago)

Author:

taylor.smock

Message:

trustosm: recompile for compatibility with JOSM r17896

Location:

applications/editors/josm/plugins/trustosm

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/trustosm/data/TrustWay.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java (modified) (6 diffs)

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

@@ -3 +3 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="trustosm: recompile for compatibility with JOSM r17867"/>
+    <property name="commit.message" value="trustosm: recompile for compatibility with JOSM r17896" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="17867" />
+    <property name="plugin.main.version" value="17896"/>
     <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/data/TrustWay.java

@@ -8 +8 @@
 
 import org.bouncycastle.openpgp.PGPSignature;
+import org.openstreetmap.josm.data.osm.IWaySegment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.tools.Logging;
 
 public class TrustWay extends TrustOsmPrimitive {
@@ -54 +55 @@
             osm = osmItem;
         } else {
-            System.err.println("Error while creating TrustWay: OsmPrimitive "+osmItem.getUniqueId()+" is not a Way!");
+            Logging.error("Error while creating TrustWay: OsmPrimitive "+osmItem.getUniqueId()+" is not a Way!");
         }
     }
@@ -74 +75 @@
     }
 
-    public TrustSignatures getSigsOnSegment(WaySegment seg) {
+    public TrustSignatures getSigsOnSegment(IWaySegment<Node, ?> seg) {
         List<Node> nodes = new ArrayList<>();
         nodes.add(seg.getFirstNode());

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

@@ -43 +43 @@
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
+import org.openstreetmap.josm.data.osm.IWaySegment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -88 +89 @@
     private Collection<? extends OsmPrimitive> osmData;
 
-    private final List<WaySegment> selectedSegments = new ArrayList<>();
+    private final List<IWaySegment<Node, Way>> selectedSegments = new ArrayList<>();
     private final List<OsmPrimitive> selectedPrimitives = new ArrayList<>();
 
@@ -233 +234 @@
                             seg.getSecondNode().getDisplayName(DefaultNameFormatter.getInstance()));
                     TrustSignatures sigs;
-                    String id = TrustOsmPrimitive.createUniqueObjectIdentifier(seg.way);
+                    String id = TrustOsmPrimitive.createUniqueObjectIdentifier(seg.getWay());
                     if (TrustOSMplugin.signedItems.containsKey(id)
                             && (sigs = ((TrustWay) TrustOSMplugin.signedItems.get(id)).getSigsOnSegment(seg)) != null) {
@@ -401 +402 @@
                         nodes.add(seg.getFirstNode());
                         nodes.add(seg.getSecondNode());
-                        Way w = seg.way;
+                        Way w = seg.getWay();
                         String id = TrustOsmPrimitive.createUniqueObjectIdentifier(w);
                         TrustWay trust = TrustOSMplugin.signedItems.containsKey(id) ?
@@ -449 +450 @@
                     } else if (o instanceof WaySegment) {
                         WaySegment seg = (WaySegment) o;
-                        String id = TrustOsmPrimitive.createUniqueObjectIdentifier(seg.way);
+                        String id = TrustOsmPrimitive.createUniqueObjectIdentifier(seg.getWay());
                         if (TrustOSMplugin.signedItems.containsKey(id)) {
                             List<Node> nodes = new ArrayList<>();
@@ -654 +655 @@
 
         // highlight all selected WaySegments
-        for (WaySegment seg : selectedSegments) {
+        for (IWaySegment<?, ?> seg : selectedSegments) {
             GeneralPath b = new GeneralPath();
             Point p1 = mv.getPoint(seg.getFirstNode());