Changeset 630 in josm for trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

Timestamp:

2008-05-11T01:59:46+02:00 (16 years ago)

Author:

framm

Message:

• make commands able to fail (patch by DH)
• add Command.getOrig() (patch by DH)
• add RemoveRelationMemberCommand (patch by DH)

File:

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

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

@@ -10 +10 @@
 import javax.swing.tree.MutableTreeNode;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
@@ -23 +24 @@
          */
         private Command[] sequence;
+        private boolean sequence_complete;
         private final String name;
+        public boolean continueOnError = false;
 
         /**
@@ -42 +45 @@
         }
         
-        @Override public void executeCommand() {
-                for (Command c : sequence)
-                        c.executeCommand();
+        public int executed_commands = 0;
+        @Override public boolean executeCommand() {
+                for (int i=0; i < sequence.length; i++) {
+                        Command c = sequence[i];
+                        boolean result = c.executeCommand();
+                        if (!result)
+                                Main.debug("SequenceCommand, executing command[" + i + "] " +  c + " result: " + result);
+                        if (!result && !continueOnError) {
+                                this.undoCommands(i-1);
+                                return false;
+                        }
+                }
+                sequence_complete = true;
+                return true;
+        }
+
+        private void undoCommands(int start) {
+                // We probably aborted this halfway though the
+                // execution sequence because of a sub-command
+                // error.  We already undid the sub-commands.
+                if (!sequence_complete)
+                        return;
+                for (int i = start; i >= 0; --i)
+                        sequence[i].undoCommand();
         }
 
         @Override public void undoCommand() {
-                for (int i = sequence.length-1; i >= 0; --i)
-                        sequence[i].undoCommand();
+                this.undoCommands(sequence.length-1);
         }