Index: /applications/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 20267)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/SingleSegmentGpxTrack.java	(revision 20267)
@@ -0,0 +1,38 @@
+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;
+
+public class SingleSegmentGpxTrack implements GpxTrack {
+
+	private final Map<String, Object> attributes;
+	private final GpxTrackSegment trackSegment;
+
+	public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
+		this.attributes = Collections.unmodifiableMap(attributes);
+		this.trackSegment = trackSegment;
+	}
+
+
+	public Map<String, Object> getAttributes() {
+		return attributes;
+	}
+
+	public Bounds getBounds() {
+		return trackSegment.getBounds();
+	}
+
+	public Collection<GpxTrackSegment> getSegments() {
+		return Collections.singleton(trackSegment);
+	}
+
+	public double length() {
+		return trackSegment.length();
+	}
+
+}
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 20266)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 20267)
@@ -23,5 +23,4 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 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.layer.GpxLayer;
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 20266)
+++ /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java	(revision 20267)
@@ -28,5 +28,4 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 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;
Index: /applications/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 20267)
+++ /applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/SingleSegmentGpxTrack.java	(revision 20267)
@@ -0,0 +1,38 @@
+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;
+
+public class SingleSegmentGpxTrack implements GpxTrack {
+
+	private final Map<String, Object> attributes;
+	private final GpxTrackSegment trackSegment;
+
+	public SingleSegmentGpxTrack(GpxTrackSegment trackSegment, Map<String, Object> attributes) {
+		this.attributes = Collections.unmodifiableMap(attributes);
+		this.trackSegment = trackSegment;
+	}
+
+
+	public Map<String, Object> getAttributes() {
+		return attributes;
+	}
+
+	public Bounds getBounds() {
+		return trackSegment.getBounds();
+	}
+
+	public Collection<GpxTrackSegment> getSegments() {
+		return Collections.singleton(trackSegment);
+	}
+
+	public double length() {
+		return trackSegment.length();
+	}
+
+}