Ticket #6250: undoSelection_v3.2.patch
File undoSelection_v3.2.patch, 3.1 KB (added by , 13 years ago) |
---|
-
org/openstreetmap/josm/actions/PurgeAction.java
207 207 208 208 if (cbClearUndoRedo.isSelected()) { 209 209 Main.main.undoRedo.clean(); 210 Main.map.selectionListDialog.clearSelectionHistory();210 getCurrentDataSet().clearSelectionHistory(); 211 211 } 212 212 } 213 213 -
org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
221 221 return arrowButton; 222 222 } 223 223 224 public void clearSelectionHistory() {225 model.clearSelectionHistory();226 }227 224 228 225 /** 229 226 * Responds to double clicks on the list of selected objects … … 481 478 482 479 private static final int SELECTION_HISTORY_SIZE = 10; 483 480 484 private final LinkedList<Collection<? extends OsmPrimitive>> history = new LinkedList<Collection<? extends OsmPrimitive>>(); 481 // Variable to store history from currentDataSet() 482 private LinkedList<Collection<? extends OsmPrimitive>> history; 485 483 private final List<OsmPrimitive> selection = new ArrayList<OsmPrimitive>(); 486 484 private DefaultListSelectionModel selectionModel; 487 485 … … 548 546 return history; 549 547 } 550 548 551 public void clearSelectionHistory() {552 history.clear();553 }554 555 549 public Object getElementAt(int index) { 556 550 return selection.get(index); 557 551 } … … 689 683 public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) { 690 684 if (newLayer == null) { 691 685 setJOSMSelection(null); 686 history = null; 692 687 } else { 688 history = newLayer.data.getSelectionHistory(); 693 689 setJOSMSelection(newLayer.data.getSelected()); 694 690 } 695 691 } -
org/openstreetmap/josm/data/osm/DataSet.java
133 133 } 134 134 135 135 /** 136 * History of selections - shared by plugins and SelectionListDialog 137 */ 138 private final LinkedList<Collection<? extends OsmPrimitive>> selectionHistory = new LinkedList<Collection<? extends OsmPrimitive>>(); 139 140 /** 141 * Replies the history of JOSM selections 142 * 143 * @return 144 */ 145 public LinkedList<Collection<? extends OsmPrimitive>> getSelectionHistory() { 146 return selectionHistory; 147 } 148 149 /** 150 * Clears selection history list 151 */ 152 public void clearSelectionHistory() { 153 selectionHistory.clear(); 154 } 155 156 /** 136 157 * Maintain a list of used tags for autocompletion 137 158 */ 138 159 private AutoCompletionManager autocomplete;