Ticket #16995: josm-findbugs-regressions_in_Marker.java_and_GpxReader.java.patch

src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -31 +30 @@
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.template_engine.ParseError;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
 import org.openstreetmap.josm.tools.template_engine.TemplateEntry;
@@ -206 +204 @@
     public static final String LABEL_PATTERN_NAME = "{name}";
     public static final String LABEL_PATTERN_DESC = "{desc}";
 
-    private final DateFormat timeFormatter = DateUtils.getGpxFormat();
     private final TemplateEngineDataProvider dataProvider;
     private final String text;
 

src/org/openstreetmap/josm/io/GpxReader.java

@@ -431 +431 @@
                 case "sym":
                 case "url":
                 case "urlname":
+                case "cmt":
+                case "desc":
                     currentWayPoint.put(localName, accumulator.toString());
                     break;
                 case "hdop":
@@ -449 +451 @@
                         Logging.error(e);
                     }
                     break;
-                case "cmt":
-                case "desc":
-                    currentWayPoint.put(localName, accumulator.toString());
-                    break;
                 case "rtept":
                     currentState = states.pop();
                     convertUrlToLink(currentWayPoint.attr);