Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 34748)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 34749)
@@ -29,4 +29,5 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -67,6 +68,5 @@
                                 parseLatLon(lineElements));
                         currentWayPoint.attr.put("ele", lineElements[2]);
-                        currentWayPoint.attr.put("time", lineElements[6]);
-                        currentWayPoint.setTime();
+                        currentWayPoint.setTimeInMillis(DateUtils.tsFromString(lineElements[6]));
                         currentTrackSeg.add(currentWayPoint);
                         imported++;
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 34748)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 34749)
@@ -159,6 +159,5 @@
                                         if (waypt != null) {
                                             if (startTime != null) {
-                                                waypt.attr.put("name", "LAP"
-                                                               + (++lap));
+                                                waypt.attr.put("name", "LAP" + ++lap);
                                                 gpxData.waypoints.add(waypt);
                                                 startTime = null;