Changeset 571 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2008-02-29T20:34:11+01:00 (16 years ago)

Author:

tom_e

Message:

Restored time/setTime semantics accidentally broken in r553.

File:

• trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) (1 diff)

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

@@ -33 +33 @@
          */
         public void setTime () {
-                if (! attr.containsKey("time"))
+                if (! attr.containsKey("time")) {
                         time = 0.0;
+                        return;
+                }
                 SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); // ignore timezone
                 Date d = f.parse(attr.get("time").toString(), new ParsePosition(0));
-                if (d == null /* failed to parse */)
+                if (d == null /* failed to parse */) {
                         time = 0.0;
-                time = d.getTime() / 1000.0; /* ms => seconds */
+                } else {
+                        time = d.getTime() / 1000.0; /* ms => seconds */
+                }
         }