Changeset 33009 in osm

Timestamp:

2016-09-24T02:13:48+02:00 (8 years ago)

Author:

donvip

Message:

remove duplicated files

Location:

applications/editors/josm/plugins

Files:

• dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/SingleSegmentGpxTrack.java (deleted)
• dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java (modified) (2 diffs)
• globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java (modified) (2 diffs)
• globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java (deleted)
• livegps/src/livegps/SingleSegmentGpxTrack.java (modified) (2 diffs)

applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.ImmutableGpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -78 +78 @@
             if(imported > 0) {
                 GpxData data = new GpxData();
-                data.tracks.add(new SingleSegmentGpxTrack(new ImmutableGpxTrackSegment(currentTrackSeg), Collections.<String, Object>emptyMap()));
+                data.tracks.add(new ImmutableGpxTrack(Collections.singleton(currentTrackSeg), Collections.<String, Object>emptyMap()));
                 data.recalculateBounds();
                 data.storageFile = file;

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

@@ -23 +23 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.ImmutableGpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -166 +166 @@
                     progressMonitor.worked(1);
                 }
-                result.tracks.add(new SingleSegmentGpxTrack(new ImmutableGpxTrackSegment(seg), Collections.<String, Object>emptyMap()));
+                result.tracks.add(new ImmutableGpxTrack(Collections.singleton(seg), Collections.<String, Object>emptyMap()));
             }
             return result;

applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java

@@ -18 +18 @@
         this.trackSegment = trackSegment;
     }
-
 
     @Override
@@ -44 +43 @@
         return trackSegment.getUpdateCount();
     }
-
 }