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

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

@@ -55 +55 @@
             conflict.getMy().setModified(conflict.getTheir().isModified());
         }
-        getLayer().getConflicts().remove(conflict);
+        getAffectedDataSet().getConflicts().remove(conflict);
         rememberConflict(conflict);
         return true;