Changeset 13654 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

Timestamp:

2018-04-21T02:42:26+02:00 (6 years ago)

Author:

Don-vip

Message:

More uses of OsmDataLayer.getDataSet()

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

@@ -161 +161 @@
             referrers = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
             if (referrers != null) {
-                final DataSetMerger visitor = new DataSetMerger(getLayer().data, referrers);
+                final DataSetMerger visitor = new DataSetMerger(getLayer().getDataSet(), referrers);
                 visitor.merge();
 
                 // copy the merged layer's data source info
-                getLayer().data.addDataSources(referrers.getDataSources());
+                getLayer().getDataSet().addDataSources(referrers.getDataSources());
                 // FIXME: this is necessary because there are dialogs listening
                 // for DataChangeEvents which manipulate Swing components on this thread.