Changeset 2552 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-11-30T00:02:22+01:00 (14 years ago)

Author:

bastiK

Message:

cleanup for r2539 and r2541. See #3520

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;
@@ -67 +66 @@
      */
     public void undo() {
-        Collection<? extends OsmPrimitive> lastSelection = Main.main.getCurrentDataSet().getSelected();
         if (commands.isEmpty())
             return;
+        Collection<? extends OsmPrimitive> oldSelection = Main.main.getCurrentDataSet().getSelected();
         final Command c = commands.removeLast();
         c.undoCommand();
@@ -78 +77 @@
         }
         fireCommandsChanged();
-        List<OsmPrimitive> all = Main.main.getCurrentDataSet().allPrimitives();
-        for (OsmPrimitive op : lastSelection) {
-            if (all.contains(op)) {
-                Main.main.getCurrentDataSet().addSelected(op);
-            }
+        Collection<? extends OsmPrimitive> newSelection = Main.main.getCurrentDataSet().getSelected();
+        if (!oldSelection.equals(newSelection)) {
+            Main.main.getCurrentDataSet().fireSelectionChanged();
         }
     }
@@ -93 +90 @@
         if (redoCommands.isEmpty())
             return;
+        Collection<? extends OsmPrimitive> oldSelection = Main.main.getCurrentDataSet().getSelected();
         final Command c = redoCommands.pop();
         c.executeCommand();
@@ -101 +99 @@
         }
         fireCommandsChanged();
+        Collection<? extends OsmPrimitive> newSelection = Main.main.getCurrentDataSet().getSelected();
+        if (!oldSelection.equals(newSelection)) {
+            Main.main.getCurrentDataSet().fireSelectionChanged();
+        }
     }