Changeset 1561 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-04-28T00:49:48+02:00 (16 years ago)

Author:

framm

Message:

• properly update version numbers on conflict resolution. fixes #2468.

Location:

trunk/src/org/openstreetmap/josm/data/conflict

Files:

• DeleteConflict.java (modified) (1 diff)
• PositionConflict.java (modified) (1 diff)
• PropertyConflict.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java

@@ -22 +22 @@
     @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
         target.deleted = other.deleted;
+        target.version = Math.max(target.version, other.version);
     }
 }

trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java

@@ -25 +25 @@
             ((Node)target).coor = ((Node)other).coor;
             ((Node)target).eastNorth = ((Node)other).eastNorth;
+            target.version = Math.max(target.version, other.version);
         }
     }

trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java

@@ -28 +28 @@
     @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
         target.put(key, other.get(key));
+        target.version = Math.max(target.version, other.version);
     }
 }