Changeset 1724 in josm for trunk/src/org/openstreetmap/josm/tools/DateUtils.java

Timestamp:

2009-07-03T22:19:22+02:00 (15 years ago)

Author:

stoecker

Message:

some more changes and bug fixes related to new projection stuff - GPX should now work also

File:

• trunk/src/org/openstreetmap/josm/tools/DateUtils.java (modified) (4 diffs)

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

@@ -19 +19 @@
 package org.openstreetmap.josm.tools;
 
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -61 +63 @@
         // "2007-07-25T09:26:24{Z|{+|-}01:00}"
         if (checkLayout(str, "xxxx-xx-xxTxx:xx:xxZ") ||
+                checkLayout(str, "xxxx-xx-xxTxx:xx:xx") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx+xx:00") ||
                 checkLayout(str, "xxxx-xx-xxTxx:xx:xx-xx:00")) {
@@ -78 +81 @@
 
             return calendar.getTime();
+        }
+        else if(checkLayout(str, "xxxx-xx-xxTxx:xx:xx.xxxZ") ||
+                checkLayout(str, "xxxx-xx-xxTxx: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(
+                parsePart(str, 0, 4),
+                parsePart(str, 5, 2)-1,
+                parsePart(str, 8, 2),
+                parsePart(str, 11, 2),
+                parsePart(str, 14,2),
+                parsePart(str, 17, 2));
+            long millis = parsePart(str, 20, 3);
+            if (str.length() == 29)
+                millis += parsePart(str, 24, 2) * (str.charAt(23) == '+' ? -3600000 : 3600000);
+            calendar.setTimeInMillis(calendar.getTimeInMillis()+millis);
+
+            return calendar.getTime();
+        }
+        else
+        {
+            // example date format "18-AUG-08 13:33:03"
+            SimpleDateFormat f = new SimpleDateFormat("dd-MMM-yy HH:mm:ss");
+            Date d = f.parse(str, new ParsePosition(0));
+            if(d != null)
+                return d;
         }
 
@@ -97 +126 @@
         if (text.length() != pattern.length()) return false;
         for (int i=0; i<pattern.length(); i++) {
-            if (pattern.charAt(i) == 'x') continue;
-            if (pattern.charAt(i) != text.charAt(i)) return false;
+            char pc = pattern.charAt(i);
+            char tc = text.charAt(i);
+            if(pc == 'x' && tc >= '0' && tc <= '9') continue;
+            else if(pc == 'x' || pc != tc) return false;
         }
         return true;