Index: plications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/SingleSegmentGpxTrack.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/SingleSegmentGpxTrack.java	(revision 33008)
+++ 	(revision )
@@ -1,43 +1,0 @@
-package org.openstreetmap.josm.plugins.dataimport.io;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
-import org.openstreetmap.josm.data.gpx.WithAttributes;
-
-public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
-
-    private final GpxTrackSegment trackSegment;
-
-    public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
-        this.attr = Collections.unmodifiableMap(attributes);
-        this.trackSegment = trackSegment;
-    }
-
-
-    public Map<String, Object> getAttributes() {
-        return attr;
-    }
-
-    public Bounds getBounds() {
-        return trackSegment.getBounds();
-    }
-
-    public Collection<GpxTrackSegment> getSegments() {
-        return Collections.singleton(trackSegment);
-    }
-
-    public double length() {
-        return trackSegment.length();
-    }
-
-    @Override
-    public int getUpdateCount() {
-        return trackSegment.getUpdateCount();
-    }
-
-}
Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 33008)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 33009)
@@ -22,5 +22,5 @@
 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,5 +78,5 @@
             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;
Index: /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java
===================================================================
--- /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java	(revision 33008)
+++ /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java	(revision 33009)
@@ -23,5 +23,5 @@
 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,5 +166,5 @@
                     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;
Index: plications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java
===================================================================
--- /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java	(revision 33008)
+++ 	(revision )
@@ -1,47 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.globalsat;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
-import org.openstreetmap.josm.data.gpx.WithAttributes;
-
-public class SingleSegmentGpxTrack extends WithAttributes implements GpxTrack {
-
-    private final GpxTrackSegment trackSegment;
-
-    public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
-        this.attr = Collections.unmodifiableMap(attributes);
-        this.trackSegment = trackSegment;
-    }
-
-    @Override
-    public Map<String, Object> getAttributes() {
-        return attr;
-    }
-
-    @Override
-    public Bounds getBounds() {
-        return trackSegment.getBounds();
-    }
-
-    @Override
-    public Collection<GpxTrackSegment> getSegments() {
-        return Collections.singleton(trackSegment);
-    }
-
-    @Override
-    public double length() {
-        return trackSegment.length();
-    }
-
-    @Override
-    public int getUpdateCount() {
-        return trackSegment.getUpdateCount();
-    }
-
-}
Index: /applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java
===================================================================
--- /applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 33008)
+++ /applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java	(revision 33009)
@@ -18,5 +18,4 @@
         this.trackSegment = trackSegment;
     }
-
 
     @Override
@@ -44,4 +43,3 @@
         return trackSegment.getUpdateCount();
     }
-
 }