Changeset 10285 in josm for trunk

Timestamp:

2016-05-27T19:07:59+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12875 - Add data to bug report (patch by michael2402)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MapView.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/bugreport/BugReport.java (added)
• src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/bugreport/ReportedException.java (added)
• test/unit/org/openstreetmap/josm/tools/bugreport/BugReportTest.java (added)
• test/unit/org/openstreetmap/josm/tools/bugreport/ReportedExceptionTest.java (added)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -75 +75 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 
@@ -750 +751 @@
 
     private void paintLayer(Layer layer, Graphics2D g, Bounds box) {
-        if (layer.getOpacity() < 1) {
-            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, (float) layer.getOpacity()));
-        }
-        layer.paint(g, this, box);
-        g.setPaintMode();
+        try {
+            if (layer.getOpacity() < 1) {
+                g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, (float) layer.getOpacity()));
+            }
+            layer.paint(g, this, box);
+            g.setPaintMode();
+        } catch (RuntimeException t) {
+            throw BugReport.intercept(t).put("layer", layer).put("bounds", box);
+        }
     }
 

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

@@ -198 +198 @@
     static JPanel buildPanel(final Throwable e) {
         StringWriter stack = new StringWriter();
-        e.printStackTrace(new PrintWriter(stack));
+        PrintWriter writer = new PrintWriter(stack);
+        if (e instanceof ReportedException) {
+            // Temporary!
+            ((ReportedException) e).printReportDataTo(writer);
+            ((ReportedException) e).printReportStackTo(writer);
+        } else {
+            e.printStackTrace(writer);
+        }
 
         String text = ShowStatusReportAction.getReportHeader() + stack.getBuffer().toString();