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

Timestamp:

2016-07-26T21:34:35+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13193 - Use a new bug report dialog (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/ExtendedDialog.java (modified) (3 diffs)
• tools/GBC.java (modified) (1 diff)
• tools/bugreport/BugReport.java (modified) (2 diffs)
• tools/bugreport/BugReportDialog.java (added)
• tools/bugreport/BugReportExceptionHandler.java (modified) (3 diffs)
• tools/bugreport/BugReportSettingsPanel.java (modified) (1 diff)
• tools/bugreport/JosmUpdatePanel.java (added)

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Frame;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -146 +147 @@
 
     public ExtendedDialog(Component parent, String title, String[] buttonTexts, boolean modal, boolean disposeOnClose) {
-        super(GuiHelper.getFrameForComponent(parent), title, modal ? ModalityType.DOCUMENT_MODAL : ModalityType.MODELESS);
+        super(searchRealParent(parent), title, modal ? ModalityType.DOCUMENT_MODAL : ModalityType.MODELESS);
         this.parent = parent;
         this.modal = modal;
@@ -154 +155 @@
         }
         this.disposeOnClose = disposeOnClose;
+    }
+
+    private static Frame searchRealParent(Component parent) {
+        if (parent == null) {
+            return null;
+        } else {
+            return GuiHelper.getFrameForComponent(parent);
+        }
     }
 

trunk/src/org/openstreetmap/josm/tools/GBC.java

@@ -97 +97 @@
 
     /**
+     * Adds insets to this GBC.
+     * @param insets The insets in all directions.
+     * @return This constraint for chaining.
+     * @since 10649
+     */
+    public GBC insets(int insets) {
+        insets(insets, insets, insets, insets);
+        return this;
+    }
+
+    /**
      * Specifies how to distribute extra horizontal space.
      * @param weightx   Weight in horizontal direction

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

@@ -3 +3 @@
 
 import java.io.PrintWriter;
+import java.io.Serializable;
 import java.io.StringWriter;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -38 +39 @@
  * @since 10285
  */
-public final class BugReport {
+public final class BugReport implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private boolean includeStatusReport = true;
     private boolean includeData = true;

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools.bugreport;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
+import java.awt.GraphicsEnvironment;
 
-import java.awt.Component;
-import java.awt.GraphicsEnvironment;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.ReportBugAction;
-import org.openstreetmap.josm.actions.ShowStatusReportAction;
-import org.openstreetmap.josm.data.Version;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.preferences.plugin.PluginPreference;
-import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
-import org.openstreetmap.josm.gui.widgets.UrlLabel;
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginHandler;
-import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.WikiReader;
 
 /**
@@ -79 +59 @@
 
         static void askForBugReport(final Throwable e) {
-            String[] buttonTexts = new String[] {tr("Do nothing"), tr("Report Bug")};
-            String[] buttonIcons = new String[] {"cancel", "bug"};
-            int defaultButtonIdx = 1;
-            String message = tr("An unexpected exception occurred.<br>" +
-                    "This is always a coding error. If you are running the latest<br>" +
-                    "version of JOSM, please consider being kind and file a bug report."
-                    );
-            // Check user is running current tested version, the error may already be fixed
-            int josmVersion = Version.getInstance().getVersion();
-            if (josmVersion != Version.JOSM_UNKNOWN_VERSION) {
-                try {
-                    int latestVersion = Integer.parseInt(new WikiReader().
-                            read(Main.getJOSMWebsite()+"/wiki/TestedVersion?format=txt").trim());
-                    if (latestVersion > josmVersion) {
-                        buttonTexts = new String[] {tr("Do nothing"), tr("Update JOSM"), tr("Report Bug")};
-                        buttonIcons = new String[] {"cancel", "download", "bug"};
-                        defaultButtonIdx = 2;
-                        message = tr("An unexpected exception occurred. This is always a coding error.<br><br>" +
-                                "However, you are running an old version of JOSM ({0}),<br>" +
-                                "instead of using the current tested version (<b>{1}</b>).<br><br>"+
-                                "<b>Please update JOSM</b> before considering to file a bug report.",
-                                String.valueOf(josmVersion), String.valueOf(latestVersion));
-                    }
-                } catch (IOException | NumberFormatException ex) {
-                    Main.warn(ex, "Unable to detect latest version of JOSM:");
-                }
-            }
-            // Build panel
-            JPanel pnl = new JPanel(new GridBagLayout());
-            pnl.add(new JLabel("<html>" + message + "</html>"), GBC.eol());
-            JCheckBox cbSuppress = null;
-            if (exceptionCounter > 1) {
-                cbSuppress = new JCheckBox(tr("Suppress further error dialogs for this session."));
-                pnl.add(cbSuppress, GBC.eol());
-            }
             if (GraphicsEnvironment.isHeadless()) {
                 return;
             }
-            // Show dialog
-            ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Unexpected Exception"), buttonTexts);
-            ed.setButtonIcons(buttonIcons);
-            ed.setIcon(JOptionPane.ERROR_MESSAGE);
-            ed.setCancelButton(1);
-            ed.setDefaultButton(defaultButtonIdx);
-            ed.setContent(pnl);
-            ed.setFocusOnDefaultButton(true);
-            ed.showDialog();
-            if (cbSuppress != null && cbSuppress.isSelected()) {
-                suppressExceptionDialogs = true;
-            }
-            if (ed.getValue() <= 1) {
-                // "Do nothing"
-                return;
-            } else if (ed.getValue() < buttonTexts.length) {
-                // "Update JOSM"
-                try {
-                    Main.platform.openUrl(Main.getJOSMWebsite());
-                } catch (IOException ex) {
-                    Main.warn(ex, "Unable to access JOSM website:");
-                }
-            } else {
-                // "Report bug"
-                try {
-                    JPanel p = buildPanel(e);
-                    JOptionPane.showMessageDialog(Main.parent, p, tr("You have encountered a bug in JOSM"), JOptionPane.ERROR_MESSAGE);
-                } catch (RuntimeException ex) {
-                    Main.error(ex);
-                }
-            }
+            BugReport report = new BugReport(BugReport.intercept(e));
+            BugReportDialog dialog = new BugReportDialog(report);
+            dialog.setShowSuppress(exceptionCounter > 1);
+            dialog.setVisible(true);
+            suppressExceptionDialogs = dialog.shouldSuppressFurtherErrors();
         }
 
@@ -196 +115 @@
     }
 
-    static JPanel buildPanel(final Throwable e) {
-        DebugTextDisplay textarea;
-        if (e instanceof ReportedException) {
-            // Temporary!
-            textarea = new DebugTextDisplay(new BugReport((ReportedException) e));
-        } else {
-            StringWriter stack = new StringWriter();
-            e.printStackTrace(new PrintWriter(stack));
-            textarea = new DebugTextDisplay(ShowStatusReportAction.getReportHeader() + stack.getBuffer().toString());
-        }
-
-        JPanel p = new JPanel(new GridBagLayout());
-        p.add(new JMultilineLabel(
-                tr("You have encountered an error in JOSM. Before you file a bug report " +
-                        "make sure you have updated to the latest version of JOSM here:")),
-                        GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-        p.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eop().insets(8, 0, 0, 0));
-        p.add(new JMultilineLabel(
-                tr("You should also update your plugins. If neither of those help please " +
-                        "file a bug report in our bugtracker using this link:")),
-                        GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-        p.add(new JButton(new ReportBugAction(textarea.getCodeText())), GBC.eop().insets(8, 0, 0, 0));
-        p.add(new JMultilineLabel(
-                tr("There the error information provided below should already be " +
-                        "filled in for you. Please include information on how to reproduce " +
-                        "the error and try to supply as much detail as possible.")),
-                        GBC.eop().fill(GridBagConstraints.HORIZONTAL));
-        p.add(new JMultilineLabel(
-                tr("Alternatively, if that does not work you can manually fill in the information " +
-                        "below at this URL:")), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-        p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
-
-        if (textarea.copyToClippboard()) {
-            p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")),
-                    GBC.eop().fill(GridBagConstraints.HORIZONTAL));
-        }
-
-        p.add(textarea, GBC.eop().fill());
-
-        for (Component c: p.getComponents()) {
-            if (c instanceof JMultilineLabel) {
-                ((JMultilineLabel) c).setMaxWidth(400);
-            }
-        }
-        return p;
-    }
-
     /**
      * Determines if an exception is currently being handled

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

@@ -26 +26 @@
         add(statusReport);
 
-        JCheckBox data = new JCheckBox(tr("Include information about the data that was worked on."));
+        JCheckBox data = new JCheckBox(tr("Include information about the data you were working on."));
         data.setSelected(report.isIncludeData());
         data.addChangeListener(e -> report.setIncludeData(data.isSelected()));