Changeset 16546 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java

Timestamp:

2020-06-07T11:36:21+02:00 (4 years ago)

Author:

simon04

Message:

fix #19343 - DataIntegrityProblemException: report commands involving relevant primitives

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import java.util.Arrays;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 
 /**
@@ -22 +30 @@
      * @param message the detail message
      * @param htmlMessage HTML-formatted error message. Can be null
+     * @param p the primitive involved in this integrity problem (used for constructing a detailed message)
      */
-    public DataIntegrityProblemException(String message, String htmlMessage) {
-        super(message);
+    public DataIntegrityProblemException(String message, String htmlMessage, OsmPrimitive... p) {
+        super(message + relevantCommands(p));
         this.htmlMessage = htmlMessage;
     }
@@ -35 +44 @@
         return htmlMessage;
     }
+
+    private static String relevantCommands(OsmPrimitive... p) {
+        if (p == null || p.length == 0) {
+            return "";
+        }
+        Predicate<Command> isParticipating = c -> Arrays.stream(p).anyMatch(c.getParticipatingPrimitives()::contains);
+        Stream<String> undo = UndoRedoHandler.getInstance().getUndoCommands().stream()
+                .filter(isParticipating)
+                .map(c -> "[" + c.getDescriptionText() + "]");
+        Stream<String> redo = UndoRedoHandler.getInstance().getRedoCommands().stream()
+                .filter(isParticipating)
+                .map(c -> "[" + c.getDescriptionText() + " (undone)]");
+        return Stream.concat(undo, redo)
+                .collect(Collectors.joining(", ", " (changed by the following commands: ", ")"));
+    }
 }