Index: applications/editors/josm/plugins/editgpx/.classpath
===================================================================
--- applications/editors/josm/plugins/editgpx/.classpath	(revision 34736)
+++ applications/editors/josm/plugins/editgpx/.classpath	(revision 34737)
@@ -2,5 +2,10 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry excluding="src/" including="images/" kind="src" path=""/>
+	<classpathentry excluding="src/|test/unit/|test/unit/" including="images/" kind="src" path=""/>
+	<classpathentry kind="src" output="bintest" path="test/unit">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
Index: applications/editors/josm/plugins/editgpx/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- applications/editors/josm/plugins/editgpx/.settings/org.eclipse.jdt.core.prefs	(revision 34736)
+++ applications/editors/josm/plugins/editgpx/.settings/org.eclipse.jdt.core.prefs	(revision 34737)
@@ -9,4 +9,5 @@
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -32,4 +33,9 @@
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
@@ -38,4 +44,12 @@
 org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
Index: applications/editors/josm/plugins/editgpx/.settings/org.sonarlint.eclipse.core.prefs
===================================================================
--- applications/editors/josm/plugins/editgpx/.settings/org.sonarlint.eclipse.core.prefs	(revision 34736)
+++ applications/editors/josm/plugins/editgpx/.settings/org.sonarlint.eclipse.core.prefs	(revision 34737)
@@ -2,4 +2,3 @@
 eclipse.preferences.version=1
 extraProperties=
-moduleKey=josm-plugins
-serverId=josm
+fileExclusions=
Index: applications/editors/josm/plugins/editgpx/build.xml
===================================================================
--- applications/editors/josm/plugins/editgpx/build.xml	(revision 34736)
+++ applications/editors/josm/plugins/editgpx/build.xml	(revision 34737)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="14434"/>
     
     <!-- Configure these properties (replace "..." accordingly).
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 34736)
+++ 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 34736)
+++ 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 34736)
+++ 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 34736)
+++ 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 34736)
+++ 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 34736)
+++ 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() {