Changeset 5432 in josm for trunk/src

Timestamp:

2012-08-12T00:25:59+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7822 - display the EXIF/GPS time for geotagged images, when known

File:

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

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

@@ -16 +16 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
+import java.text.DateFormat;
 
 import javax.swing.AbstractAction;
@@ -247 +248 @@
             //}
             //osd.append(tr("\nfile mtime: {0}", Long.toString(entry.getFile().lastModified())));
-            //osd.append(tr("\nImage exif time: {0}", Long.toString(entry.getExifTime().getTime())));
-            //if (entry.getGpsTime() != null) {
-            //    osd.append(tr("\nImage gps time: {0}", Long.toString(entry.getGpsTime().getTime())));
-            //}
+            DateFormat dtf = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+            if (entry.getExifTime() != null) {
+                osd.append(tr("\nEXIF time: {0}", dtf.format(entry.getExifTime())));
+            }
+            if (entry.getGpsTime() != null) {
+                osd.append(tr("\nGPS time: {0}", dtf.format(entry.getGpsTime())));
+            }
 
             imgDisplay.setOsdText(osd.toString());