Changeset 5849 in josm

Timestamp:

2013-04-14T00:05:26+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8584 - see #8571 : Add "Report bug" button in Status report dialog, change bug report link in About dialog

Location:

trunk

Files:

• images/bug.png (added)
• src/org/openstreetmap/josm/actions/AboutAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -5 +5 @@
 
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -22 +21 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UrlLabel;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -83 +84 @@
         info.add(GBC.glue(0,5), GBC.eol());
         info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
-        info.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eol().fill(GBC.HORIZONTAL));
+        info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())), GBC.eol().fill(GBC.HORIZONTAL));
 
         about.addTab(tr("Info"), info);

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -113 +115 @@
     public void actionPerformed(ActionEvent e) {
         StringBuilder text = new StringBuilder();
-        text.append(getReportHeader());
+        String reportHeader = getReportHeader();
+        text.append(reportHeader);
         try {
             Map<String, Setting> settings = Main.pref.getAllSettings();
@@ -141 +144 @@
         ExtendedDialog ed = new ExtendedDialog(Main.parent,
                 tr("Status Report"),
-                new String[] {tr("Copy to clipboard and close"), tr("Close") });
-        ed.setButtonIcons(new String[] {"copy.png", "cancel.png" });
+                new String[] {tr("Copy to clipboard and close"), tr("Report bug"), tr("Close") });
+        ed.setButtonIcons(new String[] {"copy.png", "bug.png", "cancel.png" });
         ed.setContent(sp, false);
         ed.setMinimumSize(new Dimension(380, 200));
         ed.setPreferredSize(new Dimension(700, Main.parent.getHeight()-50));
 
-        if (ed.showDialog().getValue() != 1) return;
-        Utils.copyToClipboard(text.toString());
+        switch (ed.showDialog().getValue()) {
+            case 1: Utils.copyToClipboard(text.toString()); break;
+            case 2: OpenBrowser.displayUrl(BugReportExceptionHandler.getBugReportUrl(
+                        Utils.strip(reportHeader)).toExternalForm()) ; break;
+        }
     }
 }

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

@@ -7 +7 @@
 import java.awt.GridBagLayout;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -121 +122 @@
                             }
                             
-                            ByteArrayOutputStream out = new ByteArrayOutputStream();
-                            GZIPOutputStream gzip = new GZIPOutputStream(out);
-                            gzip.write(urltext.getBytes("UTF-8"));
-                            gzip.close();
-
-                            URL url = new URL("http://josm.openstreetmap.de/josmticket?" +
-                                    "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
-
                             JPanel p = new JPanel(new GridBagLayout());
                             p.add(new JMultilineLabel(
@@ -137 +130 @@
                                     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());
-                            p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?...",2), GBC.eop().insets(8,0,0,0));
+                            p.add(getBugReportUrlLabel(urltext), GBC.eop().insets(8,0,0,0));
                             p.add(new JMultilineLabel(
                                     tr("There the error information provided below should already be " +
@@ -175 +168 @@
         return handlingInProgress;
     }
+    
+    /**
+     * Replies the URL to create a JOSM bug report with the given debug text
+     * @param debugText The debug text to provide us
+     * @return The URL to create a JOSM bug report with the given debug text
+     * @since 5849
+     */
+    public static URL getBugReportUrl(String debugText) {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            GZIPOutputStream gzip = new GZIPOutputStream(out);
+            gzip.write(debugText.getBytes("UTF-8"));
+            gzip.close();
+    
+            return new URL("http://josm.openstreetmap.de/josmticket?" +
+                    "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+    
+    /**
+     * Replies the URL label to create a JOSM bug report with the given debug text
+     * @param debugText The debug text to provide us
+     * @return The URL label to create a JOSM bug report with the given debug text
+     * @since 5849
+     */
+    public static final UrlLabel getBugReportUrlLabel(String debugText) {
+        URL url = getBugReportUrl(debugText);
+        if (url != null) {
+            return new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?...", 2);
+        }
+        return null;
+    }
 }