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

Timestamp:

2021-04-08T22:56:06+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - Migrate GPX to Instant

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ExifReader.java (modified) (4 diffs)
• date/DateUtils.java (modified) (1 diff)

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.time.DateTimeException;
+import java.time.Instant;
 import java.util.Date;
 import java.util.List;
@@ -42 +43 @@
      * @param filename The JPEG file to read
      * @return The date/time read in the EXIF section, or {@code null} if not found
-     */
+     * @deprecated Use {@link #readInstant(File)}
+     */
+    @Deprecated
     public static Date readTime(File filename) {
-        try {
-            final Metadata metadata = JpegMetadataReader.readMetadata(filename);
-            return readTime(metadata);
+        Instant instant = readInstant(filename);
+        return instant == null ? null : Date.from(instant);
+    }
+
+    /**
+     * Returns the date/time from the given JPEG file.
+     * @param filename The JPEG file to read
+     * @return The date/time read in the EXIF section, or {@code null} if not found
+     */
+    public static Instant readInstant(File filename) {
+        try {
+            final Metadata metadata = JpegMetadataReader.readMetadata(filename);
+            return readInstant(metadata);
         } catch (JpegProcessingException | IOException e) {
             Logging.error(e);
@@ -58 +71 @@
      * @return The date/time read in the EXIF section, or {@code null} if not found
      * @since 11745
-     */
+     * @deprecated Use {@link #readInstant(Metadata)}
+     */
+    @Deprecated
     public static Date readTime(Metadata metadata) {
+        Instant instant = readInstant(metadata);
+        return instant == null ? null : Date.from(instant);
+    }
+
+    /**
+     * Returns the date/time from the given JPEG file.
+     * @param metadata The EXIF metadata
+     * @return The date/time read in the EXIF section, or {@code null} if not found
+     */
+    public static Instant readInstant(Metadata metadata) {
         try {
             String dateTimeOrig = null;
@@ -109 +134 @@
             if (dateStr != null) {
                 dateStr = dateStr.replace('/', ':'); // workaround for HTC Sensation bug, see #7228
-                final Date date = DateUtils.fromString(dateStr);
+                Instant date = DateUtils.parseInstant(dateStr);
                 if (subSeconds != null) {
                     try {
-                        date.setTime(date.getTime() + (long) (TimeUnit.SECONDS.toMillis(1) * Double.parseDouble("0." + subSeconds)));
+                        date = date.plusMillis((long) (TimeUnit.SECONDS.toMillis(1) * Double.parseDouble("0." + subSeconds)));
                     } catch (NumberFormatException e) {
                         Logging.warn("Failed parsing sub seconds from [{0}]", subSeconds);

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

@@ -287 +287 @@
      * @return the date format used for GPX waypoints
      * @since 14055
-     */
+     * @deprecated Use {@link Instant#toString()}
+     */
+    @Deprecated
     public static DateFormat getGpxFormat() {
         SimpleDateFormat result = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");