Changeset 12348 in josm for trunk/src/org

Timestamp:

2017-06-08T23:41:02+02:00 (7 years ago)

Author:

michael2402

Message:

See #13036: Add more consistency checks to move / delete command.

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• Command.java (modified) (1 diff)
• DeleteCommand.java (modified) (2 diffs)
• MoveCommand.java (modified) (2 diffs)

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

@@ -338 +338 @@
     }
 
+    /**
+     * Ensures that all primitives that are participating in this command belong to the affected data set.
+     *
+     * Commands may use this in their update methods to check the consitency of the primitives they operate on.
+     * @throws AssertionError if no {@link DataSet} is set or if any primitive does not belong to that dataset.
+     */
+    protected void ensurePrimitivesAreInDataset() {
+        for (OsmPrimitive primitive : this.getParticipatingPrimitives()) {
+            if (primitive.getDataSet() != this.getAffectedDataSet()) {
+                throw new AssertionError("Primitive is of wrong data set for this command: " + primitive);
+            }
+        }
+    }
+
     @Override
     public int hashCode() {

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

@@ -168 +168 @@
     @Override
     public boolean executeCommand() {
+        ensurePrimitivesAreInDataset();
         // Make copy and remove all references (to prevent inconsistent dataset (delete referenced) while command is executed)
         for (OsmPrimitive osm: toDelete) {
@@ -190 +191 @@
     @Override
     public void undoCommand() {
+        ensurePrimitivesAreInDataset();
+
         for (OsmPrimitive osm: toDelete) {
             osm.setDeleted(false);

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

@@ -207 +207 @@
     @Override
     public boolean executeCommand() {
+        ensurePrimitivesAreInDataset();
+
         for (Node n : nodes) {
             // in case #3892 happens again
@@ -222 +224 @@
     @Override
     public void undoCommand() {
+        ensurePrimitivesAreInDataset();
+
         Iterator<OldNodeState> it = oldState.iterator();
         for (Node n : nodes) {