Changeset 1499 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

Timestamp:

2009-03-18T16:13:41+01:00 (15 years ago)

Author:

stoecker

Message:

close #2302 - patch by jttt - optimizations and encapsulation

File:

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

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

@@ -235 +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();
+                Date myd = my.getTimestamp();
+                Date otherd = other.getTimestamp();
 
                 // they differ in modified/timestamp combination only. Auto-resolve it.
@@ -242 +242 @@
                 if (myd.before(otherd)) {
                     my.modified = other.modified;
-                    my.timestamp = other.timestamp;
+                    my.setTimestamp(other.getTimestamp());
                 }
                 return true; // merge done.
             }
             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();
+                Date myd = my.getTimestamp();
+                Date otherd = other.getTimestamp();
 
                 if (my.incomplete || other.incomplete) {