Changeset 14176 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-08-22T01:20:19+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16666 - extract DefaultBugReportSendingHandler to its own class in order to control AWT loading. Having it defined as a public static field of BugReportDialog class makes Java load AWT way too early.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

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

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

@@ -106 +106 @@
 import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
 import org.openstreetmap.josm.gui.bugreport.BugReportDialog;
+import org.openstreetmap.josm.gui.bugreport.DefaultBugReportSendingHandler;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.io.CredentialDialog;
@@ -776 +777 @@
         if (!GraphicsEnvironment.isHeadless()) {
             BugReportQueue.getInstance().setBugReportHandler(BugReportDialog::showFor);
-            BugReportSender.setBugReportSendingHandler(BugReportDialog.bugReportSendingHandler);
+            BugReportSender.setBugReportSendingHandler(new DefaultBugReportSendingHandler());
         }
 

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

@@ -18 +18 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
@@ -33 +32 @@
 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;
 
@@ -55 +52 @@
     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(Config.getUrls().getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
-                errorPanel.add(new DebugTextDisplay(statusText));
-
-                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), errorPanel, tr("You have encountered a bug in JOSM"),
-                        JOptionPane.ERROR_MESSAGE);
-            });
-        }
-    };
 
     /**