Changeset 12672 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java

Timestamp:

2017-08-27T17:07:54+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - move ConflictCollection from OsmDataLayer to DataSet. Simplifies some code where a data set is enough, and a layer is not needed

File:

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

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

@@ -136 +136 @@
                 return;
             }
-            DataSetMerger visitor = new DataSetMerger(MainApplication.getLayerManager().getEditLayer().data, ds);
+            DataSet editData = MainApplication.getLayerManager().getEditDataSet();
+            DataSetMerger visitor = new DataSetMerger(editData, ds);
             visitor.merge();
             if (!visitor.getConflicts().isEmpty()) {
-                MainApplication.getLayerManager().getEditLayer().getConflicts().add(visitor.getConflicts());
+                editData.getConflicts().add(visitor.getConflicts());
             }
             final RelationTreeModel model = (RelationTreeModel) getModel();