Changeset 3034 in josm for trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.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/DeletedStateConflictResolveCommand.java (modified) (4 diffs)

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

@@ -23 +23 @@
 
     /** the conflict to resolve */
-    private Conflict<OsmPrimitive> conflict;
+    private Conflict<? extends OsmPrimitive> conflict;
 
     /** the merge decision */
@@ -35 +35 @@
      * @param decision the merge decision
      */
-    public DeletedStateConflictResolveCommand(OsmPrimitive my, OsmPrimitive their, MergeDecisionType decision) {
-        this.conflict = new Conflict<OsmPrimitive>(my, their);
+    public DeletedStateConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, MergeDecisionType decision) {
+        this.conflict = conflict;
         this.decision = decision;
     }
@@ -61 +61 @@
 
         if (decision.equals(MergeDecisionType.KEEP_MINE)) {
-            if (conflict.getMy().isDeleted()) {
+            if (conflict.getMy().isDeleted() || conflict.isMyDeleted()) {
                 // because my was involved in a conflict it my still be referred
                 // to from a way or a relation. Fix this now.
                 //
                 layer.data.unlinkReferencesToPrimitive(conflict.getMy());
+                conflict.getMy().setDeleted(true);
             }
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
@@ -86 +87 @@
             Collection<OsmPrimitive> added) {
         modified.add(conflict.getMy());
+        modified.addAll(conflict.getMy().getReferrers());
     }
 }