Changeset 17637 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

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

Author:

simon04

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (4 diffs)

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()) {