Index: applications/editors/josm/plugins/public_transport/build.xml
===================================================================
--- applications/editors/josm/plugins/public_transport/build.xml	(revision 35218)
+++ applications/editors/josm/plugins/public_transport/build.xml	(revision 35219)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="15496"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>
Index: applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java	(revision 35218)
+++ applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java	(revision 35219)
@@ -21,10 +21,7 @@
     private GTFSStopTableModel gtfsStopTM = null;
 
-    private String type = null;
-
     public GTFSAddCommand(GTFSImporterAction controller) {
         super(MainApplication.getLayerManager().getEditDataSet());
         gtfsStopTM = controller.getGTFSStopTableModel();
-        type = controller.getDialog().getStoptype();
         workingLines = new Vector<>();
         typesForUndo = new Vector<>();
Index: applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java	(revision 35218)
+++ applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java	(revision 35219)
@@ -10,5 +10,5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.Node;
@@ -35,5 +35,5 @@
     private double threshold;
 
-    private Collection<GpxTrackSegment> segments = null;
+    private Collection<IGpxTrackSegment> segments = null;
 
     private Vector<Vector<Object>> tableDataModel = null;
@@ -76,5 +76,5 @@
 
         Vector<WayPoint> wayPoints = new Vector<>();
-        Iterator<GpxTrackSegment> siter = segments.iterator();
+        Iterator<IGpxTrackSegment> siter = segments.iterator();
         while (siter.hasNext()) {
             Iterator<WayPoint> witer = siter.next().getWayPoints().iterator();
Index: applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java	(revision 35218)
+++ applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java	(revision 35219)
@@ -19,4 +19,5 @@
 /**
  * Abstract superclass of {@link GTFSImporterDialog} and {@link StopImporterDialog}.
+ * @param <T> type of action
  */
 public abstract class AbstractImporterDialog<T extends JosmAction> {
Index: applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java	(revision 35218)
+++ applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java	(revision 35219)
@@ -15,5 +15,5 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 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;
 import org.openstreetmap.josm.data.osm.Node;
@@ -38,6 +38,4 @@
     public double threshold;
 
-    private StopImporterAction controller = null;
-
     public boolean inEvent = false;
 
@@ -48,7 +46,6 @@
         this.gpsStartTime = null;
         this.gpsSyncTime = null;
-        this.controller = controller;
         if (track != null) {
-            Iterator<GpxTrackSegment> siter = track.getSegments().iterator();
+            Iterator<IGpxTrackSegment> siter = track.getSegments().iterator();
             while (siter.hasNext() && this.gpsSyncTime == null) {
                 Iterator<WayPoint> witer = siter.next().getWayPoints().iterator();
@@ -131,5 +128,5 @@
         double wayPointTime = 0;
         double lastWayPointTime = 0;
-        Iterator<GpxTrackSegment> siter = track.getSegments().iterator();
+        Iterator<IGpxTrackSegment> siter = track.getSegments().iterator();
         while (siter.hasNext()) {
             Iterator<WayPoint> witer = siter.next().getWayPoints().iterator();