Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 34505)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 34737)
@@ -131,6 +131,6 @@
      * convert a DataSet to GPX
      *
-     * @param boolean anonTime If true set all time and date in GPX to 01/01/1970 00:00 ?
-     * @return GPXData
+     * @param anonTime If true set all time and date in GPX to 01/01/1970 00:00 ?
+     * @return GpxData
      */
     private GpxData toGpxData(boolean anonTime) {
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java	(revision 34505)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java	(revision 34737)
@@ -107,4 +107,7 @@
     /**
      * create rectangle out of two given corners
+     * @param p1 first corner
+     * @param p2 second corner
+     * @return rectangle
      */
     public Rectangle createRect(Point p1, Point p2) {
@@ -137,4 +140,6 @@
     /**
      * Draw a selection rectangle on screen.
+     * @param p1 first corner
+     * @param p2 second corner
      */
     private void paintRect(Point p1, Point p2) {
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java	(revision 34505)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java	(revision 34737)
@@ -71,4 +71,5 @@
      * time of the oldest waypoint in the set of non-deleted waypoints
      * in this data (in seconds since Epoch)
+     * @return time in seconds since Epoch
      */
     public double minNonDeletedTime() {
@@ -80,5 +81,5 @@
                 try {
                     double t = track.minNonDeletedTime();
-                    if ((!foundOne) || (t < minTime)) {
+                    if (!foundOne || t < minTime) {
                         minTime = t;
                     }
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java	(revision 34505)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java	(revision 34737)
@@ -5,5 +5,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -42,5 +41,5 @@
 
         final DateFormat iso8601 =
-            new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
         final TimeZone utc = TimeZone.getTimeZone("UTC");
         iso8601.setTimeZone(utc);
@@ -54,7 +53,5 @@
                         for (WayPoint w : points) {
                             double t = w.time - minTime;
-                            w.attr.put("time", iso8601.format(
-                                    new Date((long)(t * 1000))));
-                            w.setTime();
+                            w.setTimeInMillis((long)(t * 1000));
                             assert w.time == t;
                             if (w.attr.containsKey("name")) {
@@ -87,4 +84,5 @@
      * time of the oldest waypoint in the set of non-deleted waypoints
      * in this track (in seconds since Epoch)
+     * @return time in seconds since Epoch
      */
     public double minNonDeletedTime() {
@@ -96,5 +94,5 @@
                 try {
                     double t = segment.minNonDeletedTime();
-                    if ((!foundOne) || (t < minTime)) {
+                    if (!foundOne || t < minTime) {
                         minTime = t;
                     }
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java	(revision 34505)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java	(revision 34737)
@@ -46,4 +46,5 @@
      * time of the oldest waypoint in the set of non-deleted waypoints
      * in this segment (in seconds since Epoch)
+     * @return time in seconds since Epoch
      */
     public double minNonDeletedTime() {
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java	(revision 34505)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java	(revision 34737)
@@ -36,4 +36,5 @@
     /**
      * returns this waypoint's time in seconds since Epoch
+     * @return time in seconds since Epoch
      */
     public double getTime() {