Ticket #21765: 21765.patch

build.xml

@@ -4 +4 @@
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
     <!-- 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).
          See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins

src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java

@@ -19 +19 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.importexport.FileImporter;
@@ -56 +56 @@
 
         try (
             InputStream source = new FileInputStream(file);
-            BufferedReader rd = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8));
-         ) {
+            BufferedReader rd = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8))) {
             String line;
             while ((line = rd.readLine()) != null) {
                 failure++;
@@ -78 +77 @@
             failure = failure - imported;
             if (imported > 0) {
                 GpxData data = new GpxData();
-                data.tracks.add(new ImmutableGpxTrack(Collections.singleton(currentTrackSeg), Collections.<String, Object>emptyMap()));
+                data.tracks.add(new GpxTrack(Collections.singleton(currentTrackSeg), Collections.emptyMap()));
                 data.recalculateBounds();
                 data.storageFile = file;
                 GpxLayer gpxLayer = new GpxLayer(data, file.getName());

src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java

@@ -17 +17 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.importexport.FileImporter;
@@ -159 +159 @@
                                     }
                                 }
                             }
-                            gpxData.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
+                            gpxData.tracks.add(new GpxTrack(currentTrack, Collections.emptyMap()));
                         }
                     }
                 }
@@ -186 +186 @@
                             }
                         }
                     }
-                    gpxData.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
+                    gpxData.tracks.add(new GpxTrack(currentTrack, Collections.emptyMap()));
                 }
             }
         }