From: Andreas Putzo Subject: Include Debian version number and BTS link Forwarded: not-needed Bugs for the Josm version present in Debian have to be filed in Debian's BTS and not upstream. Also include the Debian version number for better bug triaging. --- src/org/openstreetmap/josm/actions/AboutAction.java | 7 +++ src/org/openstreetmap/josm/data/Version.java | 7 +++ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java | 20 +++------- 3 files changed, 19 insertions(+), 15 deletions(-) --- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java +++ josm/src/org/openstreetmap/josm/actions/AboutAction.java @@ -9,6 +9,9 @@ import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -73,6 +76,8 @@ public class AboutAction extends JosmAct info.add(GBC.glue(0,10), GBC.eol()); info.add(new JLabel(tr("Version {0}", version.getVersionString())), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0)); info.add(GBC.glue(0,5), GBC.eol()); + info.add(new JLabel(tr("Debian release: {0}", version.getDebianVersionString())), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0)); + info.add(GBC.glue(0,5), GBC.eol()); info.add(new JLabel(tr("Last change at {0}",version.getTime())), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0)); info.add(GBC.glue(0,5), GBC.eol()); info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0)); @@ -81,7 +86,7 @@ public class AboutAction extends JosmAct info.add(new UrlLabel("http://josm.openstreetmap.de",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(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new UrlLabel("http://bugs.debian.org", 2), GBC.eol().fill(GBC.HORIZONTAL)); about.addTab(tr("Info"), info); about.addTab(tr("Readme"), createScrollPane(readme)); --- josm.orig/src/org/openstreetmap/josm/data/Version.java +++ josm/src/org/openstreetmap/josm/data/Version.java @@ -66,6 +66,7 @@ public class Version { private int version; private String releaseDescription; + private String debianVersion; private String time; private boolean isLocalBuild; @@ -115,6 +116,8 @@ public class Version { version = JOSM_UNKNOWN_VERSION; } + debianVersion = properties.get("Debian-Release"); + // the last changed data // time = properties.get("Last Changed Date"); @@ -160,6 +163,10 @@ public class Version { return version == 0 ? tr("UNKNOWN") : Integer.toString(version); } + public String getDebianVersionString() { + return debianVersion; + } + /** * Replies a text with the release attributes * --- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java +++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java @@ -83,8 +83,8 @@ public final class BugReportExceptionHan pnl.add(new JLabel( "" + tr("An unexpected exception occurred.
" + - "This is always a coding error. If you are running the latest
" + - "version of JOSM, please consider being kind and file a bug report." + "Please consider being kind and file a bug report.
" + + "See http://bugs.debian.org for a guide how to do this." ) + ""), GBC.eol()); JCheckBox cbSuppress = null; @@ -123,21 +123,13 @@ public final class BugReportExceptionHan 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()); - p.add(new UrlLabel("http://josm.openstreetmap.de/#Download",2), GBC.eop().insets(8,0,0,0)); + tr("Please report a bug against JOSM.")), GBC.eol()); 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()); - p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?...",2), GBC.eop().insets(8,0,0,0)); + tr("Include your steps to get to the error (as detailed as possible)!")), GBC.eol()); 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()); + tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.")), GBC.eol()); p.add(new JMultilineLabel( - tr("Alternatively, if that does not work you can manually fill in the information " + - "below at this URL:")), GBC.eol()); - p.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eop().insets(8,0,0,0)); + tr("Be sure to include the following information:")), GBC.eop()); if (Utils.copyToClipboard(text)) { p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop()); }