Changeset 9746 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-02-06T22:04:49+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #12497 - add support for notes in session files

File:

• trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -80 +80 @@
      */
     public static synchronized long tsFromString(String str) throws UncheckedParseException {
-        // "2007-07-25T09:26:24{Z|{+|-}01:00}"
+        // "2007-07-25T09:26:24{Z|{+|-}01[:00]}"
         if (checkLayout(str, "xxxx-xx-xxTxx:xx:xxZ") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx") ||
                 checkLayout(str, "xxxx:xx:xx xx:xx:xx") ||
                 checkLayout(str, "xxxx-xx-xx xx:xx:xx UTC") ||
+                checkLayout(str, "xxxx-xx-xxTxx:xx:xx+xx") ||
+                checkLayout(str, "xxxx-xx-xxTxx:xx:xx-xx") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx+xx:00") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx-xx:00")) {
@@ -97 +99 @@
             c.set(Calendar.MILLISECOND, 0);
 
-            if (str.length() == 25) {
+            if (str.length() == 22 || str.length() == 25) {
                 int plusHr = parsePart2(str, 20);
                 int mul = str.charAt(19) == '+' ? -3600000 : 3600000;