Ticket #6250: undoSelection_v4.patch

org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -199 +199 @@
         SelectionEventManager.getInstance().addSelectionListener(model, FireMode.IN_EDT_CONSOLIDATED);
         DatasetEventManager.getInstance().addDatasetListener(model, FireMode.IN_EDT);
         MapView.addEditLayerChangeListener(actSearch);
+        // editLayerChanged also gets the selection history of the level
+        model.editLayerChanged(null, Main.map.mapView.getEditLayer());
         if (Main.map.mapView.getEditLayer() != null) {
             model.setJOSMSelection(Main.map.mapView.getEditLayer().data.getSelected());
         }
@@ -221 +223 @@
         return arrowButton;
     }
 
-    public void clearSelectionHistory() {
-        model.clearSelectionHistory();
-    }
 
     /**
      * Responds to double clicks on the list of selected objects
@@ -481 +480 @@
 
         private static final int SELECTION_HISTORY_SIZE = 10;
 
-        private final LinkedList<Collection<? extends OsmPrimitive>> history = new LinkedList<Collection<? extends OsmPrimitive>>();
+        // Variable to store history from currentDataSet()
+        private LinkedList<Collection<? extends OsmPrimitive>> history;
         private final List<OsmPrimitive> selection = new ArrayList<OsmPrimitive>();
         private DefaultListSelectionModel selectionModel;
 
@@ -521 +521 @@
         public void remember(Collection<? extends OsmPrimitive> selection) {
             if (selection == null)return;
             if (selection.isEmpty())return;
+            if (history == null) return;
             if (history.isEmpty()) {
                 history.add(selection);
                 return;
@@ -548 +549 @@
             return history;
         }
 
-        public void clearSelectionHistory() {
-            history.clear();
-        }
-
         public Object getElementAt(int index) {
             return selection.get(index);
         }
@@ -689 +686 @@
         public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
             if (newLayer == null) {
                 setJOSMSelection(null);
+                history = null;
             } else {
+                history = newLayer.data.getSelectionHistory();
                 setJOSMSelection(newLayer.data.getSelected());
             }
         }

org/openstreetmap/josm/data/osm/DataSet.java

@@ -133 +133 @@
     }
 
     /**
+     * History of selections - shared by plugins and SelectionListDialog
+     */
+    private final LinkedList<Collection<? extends OsmPrimitive>> selectionHistory = new LinkedList<Collection<? extends OsmPrimitive>>();
+
+    /**
+     * Replies the history of JOSM selections
+     *
+     * @return
+     */
+    public LinkedList<Collection<? extends OsmPrimitive>> getSelectionHistory() {
+        return selectionHistory;
+    } 
+
+    /**
+     * Clears selection history list
+     */
+    public void clearSelectionHistory() {
+            selectionHistory.clear();
+        }
+
+    /**
      * Maintain a list of used tags for autocompletion
      */
     private AutoCompletionManager autocomplete;

org/openstreetmap/josm/actions/PurgeAction.java

@@ -207 +207 @@
 
         if (cbClearUndoRedo.isSelected()) {
             Main.main.undoRedo.clean();
-            Main.map.selectionListDialog.clearSelectionHistory();
+            getCurrentDataSet().clearSelectionHistory();
         }
     }