Index: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
===================================================================
--- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (Revision 2536)
+++ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (Arbeitskopie)
@@ -21,7 +21,12 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ShowStatusReportAction;
import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.Base64;
+import java.net.URL;
+import java.net.URLEncoder;
+import org.openstreetmap.josm.tools.UrlLabel;
+
/**
* An exception handler that asks the user to send a bug report.
*
@@ -64,11 +69,41 @@
String text = ShowStatusReportAction.getReportHeader()
+ stack.getBuffer().toString();
+ URL url = new URL("http://josm.openstreetmap.de/josmticket?" +
+ "data="+
+ Base64.encode(
+ // To note that it came from this code
+ "keywords=template_report&" +
+ "description=" + java.net.URLEncoder.encode(
+ // Note: This doesn't use tr() intentionally, we want bug reports in English
+ "What steps will reproduce the problem?\n"
+ + " 1. \n"
+ + " 2. \n"
+ + " 3. \n"
+ + "\n"
+ + "What is the expected result?\n\n"
+ + "What happens instead?\n\n"
+ + "Please provide any additional information below. Attach a screenshot if\n"
+ + "possible.\n\n"
+ + "{{{\n" + text + "\n}}}\n",
+ "UTF-8")));
+
JPanel p = new JPanel(new GridBagLayout());
- p.add(new JLabel("" + tr("Please report a ticket at {0}","http://josm.openstreetmap.de/newticket") +
- "
" + tr("Include your steps to get to the error (as detailed as possible)!") +
- "
" + tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.") +
- "
" + tr("Be sure to include the following information:") + ""), GBC.eol());
+ p.add(new JLabel(tr("" +
+ "You've encountered an error in JOSM. Before you file a bug
" +
+ "make sure you've updated to the latest version of JOSM here:
")), GBC.eol());
+ p.add(new UrlLabel("http://josm.openstreetmap.de/#Download"), GBC.eop().insets(8,0,0,0));
+ p.add(new JLabel(tr("You should also update your plugins. If neither of those help please
" +
+ "file a bug in our bugtracker using this link:")), GBC.eol());
+ p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
+ p.add(new JLabel(tr("" +
+ "There the the error information provided below should already be
" +
+ "filled out for you. Please include information on how to reproduce
" +
+ "the error and try to supply as much detail as possible.
")), GBC.eop());
+ p.add(new JLabel(tr("" +
+ "Alternatively if that doesn't work you can manually fill in the information
" +
+ "below at this URL:
")), GBC.eol());
+ p.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eop().insets(8,0,0,0));
try {
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(text), new ClipboardOwner(){
public void lostOwnership(Clipboard clipboard, Transferable contents) {}
@@ -82,7 +117,7 @@
info.setEditable(false);
p.add(new JScrollPane(info), GBC.eop());
- JOptionPane.showMessageDialog(Main.parent, p, tr("Warning"), JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showMessageDialog(Main.parent, p, tr("You've encountered a bug in JOSM"), JOptionPane.ERROR_MESSAGE);
} catch (Exception e1) {
e1.printStackTrace();
}