Index: applications/editors/josm/plugins/ElevationProfile/build.xml
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/build.xml	(revision 35211)
+++ applications/editors/josm/plugins/ElevationProfile/build.xml	(revision 35212)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14456"/>
+    <property name="plugin.main.version" value="15496"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java	(revision 35211)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java	(revision 35212)
@@ -8,5 +8,5 @@
 import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.IWithAttributes;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -160,17 +160,15 @@
 
     @Override
-    public void beginTrackSegment(GpxTrack track, GpxTrackSegment segment) {
+    public void beginTrackSegment(GpxTrack track, IGpxTrackSegment segment) {
         // Nothing to do here for now
     }
 
     @Override
-    public void endTrackSegment(GpxTrack track, GpxTrackSegment segment) {
+    public void endTrackSegment(GpxTrack track, IGpxTrackSegment segment) {
         // Nothing to do here for now
     }
 
     @Override
-    public void visitTrackPoint(WayPoint wp, GpxTrack track,
-            GpxTrackSegment segment) {
-
+    public void visitTrackPoint(WayPoint wp, GpxTrack track, IGpxTrackSegment segment) {
         processWayPoint(wp);
     }
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java	(revision 35211)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java	(revision 35212)
@@ -7,5 +7,5 @@
 import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -78,10 +78,10 @@
         if (visitor == null) return;
 
-        Collection<GpxTrackSegment> segments = trk.getSegments();
+        Collection<IGpxTrackSegment> segments = trk.getSegments();
 
         if (segments != null) {
             visitor.beginTrack(trk);
             // visit all segments
-            for (GpxTrackSegment segment : segments) {
+            for (IGpxTrackSegment segment : segments) {
                 Collection<WayPoint> waypts = segment.getWayPoints();
                 // no visitor here...
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java	(revision 35211)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java	(revision 35212)
@@ -4,5 +4,5 @@
 import org.openstreetmap.josm.data.gpx.GpxRoute;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -46,10 +46,10 @@
      * Starts a segment within a GPX track.
      */
-    void beginTrackSegment(GpxTrack track, GpxTrackSegment segment);
+    void beginTrackSegment(GpxTrack track, IGpxTrackSegment segment);
 
     /**
      * Ends a segment within a GPX track.
      */
-    void endTrackSegment(GpxTrack track, GpxTrackSegment segment);
+    void endTrackSegment(GpxTrack track, IGpxTrackSegment segment);
 
     /**
@@ -67,5 +67,5 @@
      * @param segment the track segment
      */
-    void visitTrackPoint(WayPoint wp, GpxTrack track, GpxTrackSegment segment);
+    void visitTrackPoint(WayPoint wp, GpxTrack track, IGpxTrackSegment segment);
 
     /**