Ticket #4675: undoconflict.diff

src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -18 +21 @@
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -47 +51 @@
      */
     private Set<OsmPrimitive> purgedPrimitives;
 
-    private Set<OsmPrimitive> origVersionsOfTouchedPrimitives;
+    private Map<OsmPrimitive,PrimitiveData> origVersionsOfTouchedPrimitives;
 
     protected void init(Collection<OsmPrimitive> toPurge) {
         this.toPurge = toPurge;
         this.purgedPrimitives = new HashSet<OsmPrimitive>();
-        this.origVersionsOfTouchedPrimitives = new HashSet<OsmPrimitive>();
+        this.origVersionsOfTouchedPrimitives = new HashMap<OsmPrimitive,PrimitiveData>();
     }
 
     /**
@@ -148 +151 @@
                 return;
             if (parent instanceof Way) {
                 Way w = (Way)parent;
-                if (!origVersionsOfTouchedPrimitives.contains(w)) {
-                    origVersionsOfTouchedPrimitives.add(w);
+                if (!origVersionsOfTouchedPrimitives.containsKey(w)) {
+                    origVersionsOfTouchedPrimitives.put(w,w.save());
                 }
                 w.removeNode((Node)child);
                 // if a way ends up with less than two nodes we
@@ -162 +165 @@
                 }
             } else if (parent instanceof Relation) {
                 Relation r = (Relation)parent;
-                if (!origVersionsOfTouchedPrimitives.contains(r)) {
-                    origVersionsOfTouchedPrimitives.add(r);
+                if (!origVersionsOfTouchedPrimitives.containsKey(r)) {
+                    origVersionsOfTouchedPrimitives.put(r,r.save());
                 }
                 System.out.println(tr("Removing reference from relation {0}",r.getId()));
                 r.removeMembersFor(child);
@@ -199 +202 @@
     @Override
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        modified.addAll(origVersionsOfTouchedPrimitives);
     }
 
     @Override
@@ -218 +220 @@
         for (OsmPrimitive purged : purgedPrimitives) {
             getLayer().data.addPrimitive(purged);
         }
+
+        for (Entry<OsmPrimitive, PrimitiveData> entry: origVersionsOfTouchedPrimitives.entrySet()) {
+            entry.getKey().load(entry.getValue());
+        }
+
         reconstituteConflicts();
 
         // will restore the primitives referring to one