Changeset 13016 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2017-10-17T21:49:06+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
r12828 r13016 109 109 */ 110 110 public Multipolygon(Way way) { 111 outerWay = way;111 outerWay = Objects.requireNonNull(way, "way"); 112 112 innerWays = new ArrayList<>(); 113 113 } … … 536 536 537 537 try { 538 // see #11026 - Because <ways> is a dynamic filtered (on ways) of a filtered (on selected objects) collection,539 // retrieve effective dataset before joining the ways (which affects the selection, thus, the <ways> collection)540 // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance541 ds = ways.iterator().next().getDataSet();542 543 538 // Do the job of joining areas 544 539 JoinAreasResult result = joinAreas(areas); … … 601 596 */ 602 597 public JoinAreasResult joinAreas(List<Multipolygon> areas) throws UserCancelException { 598 599 // see #11026 - Because <ways> is a dynamic filtered (on ways) of a filtered (on selected objects) collection, 600 // retrieve effective dataset before joining the ways (which affects the selection, thus, the <ways> collection) 601 // Dataset retrieving allows to call this code without relying on Main.getCurrentDataSet(), thus, on a mapview instance 602 if (!areas.isEmpty()) { 603 ds = areas.iterator().next().getOuterWay().getDataSet(); 604 } 603 605 604 606 boolean hasChanges = false;
Note:
See TracChangeset
for help on using the changeset viewer.