Changeset 10067 in josm for trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

Timestamp:

2016-03-28T14:23:40+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12652 - rework bug report classes to improve unit tests coverage

File:

• trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java (modified) (7 diffs)

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

@@ -49 +49 @@
 
     private final String statusText;
+    private String errorMessage;
 
     /**
@@ -54 +55 @@
      * @param statusText The status text to send.
      */
-    public BugReportSender(String statusText) {
+    protected BugReportSender(String statusText) {
         super("Bug report sender");
         this.statusText = statusText;
@@ -101 +102 @@
                 DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
                 Document document = builder.parse(in);
-                return retriveDebugToken(document);
+                return retrieveDebugToken(document);
             }
         } catch (IOException | SAXException | ParserConfigurationException | XPathExpressionException t) {
@@ -108 +109 @@
     }
 
-    private String getJOSMTicketURL() {
+    private static String getJOSMTicketURL() {
         return Main.getJOSMWebsite() + "/josmticket";
     }
 
-    private String retriveDebugToken(Document document) throws XPathExpressionException, BugReportSenderException {
+    private static String retrieveDebugToken(Document document) throws XPathExpressionException, BugReportSenderException {
         XPathFactory factory = XPathFactory.newInstance();
         XPath xpath = factory.newXPath();
@@ -134 +135 @@
 
     private void failed(String string) {
+        errorMessage = string;
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                JPanel errorPanel = new JPanel();
-                errorPanel.setLayout(new GridBagLayout());
+                JPanel errorPanel = new JPanel(new GridBagLayout());
                 errorPanel.add(new JMultilineLabel(
                         tr("Opening the bug report failed. Please report manually using this website:")),
@@ -149 +150 @@
             }
         });
+    }
+
+    /**
+     * Returns the error message that could have occured during bug sending.
+     * @return the error message, or {@code null} if successful
+     */
+    public final String getErrorMessage() {
+        return errorMessage;
     }
 
@@ -164 +173 @@
      * Opens the bug report window on the JOSM server.
      * @param statusText The status text to send along to the server.
+     * @return bug report sender started thread
      */
-    public static void reportBug(String statusText) {
-        new BugReportSender(statusText).start();
+    public static BugReportSender reportBug(String statusText) {
+        BugReportSender sender = new BugReportSender(statusText);
+        sender.start();
+        return sender;
     }
 }