Changeset 16681 in josm for trunk

Timestamp:

2020-06-19T20:36:25+02:00 (5 years ago)

Author:

simon04

Message:

fix #19407 - SequenceCommand: catch throwable in sequence command and add more data (patch by taylor.smock, modified)

File:

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

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

@@ -8 +8 @@
 import java.util.HashSet;
 import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.swing.Icon;
@@ -15 +17 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.ReportedException;
 
 /**
@@ -105 +108 @@
     @Override public boolean executeCommand() {
         for (int i = 0; i < sequence.length; i++) {
-            boolean result = sequence[i].executeCommand();
+            boolean result;
+            try {
+                result = sequence[i].executeCommand();
+            } catch (AssertionError | Exception e) {
+                throw createReportedException(e, i);
+            }
             if (!result && !continueOnError) {
                 undoCommands(i-1);
@@ -127 +135 @@
     protected final void undoCommands(int start) {
         for (int i = start; i >= 0; --i) {
-            sequence[i].undoCommand();
-        }
+            try {
+                sequence[i].undoCommand();
+            } catch (AssertionError | Exception e) {
+                throw createReportedException(e, i);
+            }
+        }
+    }
+
+    private ReportedException createReportedException(Throwable e, int i) {
+        ReportedException exception = new ReportedException(e);
+        exception.startSection("sequence_information");
+        exception.put("sequence_name", getDescriptionText());
+        exception.put("sequence_command", sequence[i].getDescriptionText());
+        exception.put("sequence_index", i);
+        exception.put("sequence_commands", Stream.of(sequence)
+                .map(o -> o.getClass().getCanonicalName())
+                .map(String::valueOf)
+                .collect(Collectors.joining(";", "[", "]")));
+        exception.put("sequence_commands_descriptions", Stream.of(sequence)
+                .map(Command::getDescriptionText)
+                .collect(Collectors.joining(";", "[", "]")));
+        return exception;
     }