Changeset 12672 in josm for trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.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/command/conflict/RelationMemberConflictResolverCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/conflict/RelationMemberConflictResolverCommand.java

@@ -11 +11 @@
 
 import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -81 +82 @@
 
         MainApplication.getLayerManager().setActiveLayer(layer);
-        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        DataSet editDs = MainApplication.getLayerManager().getEditDataSet();
 
         // restore the former state
@@ -89 +90 @@
         // restore a conflict if necessary
         //
-        if (!editLayer.getConflicts().hasConflictForMy(conflict.getMy())) {
-            editLayer.getConflicts().add(conflict);
+        if (!editDs.getConflicts().hasConflictForMy(conflict.getMy())) {
+            editDs.getConflicts().add(conflict);
         }
     }