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

Timestamp:

2010-09-25T10:39:16+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #5417 - Failed to parse date

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/ChangesetClosedException.java (modified) (1 diff)
• tools/ExceptionUtil.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java

@@ -75 +75 @@
         if (m.matches()) {
             changesetId = Long.parseLong(m.group(1));
-            // Example: Tue Oct 15 10:00:00 UTC 2009. Always parsed with english locale regardless
+            // Example: "2010-09-07 14:39:41 UTC". Always parsed with US locale regardless
             // of the current locale in JOSM
-            DateFormat formatter = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy",Locale.ENGLISH);
+            DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z", Locale.US);
             try {
                 closedOn = formatter.parse(m.group(2));

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -198 +198 @@
             if (m.matches()) {
                 long changesetId = Long.parseLong(m.group(1));
-                // Example: Tue Oct 15 10:00:00 UTC 2009. Always parsed with english locale, regardless
+                // Example: "2010-09-07 14:39:41 UTC". Always parsed with US locale, regardless
                 // of the current locale in JOSM
-                DateFormat formatter = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
+                DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z", Locale.US);
                 Date closeDate = null;
                 try {
@@ -249 +249 @@
                 +"because it has already been closed on {1}.</html>",
                 e.getChangesetId(),
-                dateFormat.format(e.getClosedOn())
+                e.getClosedOn() == null ? "?" : dateFormat.format(e.getClosedOn())
         );
         e.printStackTrace();