Changeset 9383 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-01-10T13:04:06+01:00 (8 years ago)

Author:

simon04

Message:

Deprecate PrimaryDateParser in favour of DateUtils

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ExifReader.java (modified) (3 diffs)
• date/DateUtils.java (modified) (4 diffs)
• date/PrimaryDateParser.java (modified) (1 diff)

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

@@ -5 +5 @@
 import java.io.File;
 import java.io.IOException;
-import java.text.ParseException;
 import java.util.Date;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.tools.date.PrimaryDateParser;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 import com.drew.imaging.jpeg.JpegMetadataReader;
@@ -38 +37 @@
      * @param filename The JPEG file to read
      * @return The date/time read in the EXIF section, or {@code null} if not found
-     * @throws ParseException if {@link PrimaryDateParser#parse} fails to parse date/time
-     */
-    public static Date readTime(File filename) throws ParseException {
+     */
+    public static Date readTime(File filename) {
         try {
             Metadata metadata = JpegMetadataReader.readMetadata(filename);
@@ -60 +58 @@
             if (dateStr != null) {
                 dateStr = dateStr.replace('/', ':'); // workaround for HTC Sensation bug, see #7228
-                return new PrimaryDateParser().parse(dateStr);
-            }
-        } catch (ParseException e) {
-            throw e;
+                return DateUtils.fromString(dateStr);
+            }
         } catch (Exception e) {
             Main.error(e);

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -45 +45 @@
      * with the timezone lookup, is very expensive.
      */
-    private static GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+    private static final GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+    private static final GregorianCalendar calendarLocale = new GregorianCalendar(TimeZone.getDefault());
     private static final DatatypeFactory XML_DATE;
 
     static {
         calendar.setTimeInMillis(0);
+        calendarLocale.setTimeInMillis(0);
 
         DatatypeFactory fact = null;
@@ -78 +80 @@
         if (checkLayout(str, "xxxx-xx-xxTxx:xx:xxZ") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx") ||
+                checkLayout(str, "xxxx:xx:xx xx:xx:xx") ||
                 checkLayout(str, "xxxx-xx-xx xx:xx:xx UTC") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx+xx:00") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx-xx:00")) {
-            calendar.set(
+            final Calendar c = checkLayout(str, "xxxx:xx:xx xx:xx:xx") ? calendarLocale : calendar; // consider EXIF date in default timezone
+            c.set(
                 parsePart4(str, 0),
                 parsePart2(str, 5)-1,
@@ -92 +96 @@
                 int plusHr = parsePart2(str, 20);
                 int mul = str.charAt(19) == '+' ? -3600000 : 3600000;
-                return calendar.getTimeInMillis()+plusHr*mul;
+                return c.getTimeInMillis()+plusHr*mul;
             }
 
-            return calendar.getTimeInMillis();
+            return c.getTimeInMillis();
         } else if (checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxxZ") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx") ||
+                checkLayout(str, "xxxx:xx:xx xx:xx:xx.xxx") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx+xx:00") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxx-xx:00")) {
-            calendar.set(
+            final Calendar c = checkLayout(str, "xxxx:xx:xx xx:xx:xx.xxx") ? calendarLocale : calendar; // consider EXIF date in default timezone
+            c.set(
                 parsePart4(str, 0),
                 parsePart2(str, 5)-1,
@@ -112 +118 @@
             }
 
-            return calendar.getTimeInMillis() + millis;
+            return c.getTimeInMillis() + millis;
         } else {
             // example date format "18-AUG-08 13:33:03"

trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java

@@ -17 +17 @@
  *
  * @author Brett Henderson
+ * @deprecated Use {@link DateUtils} instead!
  */
+@Deprecated
 public class PrimaryDateParser {
     private DatatypeFactory datatypeFactory;