Changeset 362 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2007-10-11T21:35:15+02:00 (17 years ago)

Author:

framm

Message:

• alleviated #388 by parsing the timestamps only when they are needed.

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• OsmPrimitive.java (modified) (4 diffs)
• visitor/MergeVisitor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -12 +13 @@
 
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.tools.DateParser;
 
 
@@ -88 +90 @@
          * used to check against edit conflicts.
          */
-        public Date timestamp = null;
-
+        public String timestamp = null;
+        
+        /**
+         * The timestamp is only parsed when this is really necessary, and this 
+         * is the cache for the result.
+         */
+        public Date parsedTimestamp = null;
+        
         /**
          * If set to true, this object is incomplete, which means only the id
@@ -108 +116 @@
                 modified = true;
         }
+        
+        /**
+         * Returns the timestamp for this object, or the current time if none is set.
+         * Internally, parses the timestamp from XML into a Date object and caches it
+         * for possible repeated calls.
+         */
+        public Date getTimestamp() {
+                if (parsedTimestamp == null) {
+                        try {
+                                parsedTimestamp = DateParser.parse(timestamp);
+                        } catch (ParseException ex) {
+                                parsedTimestamp = new Date();
+                        }
+                }
+                return parsedTimestamp;
+        }
 
         /**

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -288 +288 @@
         private <P extends OsmPrimitive> boolean mergeAfterId(Map<P,P> merged, Collection<P> primitives, P other) {
                 for (P my : primitives) {
-                        Date d1 = my.timestamp == null ? new Date(0) : my.timestamp;
-                        Date d2 = other.timestamp == null ? new Date(0) : other.timestamp;
                         if (my.realEqual(other, false)) {
                                 if (merged != null)
@@ -299 +297 @@
                                 if (merged != null)
                                         merged.put(other, my);
-                                if (d1.before(d2)) {
+                                if (my.getTimestamp().before(other.getTimestamp())) {
                                         my.modified = other.modified;
                                         my.timestamp = other.timestamp;
@@ -311 +309 @@
                                                 merged.put(other, my);
                                 } else if (!my.modified && !other.modified) {
-                                        if (d1.before(d2)) {
+                                        if (my.getTimestamp().before(other.getTimestamp())) {
                                                 cloneFromExceptIncomplete(my, other);
                                                 if (merged != null)
@@ -317 +315 @@
                                         }
                                 } else if (other.modified) {
-                                        if (d1.after(d2)) {
+                                        if (my.getTimestamp().after(other.getTimestamp())) {
                                                 conflicts.put(my, other);
                                                 if (merged != null)
@@ -327 +325 @@
                                         }
                                 } else if (my.modified) {
-                                        if (d2.after(d1)) {
+                                        if (my.getTimestamp().before(other.getTimestamp())) {
                                                 conflicts.put(my, other);
                                                 if (merged != null)