Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java
===================================================================
--- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java	(revision 35948)
+++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java	(revision 35949)
@@ -26,5 +26,4 @@
 import org.openstreetmap.josm.data.gpx.GpxLink;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.io.IllegalDataException;
@@ -74,5 +73,5 @@
     private static final String TYPE_TAG = "columbus:type";
 
-    private static String[] EMPTY_LINE = new String[] {};
+    private static final String[] EMPTY_LINE = new String[] {};
     private static final String SEPS = ",";
     /* Lines to read before deciding on Columbus file yes/no */
@@ -165,5 +164,5 @@
                     br.close();
                     throw new IllegalDataException(tr("Error in line " + line
-                        + ": " + ex.toString()), ex);
+                        + ": " + ex), ex);
                 }
                 ++line;
@@ -183,6 +182,6 @@
         // compose the track
         allTrackPts.add(trackPts);
-        GpxTrack trk = new ImmutableGpxTrack(allTrackPts,
-            Collections.<String, Object> emptyMap());
+        GpxTrack trk = new GpxTrack(allTrackPts,
+            Collections.emptyMap());
         gpxData.tracks.add(trk);