Changeset 17910 in josm for trunk/src/org

Timestamp:

2021-05-24T12:13:56+02:00 (4 years ago)

Author:

simon04

Message:

fix #20875 - Use same DateFormat for formatting/parsing

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -29 +29 @@
 import java.text.SimpleDateFormat;
 import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -598 +596 @@
         }
 
+        private SimpleDateFormat getDateTimeFormat() {
+            return (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
+        }
+
         @Override
         public void actionPerformed(ActionEvent e) {
-            SimpleDateFormat dateFormat = (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
+            SimpleDateFormat dateFormat = getDateTimeFormat();
 
             JPanel panel = new JPanel(new BorderLayout());
@@ -773 +775 @@
             Instant date = img.getExifInstant();
             if (date != null) {
-                DateTimeFormatter df = DateUtils.getDateTimeFormatter(FormatStyle.SHORT, FormatStyle.MEDIUM)
-                        .withZone(ZoneOffset.UTC); // EXIF data does not contain timezone information and is read as UTC
-                lbExifTime.setText(df.format(date));
-                tfGpsTime.setText(df.format(date));
+                DateFormat df = getDateTimeFormat();
+                df.setTimeZone(DateUtils.UTC); // EXIF data does not contain timezone information and is read as UTC
+                lbExifTime.setText(df.format(Date.from(date)));
+                tfGpsTime.setText(df.format(Date.from(date)));
                 tfGpsTime.setCaretPosition(tfGpsTime.getText().length());
                 tfGpsTime.setEnabled(true);