Changeset 10062 in josm

Timestamp:

2016-03-28T00:22:42+02:00 (9 years ago)

Author:

Don-vip

Message:

see #12652 - about dialog: replace old bug report link with new bug report button, remove unused code

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/AboutAction.java (modified) (5 diffs)
• src/org/openstreetmap/josm/actions/ReportBugAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandlerTest.java (modified) (2 diffs)

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

@@ -18 +18 @@
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -26 +25 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
@@ -34 +34 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 
 /**
@@ -96 +94 @@
         info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol().fill(GBC.HORIZONTAL));
         info.add(GBC.glue(0, 5), GBC.eol());
-        info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10, 0, 10, 0));
-        info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())),
-                GBC.eol().fill(GBC.HORIZONTAL));
 
         about.addTab(tr("Info"), info);
@@ -109 +104 @@
         // Intermediate panel to allow proper optionPane resizing
         JPanel panel = new JPanel(new GridBagLayout());
-        panel.setPreferredSize(new Dimension(600, 300));
+        panel.setPreferredSize(new Dimension(890, 300));
+        panel.add(new JLabel("", new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(256, 258, Image.SCALE_SMOOTH)),
+                JLabel.CENTER), GBC.std().insets(0, 5, 0, 0));
         panel.add(about, GBC.std().fill());
 
         GuiHelper.prepareResizeableOptionPane(panel, panel.getPreferredSize());
-        JOptionPane.showMessageDialog(Main.parent, panel, tr("About JOSM..."), JOptionPane.INFORMATION_MESSAGE,
-                new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(256, 258, Image.SCALE_SMOOTH)));
+        int ret = new ExtendedDialog(Main.parent, tr("About JOSM..."), new String[] {tr("OK"), tr("Report bug")})
+            .setButtonIcons(new String[] {"ok", "bug"})
+            .setContent(panel, false)
+            .showDialog().getValue();
+        if (2 == ret) {
+            Main.main.menu.reportbug.actionPerformed(null);
+        }
     }
 

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

@@ -22 +22 @@
      */
     public ReportBugAction() {
-        this(ShowStatusReportAction.getReportHeader());
+        this(null);
     }
 
@@ -38 +38 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        BugReportSender.reportBug(text);
+        BugReportSender.reportBug(text == null ? ShowStatusReportAction.getReportHeader() : text);
     }
 }

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

@@ -7 +7 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.zip.GZIPOutputStream;
 
 import javax.swing.JButton;
@@ -33 +28 @@
 import org.openstreetmap.josm.plugins.PluginDownloadTask;
 import org.openstreetmap.josm.plugins.PluginHandler;
-import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.WikiReader;
@@ -154 +148 @@
 
     /**
-     * Handles the given throwable object
-     * @param t The throwable object
-     */
-    public void handle(Throwable t) {
-        handleException(t);
-    }
-
-    /**
      * Handles the given exception
      * @param e the exception
@@ -253 +239 @@
         return handlingInProgress;
     }
-
-    /**
-     * Replies the URL to create a JOSM bug report with the given debug text. GZip is used to reduce the length of the parameter.
-     * @param debugText The debug text to provide us
-     * @return The URL to create a JOSM bug report with the given debug text
-     * @see BugReportSender#reportBug(String) if you want to send long debug texts along.
-     * @since 5849
-     */
-    public static URL getBugReportUrl(String debugText) {
-        try (
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            GZIPOutputStream gzip = new GZIPOutputStream(out)
-        ) {
-            gzip.write(debugText.getBytes(StandardCharsets.UTF_8));
-            gzip.finish();
-
-            return new URL(Main.getJOSMWebsite()+"/josmticket?" +
-                    "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true));
-        } catch (IOException e) {
-            Main.error(e);
-            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 UrlLabel getBugReportUrlLabel(String debugText) {
-        URL url = getBugReportUrl(debugText);
-        if (url != null) {
-            return new UrlLabel(url.toString(), Main.getJOSMWebsite()+"/josmticket?...", 2);
-        }
-        return null;
-    }
 }

trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandlerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools.bugreport;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.zip.GZIPInputStream;
-
-import javax.xml.bind.DatatypeConverter;
-
 import org.junit.Before;
-import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.ShowStatusReportAction;
 
 /**
@@ -30 +17 @@
         JOSMFixture.createUnitTestFixture().init();
     }
-
-    /**
-     * Test method for {@link org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler#getBugReportUrl(java.lang.String)}.
-     * @throws IOException if any I/O error occurs
-     */
-    @Test
-    public void testGetBugReportUrl() throws IOException {
-        String report = ShowStatusReportAction.getReportHeader();
-        String url = BugReportExceptionHandler.getBugReportUrl(report).toExternalForm();
-        String prefix = Main.getJOSMWebsite()+"/josmticket?gdata=";
-        assertTrue(url.startsWith(prefix));
-
-        String gdata = url.substring(prefix.length());
-        // JAXB only provides support for "base64" decoding while we encode url in "base64url", so switch encoding, only for test purpose
-        byte[] data = DatatypeConverter.parseBase64Binary(gdata.replace('-', '+').replace('_', '/'));
-        byte[] buff = new byte[8192];
-        try (GZIPInputStream is = new GZIPInputStream(new ByteArrayInputStream(data))) {
-            StringBuilder sb = new StringBuilder();
-            for (int n = is.read(buff); n > 0; n = is.read(buff)) {
-                sb.append(new String(buff, 0, n, StandardCharsets.UTF_8));
-            }
-            assertEquals(report, sb.toString());
-        }
-    }
 }