Changeset 5360 in josm for trunk/src/org/openstreetmap/josm/data/osm
- Timestamp:
- 2012-07-25T00:33:41+02:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r5266 r5360 438 438 */ 439 439 public void fireSelectionChanged(){ 440 Collection<? extends OsmPrimitive> currentSelection = get Selected();440 Collection<? extends OsmPrimitive> currentSelection = getAllSelected(); 441 441 for (SelectionChangedListener l : selListeners) { 442 442 l.selectionChanged(currentSelection); … … 479 479 /** 480 480 * Replies an unmodifiable collection of primitives currently selected 481 * in this dataset . May be empty, but not null.481 * in this dataset, except deleted ones. May be empty, but not null. 482 482 * 483 483 * @return unmodifiable collection of primitives 484 484 */ 485 485 public Collection<OsmPrimitive> getSelected() { 486 return new SubclassFilteredCollection<OsmPrimitive, OsmPrimitive>(getAllSelected(), OsmPrimitive.nonDeletedPredicate); 487 } 488 489 /** 490 * Replies an unmodifiable collection of primitives currently selected 491 * in this dataset, including deleted ones. May be empty, but not null. 492 * 493 * @return unmodifiable collection of primitives 494 */ 495 public Collection<OsmPrimitive> getAllSelected() { 486 496 Collection<OsmPrimitive> currentList; 487 497 synchronized (selectionLock) { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
r5266 r5360 52 52 53 53 protected boolean isInSelectionBase(OsmPrimitive primitive) { 54 return selectionBase.get Selected().contains(primitive);54 return selectionBase.getAllSelected().contains(primitive); 55 55 } 56 56 … … 184 184 185 185 public DataSet build() { 186 for (OsmPrimitive primitive: selectionBase.get Selected()) {186 for (OsmPrimitive primitive: selectionBase.getAllSelected()) { 187 187 primitive.visit(this); 188 188 }
Note:
See TracChangeset
for help on using the changeset viewer.