Changeset 17637 in josm for trunk/src/org

Timestamp:

2021-03-22T19:30:36+01:00 (4 years ago)

Author:

simon04

Message:

fix #20647 - Add --status-report command line argument

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ShowStatusReportAction.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (4 diffs)
• gui/ProgramArguments.java (modified) (1 diff)

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

@@ -64 +64 @@
 
     /**
+     * Localized description text for this action
+     */
+    public static final String ACTION_DESCRIPTION = tr("Show status report with useful information that can be attached to bugs");
+
+    /**
      * Constructs a new {@code ShowStatusReportAction}
      */
@@ -70 +75 @@
                 tr("Show Status Report"),
                 "misc/statusreport",
-                tr("Show status report with useful information that can be attached to bugs"),
+                ACTION_DESCRIPTION,
                 Shortcut.registerShortcut("help:showstatusreport", tr("Help: {0}",
                         tr("Show Status Report")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true, "help/showstatusreport", false);

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

@@ -71 +71 @@
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.RestartAction;
+import org.openstreetmap.josm.actions.ShowStatusReportAction;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
@@ -657 +658 @@
                 "\t--language=<language>                     "+tr("Set the language")+"\n\n"+
                 "\t--version                                 "+tr("Displays the JOSM version and exits")+"\n\n"+
+                "\t--status-report                           "+ShowStatusReportAction.ACTION_DESCRIPTION+"\n\n"+
                 "\t--debug                                   "+tr("Print debugging messages to console")+"\n\n"+
                 "\t--skip-plugins                            "+tr("Skip loading plugins")+"\n\n"+
@@ -730 +732 @@
         Level logLevel = args.getLogLevel();
         Logging.setLogLevel(logLevel);
-        if (!args.showVersion() && !args.showHelp()) {
+        if (!args.hasOption(Option.VERSION) && !args.hasOption(Option.STATUS_REPORT) && !args.showHelp()) {
             Logging.info(tr("Log level is at {0} ({1}, {2})", logLevel.getLocalizedName(), logLevel.getName(), logLevel.intValue()));
         }
@@ -772 +774 @@
         Config.setUrlsProvider(JosmUrls.getInstance());
 
-        if (args.showVersion()) {
+        if (args.hasOption(Option.VERSION)) {
             System.out.println(Version.getInstance().getAgentString());
+            return;
+        } else if (args.hasOption(Option.STATUS_REPORT)) {
+            System.out.println(ShowStatusReportAction.getReportHeader());
             return;
         } else if (args.showHelp()) {

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

@@ -35 +35 @@
         /** --version                                  Displays the JOSM version and exits */
         VERSION(false),
+        /** {@code --status-report} Show status report with useful information that can be attached to bugs */
+        STATUS_REPORT(false),
         /** --debug                                    Print debugging messages to console */
         DEBUG(false),