Changeset 6886 in josm for trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

Timestamp:

2014-02-26T23:33:44+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #6373 - proper conflict resolution after failed attempt to delete an object referenced by an unknown one

File:

• trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) (6 diffs)

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

@@ -5 +5 @@
 
 import java.util.Collection;
+import java.util.Set;
 
 import javax.swing.Icon;
@@ -11 +12 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
  * Represents the resolution of a conflict between the deleted flag of two {@link OsmPrimitive}s.
- *
+ * @since 1654
  */
 public class DeletedStateConflictResolveCommand extends ConflictResolveCommand {
@@ -27 +27 @@
 
     /**
-     * constructor
+     * Constructs a new {@code DeletedStateConflictResolveCommand}.
      *
      * @param conflict the conflict data set
@@ -49 +49 @@
     @Override
     public boolean executeCommand() {
-        // remember the current state of modified primitives, i.e. of
-        // OSM primitive 'my'
-        //
+        // remember the current state of modified primitives, i.e. of OSM primitive 'my'
         super.executeCommand();
-
-        OsmDataLayer layer = getLayer();
 
         if (decision.equals(MergeDecisionType.KEEP_MINE)) {
@@ -60 +56 @@
                 // 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);
+                deleteMy();
             }
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
             if (conflict.getTheir().isDeleted()) {
-                layer.data.unlinkReferencesToPrimitive(conflict.getMy());
-                conflict.getMy().setDeleted(true);
+                deleteMy();
             } else {
                 conflict.getMy().setDeleted(false);
@@ -78 +71 @@
         return true;
     }
+    
+    private void deleteMy() {
+        Set<OsmPrimitive> referrers = getLayer().data.unlinkReferencesToPrimitive(conflict.getMy());
+        for (OsmPrimitive p : referrers) {
+            if (!p.isNew() && !p.isDeleted()) {
+                p.setModified(true);
+            }
+        }
+        conflict.getMy().setDeleted(true);
+    }
 
     @Override