Changeset 11553 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks
- Timestamp:
- 2017-02-12T16:32:18+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
r10436 r11553 8 8 import java.util.ArrayList; 9 9 import java.util.Collection; 10 import java.util.Optional; 10 11 import java.util.concurrent.Future; 11 12 import java.util.regex.Matcher; … … 270 271 OsmDataLayer layer = addNewLayerIfRequired(newLayerName); 271 272 if (layer == null) { 272 layer = getEditLayer(); 273 if (layer == null) { 274 layer = getFirstDataLayer(); 275 } 273 layer = Optional.ofNullable(getEditLayer()).orElseGet(this::getFirstDataLayer); 276 274 layer.mergeFrom(dataSet); 277 275 if (zoomAfterDownload) {
Note:
See TracChangeset
for help on using the changeset viewer.