Changeset 19681 in osm for applications/editors/josm/plugins/globalsat

Timestamp:

2010-01-30T20:10:15+01:00 (15 years ago)

Author:

jttt

Message:

Adapted for JOSM r2907

Location:

applications/editors/josm/plugins/globalsat

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java (modified) (4 diffs)

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

@@ -33 +33 @@
         <property name="commit.message" value="Changed constructor signature of plugin main class" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="2907" />
 
         <property name="josm"                   location="../../core/dist/josm-custom.jar"/>

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java

@@ -17 +17 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
@@ -26 +27 @@
 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.ImmutableGpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.SingleSegmentGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -148 +150 @@
                 if(gpsRecList.size() > 0){
                         GpsRec last = null;
-                        GpxTrack trk = new GpxTrack();
+                        result = new GpxData();
                         Collection<WayPoint> seg = new ArrayList<WayPoint>(100);
-                        result = new GpxData();
-                        result.tracks.add(trk);
-                        trk.trackSegs.add(seg);
                         for(GpsRec r:gpsRecList){
                                 if(cancelled){
@@ -166 +165 @@
                                 progressMonitor.worked(1);
                         }
+                        result.tracks.add(new SingleSegmentGpxTrack(new ImmutableGpxTrackSegment(seg), Collections.<String, Object>emptyMap()));
                 }
                 return result;