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

Timestamp:

2008-12-28T12:10:55+01:00 (16 years ago)

Author:

stoecker

Message:

close bug #1896. Patch by Teemu Koskinen

File:

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

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

@@ -37 +37 @@
     public final static SimpleDateFormat GPXTIMEFMT =
         new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); // ignore timezone
+    public final static SimpleDateFormat GPXTIMEFMT2 =
+        new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); // ignore timezone
 
     public void setTime() {
@@ -43 +45 @@
         }
         Date d = GPXTIMEFMT.parse(attr.get("time").toString(), new ParsePosition(0));
+        if (d == null) {
+            d = GPXTIMEFMT2.parse(attr.get("time").toString(), new ParsePosition(0));
+        }
         if (d != null /* parsing ok */) {
             time = d.getTime() / 1000.0; /* ms => seconds */