Changeset 14446 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2018-11-24T15:00:43+01:00 (5 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromGpxLayerAction.java
r14153 r14446 34 34 import org.openstreetmap.josm.spi.preferences.Config; 35 35 import org.openstreetmap.josm.tools.GBC; 36 import org.openstreetmap.josm.tools.Logging;37 import org.openstreetmap.josm.tools.UncheckedParseException;38 36 import org.openstreetmap.josm.tools.date.DateUtils; 39 37 … … 81 79 n.put(key, str); 82 80 } 83 if (GpxConstants.PT_TIME.equals(key)) {84 // timestamps should always be converted85 try {86 n.setTimestamp(DateUtils.fromString(str));87 } catch (UncheckedParseException e) {88 Logging.log(Logging.LEVEL_WARN, e);89 }90 }91 81 } else if (obj instanceof Date && GpxConstants.PT_TIME.equals(key)) { 92 82 // timestamps should always be converted -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
r14079 r14446 13 13 import java.util.ArrayList; 14 14 import java.util.Collection; 15 import java.util.Date;16 15 import java.util.HashMap; 17 16 import java.util.LinkedList; … … 260 259 public WayPoint convertToWayPoint() { 261 260 WayPoint wpt = new WayPoint(getCoor()); 262 wpt. put(GpxConstants.PT_TIME, timeFormatter.format(new Date(Math.round(time * 1000))));261 wpt.setTime((long) (time*1000)); 263 262 if (text != null) { 264 263 wpt.addExtension("text", text);
Note:
See TracChangeset
for help on using the changeset viewer.