Changeset 14445 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-11-23T20:59:30+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #16995 - use exclusively Date objects in waypoints (patch by cmuelle8, modified)

File:

• trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -3 +3 @@
 
 import java.awt.Color;
-import java.time.DateTimeException;
 import java.util.ArrayList;
 import java.util.Date;
@@ -15 +14 @@
 import org.openstreetmap.josm.data.projection.Projecting;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.UncheckedParseException;
-import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
 
@@ -136 +133 @@
     public void setTime(Date time) {
         this.time = time.getTime() / 1000.;
-        this.attr.put(PT_TIME, DateUtils.fromDate(time));
+        this.attr.put(PT_TIME, time);
     }
 
@@ -156 +153 @@
      */
     public void setTime(long ts) {
-        this.time = ts;
-        this.attr.put(PT_TIME, DateUtils.fromTimestamp(ts));
+        setTimeInMillis(ts*1000);
     }
 
@@ -168 +164 @@
     public void setTimeInMillis(long ts) {
         this.time = ts / 1000.;
-        this.attr.put(PT_TIME, DateUtils.fromTimestampInMillis(ts));
+        this.attr.put(PT_TIME, new Date(ts));
     }
 
@@ -178 +174 @@
     public Date setTimeFromAttribute() {
         if (attr.containsKey(PT_TIME)) {
-            try {
-                final Object obj = get(PT_TIME);
-                final Date date = obj instanceof Date ? (Date) obj : DateUtils.fromString(obj.toString());
+            final Object obj = get(PT_TIME);
+            if (obj instanceof Date) {
+                final Date date = (Date) obj;
                 time = date.getTime() / 1000.;
                 return date;
-            } catch (UncheckedParseException | DateTimeException e) {
-                Logging.warn(e);
+            } else {
+                Logging.warn("Unsupported waypoint {0} value: {1}", PT_TIME, obj);
                 time = 0;
             }