Changeset 496 in josm for trunk/src

Timestamp:

2007-12-18T01:04:35+01:00 (17 years ago)

Author:

gebner

Message:

MergeVisitor: Only parse dates if needed. Reported by Petr Nejedly.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (3 diffs)

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

@@ -230 +230 @@
 
                 for (P my : primitives) {
-                        Date myd = my.timestamp == null ? new Date(0) : my.getTimestamp();
-                        Date otherd = other.timestamp == null ? new Date(0) : other.getTimestamp();
                         if (my.realEqual(other, false)) {
                                 merged.put(other, my);
@@ -237 +235 @@
                         }
                         if (my.realEqual(other, true)) {
+                                Date myd = my.timestamp == null ? new Date(0) : my.getTimestamp();
+                                Date otherd = other.timestamp == null ? new Date(0) : other.getTimestamp();
+
                                 // they differ in modified/timestamp combination only. Auto-resolve it.
                                 merged.put(other, my);
@@ -246 +247 @@
                         }
                         if (my.id == other.id && my.id != 0) {
+                                Date myd = my.timestamp == null ? new Date(0) : my.getTimestamp();
+                                Date otherd = other.timestamp == null ? new Date(0) : other.getTimestamp();
+
                                 if (my.incomplete || other.incomplete) {
                                         if (my.incomplete) {