Changeset 2938 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2010-02-04T21:51:27+01:00 (14 years ago)

Author:

jttt

Message:

Addition to #4408 (don't require to merge coordinates after primitive was deleted)

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -653 +653 @@
 
     public void deletePrimitive(boolean deleted) {
-        // Do nothing
+        if (deleted) {
+            if (model.getMergedCoords() == null) {
+                model.decideCoordsConflict(MergeDecisionType.KEEP_MINE);
+            }
+        } else {
+            model.decideCoordsConflict(MergeDecisionType.UNDECIDED);
+        }
     }
 }