Changeset 1567 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2009-05-02T20:09:40+02:00 (16 years ago)

Author:

framm

Message:

• fixed some more conflict resolution bugs, especially relating to keeping your local modification. patches by Karl Guggisberg <kguggisberg@…> with some modifications. Fixes #2510, #2507.

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);
+        int newversion = Math.max(target.version, other.version);
+        // set version on "other" as well in case user decides to keep local
+        target.version = newversion;
+        other.version = newversion;
+
     }
 }

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);
+            int newversion = Math.max(target.version, other.version);
+            // set version on "other" as well in case user decides to keep local
+            target.version = newversion;
+            other.version = newversion;
         }
     }

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);
+        int newversion = Math.max(target.version, other.version);
+        // set version on "other" as well in case user decides to keep local
+        target.version = newversion;
+        other.version = newversion;
     }
 }