Changeset 14447 in josm for trunk/src


Ignore:
Timestamp:
2018-11-24T18:22:36+01:00 (12 months ago)
Author:
Don-vip
Message:

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

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

    r14446 r14447  
    1010import java.awt.image.BufferedImage;
    1111import java.io.File;
    12 import java.text.DateFormat;
    1312import java.util.ArrayList;
    1413import java.util.Collection;
     
    3231import org.openstreetmap.josm.tools.ImageProvider;
    3332import org.openstreetmap.josm.tools.Logging;
    34 import org.openstreetmap.josm.tools.date.DateUtils;
    3533import org.openstreetmap.josm.tools.template_engine.ParseError;
    3634import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
     
    207205    public static final String LABEL_PATTERN_DESC = "{desc}";
    208206
    209     private final DateFormat timeFormatter = DateUtils.getGpxFormat();
    210207    private final TemplateEngineDataProvider dataProvider;
    211208    private final String text;
  • trunk/src/org/openstreetmap/josm/io/GpxReader.java

    r14446 r14447  
    432432                case "url":
    433433                case "urlname":
     434                case "cmt":
     435                case "desc":
    434436                    currentWayPoint.put(localName, accumulator.toString());
    435437                    break;
     
    449451                        Logging.error(e);
    450452                    }
    451                     break;
    452                 case "cmt":
    453                 case "desc":
    454                     currentWayPoint.put(localName, accumulator.toString());
    455453                    break;
    456454                case "rtept":
Note: See TracChangeset for help on using the changeset viewer.