Changeset 9440 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

Timestamp:

2016-01-14T16:42:50+01:00 (8 years ago)

Author:

simon04

Message:

see #12338 - Conflict resolution: add expert actions "Resolve to my/their versions" in popup menu

This resolves all selected conflicts to my/their versions.

File:

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

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -347 +347 @@
         relationMemberMerger.unlinkAsListener();
     }
+
+    public void decideRemaining(MergeDecisionType decision) {
+        propertiesMerger.decideRemaining(decision);
+        tagMerger.decideRemaining(decision);
+        if (my instanceof Way) {
+            nodeListMerger.decideRemaining(decision);
+        } else if (my instanceof Relation) {
+            relationMemberMerger.decideRemaining(decision);
+        }
+        updateResolvedCompletely();
+        if (!isResolvedCompletely()) {
+            throw new AssertionError();
+        }
+    }
 }