Changeset 10886 in josm for trunk/src/org

Timestamp:

2016-08-24T00:18:37+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13434 - Increase bug report test coverage (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/tools/bugreport

Files:

• BugReport.java (modified) (1 diff)
• BugReportQueue.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReport.java

@@ -123 +123 @@
         PrintWriter out = new PrintWriter(stringWriter);
         if (isIncludeStatusReport()) {
-            out.println(ShowStatusReportAction.getReportHeader());
+            try {
+                out.println(ShowStatusReportAction.getReportHeader());
+            } catch (RuntimeException e) {
+                out.println("Could not generate status report: " + e.getMessage());
+            }
         }
         if (isIncludeData()) {

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiFunction;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.Main;
@@ -23 +25 @@
     private Thread displayThread;
     private final BiFunction<ReportedException, Integer, SuppressionMode> bugReportHandler = getBestHandler();
+    private final CopyOnWriteArrayList<Predicate<ReportedException>> handlers = new CopyOnWriteArrayList<>();
     private int displayedErrors;
 
@@ -97 +100 @@
 
     private SuppressionMode displayFor(ReportedException e) {
+        if (handlers.stream().anyMatch(p -> p.test(e))) {
+            Main.trace("Intercepted by handler.");
+            return SuppressionMode.NONE;
+        }
         return bugReportHandler.apply(e, getDisplayedErrors());
     }
@@ -123 +130 @@
     }
 
+    /**
+     * Allows you to peek or even intersect the bug reports.
+     * @param handler The handler. It can return false to stop all further handling of the exception.
+     * @since 10886
+     */
+    public void addBugReportHandler(Predicate<ReportedException> handler) {
+        handlers.add(handler);
+    }
+
+    /**
+     * Gets the global bug report queue
+     * @return The queue
+     * @since 10886
+     */
     public static BugReportQueue getInstance() {
         return INSTANCE;