Changeset 3034 in josm for trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

Timestamp:

2010-02-23T08:58:12+01:00 (16 years ago)

Author:

jttt

Message:

Fix #4467 Don't silently drop locally deleted member primitives from downloaded ways and relation (fix the issue when deleted primitive is referenced)

File:

• trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

@@ -23 +23 @@
 
     /** the conflict to resolve */
-    private Conflict<Node> conflict;
+    private Conflict<? extends OsmPrimitive> conflict;
 
     /** the merge decision */
@@ -35 +35 @@
      * @param decision the merge decision
      */
-    public CoordinateConflictResolveCommand(Node my, Node their, MergeDecisionType decision) {
-        this.conflict = new Conflict<Node>(my,their);
+    public CoordinateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, MergeDecisionType decision) {
+        this.conflict = conflict;
         this.decision = decision;
     }
@@ -61 +61 @@
             // do nothing
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
-            Node my = conflict.getMy();
-            Node their = conflict.getTheir();
+            Node my = (Node)conflict.getMy();
+            Node their = (Node)conflict.getTheir();
             my.setCoor(their.getCoor());
         } else