Changeset 35221 in osm for applications/editors/josm/plugins/public_transport

Timestamp:

2019-11-03T22:22:25+01:00 (5 years ago)

Author:

donvip

Message:

see #josm16796 - update to JOSM 15502 - use IGpxTrack in GpxData (patch by Bjoeni)

Location:

applications/editors/josm/plugins/public_transport

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java (modified) (4 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="15496"/>
+    <property name="plugin.main.version" value="15502"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -210 +210 @@
         if (data != null) {
             Vector<TrackReference> trackRefs = new Vector<>();
-            Iterator<GpxTrack> trackIter = data.tracks.iterator();
+            Iterator<IGpxTrack> trackIter = data.tracks.iterator();
             while (trackIter.hasNext()) {
-                GpxTrack track = trackIter.next();
+                IGpxTrack track = trackIter.next();
                 trackRefs.add(new TrackReference(track, this));
             }

applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -24 +24 @@
 
 public class TrackReference implements Comparable<TrackReference>, TableModelListener {
-    public GpxTrack track;
+    public IGpxTrack track;
 
     public TrackStoplistTableModel stoplistTM;
@@ -40 +40 @@
     public boolean inEvent = false;
 
-    public TrackReference(GpxTrack track, StopImporterAction controller) {
+    public TrackReference(IGpxTrack track, StopImporterAction controller) {
         this.track = track;
         this.stoplistTM = new TrackStoplistTableModel(this);
@@ -71 +71 @@
     }
 
-    public GpxTrack getGpxTrack() {
+    public IGpxTrack getGpxTrack() {
         return track;
     }