Changeset 13042 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2017-10-27T00:37:48+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #15488 - display SubSecTimeOriginal on picture's information overlay

File:

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

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

@@ -13 +13 @@
 import java.awt.event.WindowEvent;
 import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 
 import javax.swing.AbstractAction;
@@ -335 +336 @@
             }
             DateFormat dtf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
+            // Make sure date/time format includes milliseconds
+            if (dtf instanceof SimpleDateFormat) {
+                String pattern = ((SimpleDateFormat) dtf).toPattern();
+                if (!pattern.contains(".SSS")) {
+                    dtf = new SimpleDateFormat(pattern.replace(":ss", ":ss.SSS"));
+                }
+            }
             if (entry.hasExifTime()) {
                 osd.append(tr("\nEXIF time: {0}", dtf.format(entry.getExifTime())));