Changeset 12790 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-09-08T21:10:14+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI references from BugReportSender

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• bugreport/BugReportDialog.java (modified) (3 diffs)

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

@@ -149 +149 @@
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.bugreport.BugReportQueue;
+import org.openstreetmap.josm.tools.bugreport.BugReportSender;
 import org.xml.sax.SAXException;
 
@@ -778 +779 @@
         if (!GraphicsEnvironment.isHeadless()) {
             BugReportQueue.getInstance().setBugReportHandler(BugReportDialog::showFor);
+            BugReportSender.setBugReportSendingHandler(BugReportDialog.bugReportSendingHandler);
         }
 

trunk/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java

@@ -19 +19 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
@@ -32 +33 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
+import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.BugReportQueue.SuppressionMode;
 import org.openstreetmap.josm.tools.bugreport.BugReportSender;
+import org.openstreetmap.josm.tools.bugreport.BugReportSender.BugReportSendingHandler;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
 
@@ -52 +55 @@
     private JCheckBox cbSuppressSingle;
     private JCheckBox cbSuppressAll;
+
+    /**
+     * Default bug report callback that opens the bug report form in user browser
+     * and displays a dialog in case of error.
+     * @since 12790
+     */
+    public static final BugReportSendingHandler bugReportSendingHandler = new BugReportSendingHandler() {
+        @Override
+        public String sendingBugReport(String bugUrl, String statusText) {
+            return OpenBrowser.displayUrl(bugUrl);
+        }
+
+        @Override
+        public void failed(String errorMessage, String statusText) {
+            SwingUtilities.invokeLater(() -> {
+                JPanel errorPanel = new JPanel(new GridBagLayout());
+                errorPanel.add(new JMultilineLabel(
+                        tr("Opening the bug report failed. Please report manually using this website:")),
+                        GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+                errorPanel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
+                errorPanel.add(new DebugTextDisplay(statusText));
+
+                JOptionPane.showMessageDialog(Main.parent, errorPanel, tr("You have encountered a bug in JOSM"),
+                        JOptionPane.ERROR_MESSAGE);
+            });
+        }
+    };
 
     /**