Changeset 11240 in josm for trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

Timestamp:

2016-11-12T14:52:32+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10387 - refactor various actions and commands so they can be used without data layer

File:

• trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (3 diffs)

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

@@ -29 +29 @@
 import org.openstreetmap.josm.actions.SplitWayAction;
 import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -131 +132 @@
     public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) {
         super(layer);
+        CheckParameterUtil.ensureParameterNotNull(data, "data");
+        this.toDelete = data;
+        checkConsistency();
+    }
+
+    /**
+     * Constructor for a collection of data to be deleted in the context of
+     * a specific data set
+     *
+     * @param dataset the dataset context for deleting these primitives. Must not be null.
+     * @param data the primitives to delete. Must neither be null nor empty.
+     * @throws IllegalArgumentException if dataset is null
+     * @throws IllegalArgumentException if data is null or empty
+     * @since 11240
+     */
+    public DeleteCommand(DataSet dataset, Collection<? extends OsmPrimitive> data) {
+        super(dataset);
         CheckParameterUtil.ensureParameterNotNull(data, "data");
         this.toDelete = data;
@@ -448 +466 @@
         //
         if (!primitivesToDelete.isEmpty()) {
-            cmds.add(new DeleteCommand(layer, primitivesToDelete));
+            cmds.add(layer != null ? new DeleteCommand(layer, primitivesToDelete) :
+                new DeleteCommand(primitivesToDelete.iterator().next().getDataSet(), primitivesToDelete));
         }