- Timestamp:
- 2017-06-08T23:50:37+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/SelectCommand.java
r10663 r12349 9 9 import java.util.Objects; 10 10 11 import org.openstreetmap.josm. Main;11 import org.openstreetmap.josm.data.osm.DataSet; 12 12 import org.openstreetmap.josm.data.osm.OsmPrimitive; 13 13 … … 37 37 } 38 38 39 /** 40 * Constructs a new select command. 41 * @param dataset The dataset the selection belongs to 42 * @param newSelection the primitives to select when executing the command. 43 * @since 12349 44 */ 45 public SelectCommand(DataSet dataset, Collection<OsmPrimitive> newSelection) { 46 super(dataset); 47 if (newSelection == null || newSelection.isEmpty()) { 48 this.newSelection = Collections.emptySet(); 49 } else { 50 this.newSelection = new HashSet<>(newSelection); 51 } 52 } 53 39 54 @Override 40 55 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) { … … 44 59 @Override 45 60 public void undoCommand() { 46 Main.getLayerManager().getEditLayer().data.setSelected(oldSelection);61 getAffectedDataSet().setSelected(oldSelection); 47 62 } 48 63 49 64 @Override 50 65 public boolean executeCommand() { 51 oldSelection = Main.getLayerManager().getEditLayer().data.getSelected();52 Main.getLayerManager().getEditLayer().data.setSelected(newSelection);66 oldSelection = getAffectedDataSet().getSelected(); 67 getAffectedDataSet().setSelected(newSelection); 53 68 return true; 54 69 }
Note:
See TracChangeset
for help on using the changeset viewer.