Changeset 14447 in josm

Timestamp:

2018-11-24T18:22:36+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16995 - fix spotbugs regressions (patch by cmuelle8)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/markerlayer/Marker.java (modified) (3 diffs)
• io/GpxReader.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32 +31 @@
 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;
@@ -207 +205 @@
     public static final String LABEL_PATTERN_DESC = "{desc}";
 
-    private final DateFormat timeFormatter = DateUtils.getGpxFormat();
     private final TemplateEngineDataProvider dataProvider;
     private final String text;

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

@@ -432 +432 @@
                 case "url":
                 case "urlname":
+                case "cmt":
+                case "desc":
                     currentWayPoint.put(localName, accumulator.toString());
                     break;
@@ -449 +451 @@
                         Logging.error(e);
                     }
-                    break;
-                case "cmt":
-                case "desc":
-                    currentWayPoint.put(localName, accumulator.toString());
                     break;
                 case "rtept":