Changeset 5993 in josm for trunk

Timestamp:

2013-06-06T20:53:11+02:00 (11 years ago)

Author:

Don-vip

Message:

see #6529, comment 12: purge conflicts when purging primitives (with undo support to restore them if needed)

File:

• trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (modified) (5 diffs)

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

@@ -15 +15 @@
 import javax.swing.Icon;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -37 +39 @@
 
     protected Map<PrimitiveId, PrimitiveData> makeIncompleteData_byPrimId;
+    
+    protected final ConflictCollection purgedConflicts = new ConflictCollection();
 
     final protected DataSet ds;
@@ -76 +80 @@
         ds.beginUpdate();
         try {
+            purgedConflicts.get().clear();
             /**
              * Loop from back to front to keep referential integrity.
@@ -97 +102 @@
                 } else {
                     ds.removePrimitive(osm);
+                    Conflict<?> conflict = getLayer().getConflicts().getConflictForMy(osm);
+                    if (conflict != null) {
+                        purgedConflicts.add(conflict);
+                        getLayer().getConflicts().remove(conflict);
+                    }
                 }
             }
@@ -121 +131 @@
                 ds.addPrimitive(osm);
             }
+        }
+        
+        for (Conflict<?> conflict : purgedConflicts) {
+            getLayer().getConflicts().add(conflict);
         }
     }