Changeset 107 in josm for src/org

Timestamp:

2006-07-08T00:25:28+02:00 (19 years ago)

Author:

imi

Message:

• fixed NPE when using sync-images without EXIF date information
• added the strange date format "yyyy:mm:dd HH:MM:SS"

Location:

src/org/openstreetmap/josm

Files:

• gui/layer/GeoImageLayer.java (modified) (2 diffs)
• tools/DateParser.java (modified) (1 diff)
• tools/ExifReader.java (modified) (3 diffs)

src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -124 +124 @@
 
                                 ImageEntry e = new ImageEntry();
-                                e.time = ExifReader.readTime(f);
+                                try {
+                        e.time = ExifReader.readTime(f);
+                } catch (ParseException e1) {
+                        continue;
+                }
                                 if (e.time == null)
                                         continue;
@@ -364 +368 @@
 
         private void sync(File f) {
-                Date exifDate = ExifReader.readTime(f);
+                Date exifDate;
+        try {
+                exifDate = ExifReader.readTime(f);
+        } catch (ParseException e) {
+                JOptionPane.showMessageDialog(Main.parent, tr("The date in file \"{0}\" could not be parsed.", f.getName()));
+                return;
+        }
+                if (exifDate == null) {
+                        JOptionPane.showMessageDialog(Main.parent, tr("There is no EXIF time within the file \"{0}\".", f.getName()));
+                        return;
+                }
                 JPanel p = new JPanel(new GridBagLayout());
                 p.add(new JLabel(tr("Image")), GBC.eol());

src/org/openstreetmap/josm/tools/DateParser.java

@@ -26 +26 @@
                 "MM/dd/yyyy'T'HH:mm:ssZ",
                 "MM/dd/yyyy'T'HH:mm:ss",
+                "yyyy:MM:dd HH:mm:ss", // unfcklvble, but I have seen this...
         };
         

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

@@ -2 +2 @@
 
 import java.io.File;
+import java.text.ParseException;
 import java.util.Date;
 import java.util.Iterator;
@@ -16 +17 @@
 public class ExifReader {
 
-        @SuppressWarnings("unchecked") public static Date readTime(File filename) {
+        @SuppressWarnings("unchecked") public static Date readTime(File filename) throws ParseException {
                 try {
                 Metadata metadata = JpegMetadataReader.readMetadata(filename);
@@ -26 +27 @@
                     }
                 }
+                } catch (ParseException e) {
+                        throw e;
         } catch (Exception e) {
                 e.printStackTrace();