Changeset 12770 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-09-07T21:10:49+02:00 (4 years ago)

Author:

bastiK

Message:

see #15229 - remove GUI references from BugReport and BugReportQueue

signature of BugReport#getReportText changed without deprecation
(probably not used by any external plugin)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (3 diffs)
• bugreport/DebugTextDisplay.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -88 +88 @@
 import org.openstreetmap.josm.gui.ProgramArguments.Option;
 import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
+import org.openstreetmap.josm.gui.bugreport.BugReportDialog;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.io.CustomConfigurator.XMLCommandProcessor;
@@ -143 +144 @@
 import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.bugreport.BugReportQueue;
 import org.xml.sax.SAXException;
 
@@ -754 +756 @@
         }
 
+        if (!GraphicsEnvironment.isHeadless()) {
+            BugReportQueue.getInstance().setBugReportHandler(BugReportDialog::showFor);
+        }
+
         Level logLevel = args.getLogLevel();
         Logging.setLogLevel(logLevel);

trunk/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java

@@ -6 +6 @@
 import javax.swing.JScrollPane;
 
+import org.openstreetmap.josm.actions.ShowStatusReportAction;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -49 +50 @@
     public DebugTextDisplay(BugReport report) {
         this();
-        setCodeText(report.getReportText());
-        report.addChangeListener(e -> setCodeText(report.getReportText()));
+        setCodeText(report.getReportText(ShowStatusReportAction.getReportHeader()));
+        report.addChangeListener(e -> setCodeText(report.getReportText(ShowStatusReportAction.getReportHeader())));
     }