Changeset 13612 in josm for trunk/src


Ignore:
Timestamp:
2018-04-11T09:34:06+02:00 (7 years ago)
Author:
Don-vip
Message:

use OsmDataLayer.getDataSet() in download tasks

Location:
trunk/src/org/openstreetmap/josm/actions/downloadtasks
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

    r13486 r13612  
    297297                    layer = getFirstModifiableDataLayer();
    298298                }
    299                 Collection<OsmPrimitive> primitivesToUpdate = searchPrimitivesToUpdate(bounds, layer.data);
     299                Collection<OsmPrimitive> primitivesToUpdate = searchPrimitivesToUpdate(bounds, layer.getDataSet());
    300300                layer.mergeFrom(dataSet);
    301301                MapFrame map = MainApplication.getMap();

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

    r13486 r13612  
    120120        }
    121121
    122         DataSetMerger visitor = new DataSetMerger(targetLayer.data, parents);
     122        DataSetMerger visitor = new DataSetMerger(targetLayer.getDataSet(), parents);
    123123        visitor.merge();
    124124        SwingUtilities.invokeLater(targetLayer::onPostDownloadFromServer);

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java

    r12636 r13612  
    290290            final OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
    291291            if (editLayer != null && osmData) {
    292                 final Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.data);
     292                final Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.getDataSet());
    293293                for (DownloadTask task : tasks) {
    294294                    if (task instanceof DownloadOsmTask) {
Note: See TracChangeset for help on using the changeset viewer.