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

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -122 +122 @@
                 } else {
                     getAffectedDataSet().removePrimitive(osm);
-                    if (getLayer() != null) {
-                        Conflict<?> conflict = getLayer().getConflicts().getConflictForMy(osm);
-                        if (conflict != null) {
-                            purgedConflicts.add(conflict);
-                            getLayer().getConflicts().remove(conflict);
-                        }
+                    Conflict<?> conflict = getAffectedDataSet().getConflicts().getConflictForMy(osm);
+                    if (conflict != null) {
+                        purgedConflicts.add(conflict);
+                        getAffectedDataSet().getConflicts().remove(conflict);
                     }
                 }
@@ -157 +155 @@
 
         for (Conflict<?> conflict : purgedConflicts) {
-            getLayer().getConflicts().add(conflict);
+            getAffectedDataSet().getConflicts().add(conflict);
         }
     }