Changeset 107 in josm for src/org/openstreetmap/josm/tools

Timestamp:

2006-07-08T00:25:28+02:00 (18 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/tools

Files:

• DateParser.java (modified) (1 diff)
• ExifReader.java (modified) (3 diffs)

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();