Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java	(revision 34751)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java	(revision 35211)
@@ -12,6 +12,5 @@
 
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
-import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -24,5 +23,5 @@
     public EditGpxTrack(GpxTrack track) {
         attributes.putAll(track.getAttributes());
-        for (GpxTrackSegment segment: track.getSegments()) {
+        for (IGpxTrackSegment segment: track.getSegments()) {
             segments.add(new EditGpxTrackSegment(segment));
         }
@@ -70,5 +69,5 @@
         }
 
-        return new ImmutableGpxTrack(wayPoints, attributes);
+        return new GpxTrack(wayPoints, attributes);
     }
 
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java	(revision 34751)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java	(revision 35211)
@@ -5,5 +5,5 @@
 import java.util.List;
 
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -13,5 +13,5 @@
     private boolean deleted;
 
-    public EditGpxTrackSegment(GpxTrackSegment segment) {
+    public EditGpxTrackSegment(IGpxTrackSegment segment) {
         for (WayPoint wayPoint: segment.getWayPoints()) {
             wayPoints.add(new EditGpxWayPoint(wayPoint));