Changeset 2539 in josm

Timestamp:

Nov 28, 2009 10:15:54 PM (4 years ago)

Author:

bastiK

Message:

see #3520 - Do not remove selection when using undo (partial fix)

File:

• trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.LinkedList;
 import java.util.Stack;
@@ -9 +12 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -20 +24 @@
      */
     public final LinkedList<Command> commands = new LinkedList<Command>();
+    /**
+     * Selection to be restored on undo
+     */
+    public Collection<? extends OsmPrimitive> lastSelection = new ArrayList<OsmPrimitive>();
     /**
      * The stack for redoing commands
@@ -35 +43 @@
      */
     public void addNoRedraw(final Command c) {
+        lastSelection = Main.main.getCurrentDataSet().getSelected();
         c.executeCommand();
         commands.add(c);
@@ -73 +82 @@
         }
         fireCommandsChanged();
-        Main.main.getCurrentDataSet().setSelected();
+        List<OsmPrimitive> all = Main.main.getCurrentDataSet().allPrimitives();
+        for (OsmPrimitive op : lastSelection) {
+            if (all.contains(op)) {
+                Main.main.getCurrentDataSet().addSelected(op);
+            }
+        }
     }