Changeset 17653 in josm for trunk/src

Timestamp:

2021-03-24T00:15:51+01:00 (4 years ago)

Author:

simon04

Message:

see #14176 - DateUtils.parseInstant

File:

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

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

@@ -67 +67 @@
      */
     public static long tsFromString(String str) {
+        return parseInstant(str).toEpochMilli();
+    }
+
+    /**
+     * Parses the given date string quickly, regardless of current locale.
+     * @param str the date string
+     * @return the parsed instant
+     */
+    public static Instant parseInstant(String str) {
         // "2007-07-25T09:26:24{Z|{+|-}01[:00]}"
         if (checkLayout(str, "xxxx-xx-xx") ||
@@ -76 +85 @@
                     str.length() > 8 ? parsePart2(str, 8) : 1,
                     0, 0, 0, 0, ZoneOffset.UTC);
-            return local.toInstant().toEpochMilli();
+            return local.toInstant();
         } else if (checkLayout(str, "xxxx-xx-xxTxx:xx:xxZ") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx") ||
@@ -98 +107 @@
             if (str.length() == 22 || str.length() == 25) {
                 final int plusHr = parsePart2(str, 20);
-                return local.plusHours(str.charAt(19) == '+' ? -plusHr : plusHr).toInstant().toEpochMilli();
+                return local.plusHours(str.charAt(19) == '+' ? -plusHr : plusHr).toInstant();
             }
-            return local.toInstant().toEpochMilli();
+            return local.toInstant();
         } else if (checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxxZ") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx") ||
@@ -118 +127 @@
             if (str.length() == 29) {
                 final int plusHr = parsePart2(str, 24);
-                return local.plusHours(str.charAt(23) == '+' ? -plusHr : plusHr).toInstant().toEpochMilli();
+                return local.plusHours(str.charAt(23) == '+' ? -plusHr : plusHr).toInstant();
             }
-            return local.toInstant().toEpochMilli();
+            return local.toInstant();
         } else {
             // example date format "18-AUG-08 13:33:03"
@@ -126 +135 @@
             Date d = f.parse(str, new ParsePosition(0));
             if (d != null)
-                return d.getTime();
+                return d.toInstant();
         }
 
         try {
             // slow path for fractional seconds different from millisecond precision
-            return ZonedDateTime.parse(str).toInstant().toEpochMilli();
+            return ZonedDateTime.parse(str).toInstant();
         } catch (IllegalArgumentException | DateTimeParseException ex) {
             throw new UncheckedParseException("The date string (" + str + ") could not be parsed.", ex);