Changeset 14434 in josm for trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

Timestamp:

2018-11-20T01:13:10+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #16995 - fix timestamp in GPX exports (patch by cmuelle8) + use Java 8 unsigned int API

File:

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

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

@@ -153 +153 @@
      * @since 14055
      */
-    public static synchronized String fromTimestamp(long timestamp) {
-        final ZonedDateTime temporal = Instant.ofEpochMilli(TimeUnit.SECONDS.toMillis(timestamp)).atZone(ZoneOffset.UTC);
+    public static String fromTimestamp(long timestamp) {
+        return fromTimestampInMillis(TimeUnit.SECONDS.toMillis(timestamp));
+    }
+
+    /**
+     * Formats a date to the XML UTC format regardless of current locale.
+     * @param timestamp number of milliseconds since the epoch
+     * @return The formatted date
+     * @since 14434
+     */
+    public static synchronized String fromTimestampInMillis(long timestamp) {
+        final ZonedDateTime temporal = Instant.ofEpochMilli(timestamp).atZone(ZoneOffset.UTC);
         return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(temporal);
     }
@@ -164 +174 @@
      */
     public static synchronized String fromTimestamp(int timestamp) {
-        return fromTimestamp((long) timestamp);
+        return fromTimestamp(Integer.toUnsignedLong(timestamp));
     }