Changeset 11283 in josm for trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

Timestamp:

2016-11-18T22:42:23+01:00 (7 years ago)

Author:

michael2402

Message:

See #13976: Add progress monitor information to the bug report

File:

• trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
@@ -52 +53 @@
     private boolean cancelable;
 
-    private static void doInEDT(Runnable runnable) {
+    private void doInEDT(Runnable runnable) {
         // This must be invoke later even if current thread is EDT because inside there is dialog.setVisible
         // which freeze current code flow until modal dialog is closed
-        SwingUtilities.invokeLater(runnable);
+        SwingUtilities.invokeLater(() -> {
+            try {
+                runnable.run();
+            } catch (RuntimeException e) {
+                throw BugReport.intercept(e).put("monitor", this);
+            }
+        });
     }
 
@@ -172 +179 @@
             if (dialogParent != null && dialog == null) {
                 dialog = new PleaseWaitDialog(dialogParent);
-            } else
+            } else {
                 throw new ProgressException("PleaseWaitDialog parent must be set");
+            }
 
             if (windowTitle != null) {
@@ -326 +334 @@
             return parent;
     }
+
+    @Override
+    public String toString() {
+        return "PleaseWaitProgressMonitor [currentProgressValue=" + currentProgressValue + ", customText=" + customText
+                + ", title=" + title + ", indeterminate=" + indeterminate + ", isInBackground=" + isInBackground
+                + ", windowTitle=" + windowTitle + ", taskId=" + taskId + ", cancelable=" + cancelable + ", state="
+                + state + "]";
+    }
 }