Changeset 10899 in josm

Timestamp:

2016-08-25T23:21:10+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13318 - Clean up program startup (parameters, logging) - patch by michael2402 - gsoc-core

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (modified) (39 diffs)
• src/org/openstreetmap/josm/gui/MainApplication.java (modified) (13 diffs)
• src/org/openstreetmap/josm/gui/ProgramArguments.java (added)
• src/org/openstreetmap/josm/tools/Logging.java (added)
• src/org/openstreetmap/josm/tools/bugreport/BugReport.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/MainTest.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/LoggingTest.java (added)

trunk/src/org/openstreetmap/josm/Main.java

@@ -35 +35 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
 
 import javax.swing.Action;
@@ -74 +70 @@
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.gui.GettingStarted;
-import org.openstreetmap.josm.gui.MainApplication.Option;
 import org.openstreetmap.josm.gui.MainFrame;
 import org.openstreetmap.josm.gui.MainMenu;
@@ -80 +75 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapFrameListener;
+import org.openstreetmap.josm.gui.ProgramArguments;
+import org.openstreetmap.josm.gui.ProgramArguments.Option;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
@@ -104 +101 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
@@ -219 +217 @@
     protected static final Map<String, Throwable> NETWORK_ERRORS = new HashMap<>();
 
-    // First lines of last 5 error and warning messages, used for bug reports
-    private static final List<String> ERRORS_AND_WARNINGS = Collections.<String>synchronizedList(new ArrayList<String>());
-
     private static final Set<OnlineResource> OFFLINE_RESOURCES = EnumSet.noneOf(OnlineResource.class);
 
@@ -227 +222 @@
      * Logging level (5 = trace, 4 = debug, 3 = info, 2 = warn, 1 = error, 0 = none).
      * @since 6248
-     */
+     * @deprecated Use {@link Logging} class.
+     */
+    @Deprecated
     public static int logLevel = 3;
 
@@ -235 +232 @@
      */
     protected static final MainPanel mainPanel = new MainPanel(getLayerManager());
-
-    private static void rememberWarnErrorMsg(String msg) {
-        // Only remember first line of message
-        int idx = msg.indexOf('\n');
-        if (idx > 0) {
-            ERRORS_AND_WARNINGS.add(msg.substring(0, idx));
-        } else {
-            ERRORS_AND_WARNINGS.add(msg);
-        }
-        // Only keep 10 lines to avoid memory leak
-        while (ERRORS_AND_WARNINGS.size() > 10) {
-            ERRORS_AND_WARNINGS.remove(0);
-        }
-    }
 
     /**
@@ -256 +239 @@
      */
     public static final Collection<String> getLastErrorAndWarnings() {
-        return Collections.unmodifiableList(ERRORS_AND_WARNINGS);
+        return Logging.getLastErrorAndWarnings();
     }
 
@@ -264 +247 @@
      */
     public static void clearLastErrorAndWarnings() {
-        ERRORS_AND_WARNINGS.clear();
+        Logging.clearLastErrorAndWarnings();
     }
 
@@ -273 +256 @@
      */
     public static void error(String msg) {
-        if (logLevel < 1)
-            return;
-        if (msg != null && !msg.isEmpty()) {
-            System.err.println(tr("ERROR: {0}", msg));
-            rememberWarnErrorMsg("E: "+msg);
-        }
+        Logging.error(msg);
     }
 
@@ -286 +264 @@
      */
     public static void warn(String msg) {
-        if (logLevel < 2)
-            return;
-        if (msg != null && !msg.isEmpty()) {
-            System.err.println(tr("WARNING: {0}", msg));
-            rememberWarnErrorMsg("W: "+msg);
-        }
+        Logging.warn(msg);
     }
 
@@ -299 +272 @@
      */
     public static void info(String msg) {
-        if (logLevel < 3)
-            return;
-        if (msg != null && !msg.isEmpty()) {
-            System.out.println(tr("INFO: {0}", msg));
-        }
+        Logging.info(msg);
     }
 
@@ -311 +280 @@
      */
     public static void debug(String msg) {
-        if (logLevel < 4)
-            return;
-        if (msg != null && !msg.isEmpty()) {
-            System.out.println(tr("DEBUG: {0}", msg));
-        }
+        Logging.debug(msg);
     }
 
@@ -323 +288 @@
      */
     public static void trace(String msg) {
-        if (logLevel < 5)
-            return;
-        if (msg != null && !msg.isEmpty()) {
-            System.out.print("TRACE: ");
-            System.out.println(msg);
-        }
+        Logging.trace(msg);
     }
 
@@ -338 +298 @@
      */
     public static boolean isDebugEnabled() {
-        return logLevel >= 4;
+        return Logging.isLoggingEnabled(Logging.LEVEL_DEBUG);
     }
 
@@ -348 +308 @@
      */
     public static boolean isTraceEnabled() {
-        return logLevel >= 5;
+        return Logging.isLoggingEnabled(Logging.LEVEL_TRACE);
     }
 
@@ -359 +319 @@
      */
     public static void error(String msg, Object... objects) {
-        error(MessageFormat.format(msg, objects));
+        Logging.error(msg, objects);
     }
 
@@ -369 +329 @@
      */
     public static void warn(String msg, Object... objects) {
-        warn(MessageFormat.format(msg, objects));
+        Logging.warn(msg, objects);
     }
 
@@ -379 +339 @@
      */
     public static void info(String msg, Object... objects) {
-        info(MessageFormat.format(msg, objects));
+        Logging.info(msg, objects);
     }
 
@@ -389 +349 @@
      */
     public static void debug(String msg, Object... objects) {
-        debug(MessageFormat.format(msg, objects));
+        Logging.debug(msg, objects);
     }
 
@@ -399 +359 @@
      */
     public static void trace(String msg, Object... objects) {
-        trace(MessageFormat.format(msg, objects));
+        Logging.trace(msg, objects);
     }
 
@@ -408 +368 @@
      */
     public static void error(Throwable t) {
-        error(t, true);
+        Logging.logWithStackTrace(Logging.LEVEL_ERROR, t);
     }
 
@@ -417 +377 @@
      */
     public static void warn(Throwable t) {
-        warn(t, true);
+        Logging.logWithStackTrace(Logging.LEVEL_WARN, t);
     }
 
@@ -426 +386 @@
      */
     public static void debug(Throwable t) {
-        debug(getErrorMessage(t));
+        Logging.log(Logging.LEVEL_DEBUG, t);
     }
 
@@ -435 +395 @@
      */
     public static void trace(Throwable t) {
-        trace(getErrorMessage(t));
+        Logging.log(Logging.LEVEL_TRACE, t);
     }
 
@@ -445 +405 @@
      */
     public static void error(Throwable t, boolean stackTrace) {
-        error(getErrorMessage(t));
         if (stackTrace) {
-            t.printStackTrace();
+            Logging.log(Logging.LEVEL_ERROR, t);
+        } else {
+            Logging.logWithStackTrace(Logging.LEVEL_ERROR, t);
         }
     }
@@ -458 +419 @@
      */
     public static void error(Throwable t, String message) {
-        warn(message + ' ' + getErrorMessage(t));
+        Logging.log(Logging.LEVEL_ERROR, message, t);
     }
 
@@ -468 +429 @@
      */
     public static void warn(Throwable t, boolean stackTrace) {
-        warn(getErrorMessage(t));
         if (stackTrace) {
-            t.printStackTrace();
+            Logging.log(Logging.LEVEL_WARN, t);
+        } else {
+            Logging.logWithStackTrace(Logging.LEVEL_WARN, t);
         }
     }
@@ -481 +443 @@
      */
     public static void warn(Throwable t, String message) {
-        warn(message + ' ' + getErrorMessage(t));
+        Logging.log(Logging.LEVEL_WARN, message, t);
     }
 
@@ -493 +455 @@
         if (t == null) {
             return null;
-        }
-        StringBuilder sb = new StringBuilder(t.getClass().getName());
-        String msg = t.getMessage();
-        if (msg != null) {
-            sb.append(": ").append(msg.trim());
-        }
-        Throwable cause = t.getCause();
-        if (cause != null && !cause.equals(t)) {
-            sb.append(". ").append(tr("Cause: ")).append(getErrorMessage(cause));
-        }
-        return sb.toString();
+        } else {
+            return Logging.getErrorMessage(t);
+        }
     }
 
@@ -571 +525 @@
         fileWatcher.start();
 
-        new InitializationTask(tr("Executing platform startup hook")) {
-            @Override
-            public void initialize() {
-                platform.startupHook();
-            }
-        }.call();
-
-        new InitializationTask(tr("Building main menu")) {
-
-            @Override
-            public void initialize() {
-                initializeMainWindow();
-            }
-        }.call();
+        new InitializationTask(tr("Executing platform startup hook"), platform::startupHook).call();
+
+        new InitializationTask(tr("Building main menu"), this::initializeMainWindow).call();
 
         undoRedo.addCommandQueueListener(redoUndoListener);
@@ -597 +540 @@
         List<Callable<Void>> tasks = new ArrayList<>();
 
-        tasks.add(new InitializationTask(tr("Initializing OSM API")) {
-
-            @Override
-            public void initialize() {
+        tasks.add(new InitializationTask(tr("Initializing OSM API"), () -> {
                 // We try to establish an API connection early, so that any API
                 // capabilities are already known to the editor instance. However
@@ -609 +549 @@
                     Main.warn(getErrorMessage(Utils.getRootCause(e)));
                 }
-            }
-        });
-
-        tasks.add(new InitializationTask(tr("Initializing validator")) {
-
-            @Override
-            public void initialize() {
-                OsmValidator.initialize();
-            }
-        });
-
-        tasks.add(new InitializationTask(tr("Initializing presets")) {
-
-            @Override
-            public void initialize() {
-                TaggingPresets.initialize();
-            }
-        });
-
-        tasks.add(new InitializationTask(tr("Initializing map styles")) {
-
-            @Override
-            public void initialize() {
-                MapPaintPreference.initialize();
-            }
-        });
-
-        tasks.add(new InitializationTask(tr("Loading imagery preferences")) {
-
-            @Override
-            public void initialize() {
-                ImageryPreference.initialize();
-            }
-        });
+            }));
+
+        tasks.add(new InitializationTask(tr("Initializing validator"), OsmValidator::initialize));
+
+        tasks.add(new InitializationTask(tr("Initializing presets"), TaggingPresets::initialize));
+
+        tasks.add(new InitializationTask(tr("Initializing map styles"), MapPaintPreference::initialize));
+
+        tasks.add(new InitializationTask(tr("Loading imagery preferences"), ImageryPreference::initialize));
 
         try {
-            final ExecutorService service = Executors.newFixedThreadPool(
+            ExecutorService service = Executors.newFixedThreadPool(
                     Runtime.getRuntime().availableProcessors(), Utils.newThreadFactory("main-init-%d", Thread.NORM_PRIORITY));
             for (Future<Void> i : service.invokeAll(tasks)) {
@@ -658 +573 @@
         FeatureAdapter.registerBrowserAdapter(OpenBrowser::displayUrl);
         FeatureAdapter.registerTranslationAdapter(I18n.getTranslationAdapter());
-        FeatureAdapter.registerLoggingAdapter(name -> {
-                Logger logger = Logger.getAnonymousLogger();
-                logger.setUseParentHandlers(false);
-                logger.setLevel(Level.ALL);
-                if (logger.getHandlers().length == 0) {
-                    logger.addHandler(new Handler() {
-                        @Override
-                        public void publish(LogRecord record) {
-                            String msg = MessageFormat.format(record.getMessage(), record.getParameters());
-                            if (record.getLevel().intValue() >= Level.SEVERE.intValue()) {
-                                Main.error(msg);
-                            } else if (record.getLevel().intValue() >= Level.WARNING.intValue()) {
-                                Main.warn(msg);
-                            } else if (record.getLevel().intValue() >= Level.INFO.intValue()) {
-                                Main.info(msg);
-                            } else if (record.getLevel().intValue() >= Level.FINE.intValue()) {
-                                Main.debug(msg);
-                            } else {
-                                Main.trace(msg);
-                            }
-                        }
-
-                        @Override
-                        public void flush() {
-                            // Do nothing
-                        }
-
-                        @Override
-                        public void close() {
-                            // Do nothing
-                        }
-                    });
-                }
-                return logger;
-            });
-
-        new InitializationTask(tr("Updating user interface")) {
-
-            @Override
-            public void initialize() {
-                toolbar.refreshToolbarControl();
-                toolbar.control.updateUI();
-                contentPanePrivate.updateUI();
-            }
-        }.call();
+        FeatureAdapter.registerLoggingAdapter(name -> Logging.getLogger());
+
+        new InitializationTask(tr("Updating user interface"), () -> {
+            toolbar.refreshToolbarControl();
+            toolbar.control.updateUI();
+            contentPanePrivate.updateUI();
+        }).call();
     }
 
@@ -713 +590 @@
     }
 
-    private abstract static class InitializationTask implements Callable<Void> {
+    private static class InitializationTask implements Callable<Void> {
 
         private final String name;
-
-        protected InitializationTask(String name) {
+        private Runnable task;
+
+        protected InitializationTask(String name, Runnable task) {
             this.name = name;
-        }
-
-        public abstract void initialize();
+            this.task = task;
+        }
 
         @Override
@@ -729 +606 @@
                 status = initListener.updateStatus(name);
             }
-            initialize();
+            task.run();
             if (initListener != null) {
                 initListener.finish(status);
@@ -951 +828 @@
      * @param args The parsed argument list.
      */
-    public static void preConstructorInit(Map<Option, Collection<String>> args) {
+    public static void preConstructorInit(ProgramArguments args) {
         ProjectionPreference.setProjection();
 
@@ -1018 +895 @@
     }
 
-    protected static void postConstructorProcessCmdLine(Map<Option, Collection<String>> args) {
-        if (args.containsKey(Option.DOWNLOAD)) {
-            List<File> fileList = new ArrayList<>();
-            for (String s : args.get(Option.DOWNLOAD)) {
-                DownloadParamType.paramType(s).download(s, fileList);
-            }
-            if (!fileList.isEmpty()) {
-                OpenFileAction.openFiles(fileList, true);
-            }
-        }
-        if (args.containsKey(Option.DOWNLOADGPS)) {
-            for (String s : args.get(Option.DOWNLOADGPS)) {
-                DownloadParamType.paramType(s).downloadGps(s);
-            }
-        }
-        if (args.containsKey(Option.SELECTION)) {
-            for (String s : args.get(Option.SELECTION)) {
-                SearchAction.search(s, SearchAction.SearchMode.add);
-            }
+    protected static void postConstructorProcessCmdLine(ProgramArguments args) {
+        List<File> fileList = new ArrayList<>();
+        for (String s : args.get(Option.DOWNLOAD)) {
+            DownloadParamType.paramType(s).download(s, fileList);
+        }
+        if (!fileList.isEmpty()) {
+            OpenFileAction.openFiles(fileList, true);
+        }
+        for (String s : args.get(Option.DOWNLOADGPS)) {
+            DownloadParamType.paramType(s).downloadGps(s);
+        }
+        for (String s : args.get(Option.SELECTION)) {
+            SearchAction.search(s, SearchAction.SearchMode.add);
         }
     }
@@ -1489 +1360 @@
             if (!windowSwitchListeners.isEmpty()) {
                 for (Window w : Window.getWindows()) {
-                    if (w.isShowing()) {
-                        if (!Arrays.asList(w.getWindowListeners()).contains(getInstance())) {
-                            w.addWindowListener(getInstance());
-                        }
+                    if (w.isShowing() && !Arrays.asList(w.getWindowListeners()).contains(getInstance())) {
+                        w.addWindowListener(getInstance());
                     }
                 }

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

@@ -25 +25 @@
 import java.security.Policy;
 import java.security.cert.CertificateException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.EnumMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.logging.Level;
 
 import javax.swing.JOptionPane;
@@ -46 +45 @@
 import org.openstreetmap.josm.data.CustomConfigurator;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.ProgramArguments.Option;
 import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
@@ -63 +63 @@
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
-
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
 
 /**
@@ -171 +170 @@
 
     /**
-     * JOSM command line options.
-     * @see <a href="https://josm.openstreetmap.de/wiki/Help/CommandLineOptions">Help/CommandLineOptions</a>
-     * @since 5279
-     */
-    public enum Option {
-        /** --help|-h                                  Show this help */
-        HELP(false),
-        /** --version                                  Displays the JOSM version and exits */
-        VERSION(false),
-        /** --debug                                    Print debugging messages to console */
-        DEBUG(false),
-        /** --trace                                    Print detailed debugging messages to console */
-        TRACE(false),
-        /** --language=&lt;language&gt;                Set the language */
-        LANGUAGE(true),
-        /** --reset-preferences                        Reset the preferences to default */
-        RESET_PREFERENCES(false),
-        /** --load-preferences=&lt;url-to-xml&gt;      Changes preferences according to the XML file */
-        LOAD_PREFERENCES(true),
-        /** --set=&lt;key&gt;=&lt;value&gt;            Set preference key to value */
-        SET(true),
-        /** --geometry=widthxheight(+|-)x(+|-)y        Standard unix geometry argument */
-        GEOMETRY(true),
-        /** --no-maximize                              Do not launch in maximized mode */
-        NO_MAXIMIZE(false),
-        /** --maximize                                 Launch in maximized mode */
-        MAXIMIZE(false),
-        /** --download=minlat,minlon,maxlat,maxlon     Download the bounding box <br>
-         *  --download=&lt;URL&gt;                     Download the location at the URL (with lat=x&amp;lon=y&amp;zoom=z) <br>
-         *  --download=&lt;filename&gt;                Open a file (any file type that can be opened with File/Open) */
-        DOWNLOAD(true),
-        /** --downloadgps=minlat,minlon,maxlat,maxlon  Download the bounding box as raw GPS <br>
-         *  --downloadgps=&lt;URL&gt;                  Download the location at the URL (with lat=x&amp;lon=y&amp;zoom=z) as raw GPS */
-        DOWNLOADGPS(true),
-        /** --selection=&lt;searchstring&gt;           Select with the given search */
-        SELECTION(true),
-        /** --offline=&lt;osm_api|josm_website|all&gt; Disable access to the given resource(s), delimited by comma */
-        OFFLINE(true),
-        /** --skip-plugins */
-        SKIP_PLUGINS(false);
-
-        private final String name;
-        private final boolean requiresArg;
-
-        Option(boolean requiresArgument) {
-            this.name = name().toLowerCase(Locale.ENGLISH).replace('_', '-');
-            this.requiresArg = requiresArgument;
-        }
-
-        /**
-         * Replies the option name
-         * @return The option name, in lowercase
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Determines if this option requires an argument.
-         * @return {@code true} if this option requires an argument, {@code false} otherwise
-         */
-        public boolean requiresArgument() {
-            return requiresArg;
-        }
-    }
-
-    /**
-     * Builds the command-line argument map.
-     * @param args command-line arguments array
-     * @return command-line argument map
-     */
-    public static Map<Option, Collection<String>> buildCommandLineArgumentMap(String ... args) {
-
-        List<LongOpt> los = new ArrayList<>();
-        for (Option o : Option.values()) {
-            los.add(new LongOpt(o.getName(), o.requiresArgument() ? LongOpt.REQUIRED_ARGUMENT : LongOpt.NO_ARGUMENT, null, 0));
-        }
-
-        Getopt g = new Getopt("JOSM", args, "hv", los.toArray(new LongOpt[los.size()]));
-
-        Map<Option, Collection<String>> argMap = new EnumMap<>(Option.class);
-
-        int c;
-        while ((c = g.getopt()) != -1) {
-            Option opt;
-            switch (c) {
-                case 'h':
-                    opt = Option.HELP;
-                    break;
-                case 'v':
-                    opt = Option.VERSION;
-                    break;
-                case 0:
-                    opt = Option.values()[g.getLongind()];
-                    break;
-                default:
-                    opt = null;
-            }
-            if (opt != null) {
-                Collection<String> values = argMap.get(opt);
-                if (values == null) {
-                    values = new ArrayList<>();
-                    argMap.put(opt, values);
-                }
-                values.add(g.getOptarg());
-            } else
-                throw new IllegalArgumentException("Invalid option: "+c);
-        }
-        // positional arguments are a shortcut for the --download ... option
-        for (int i = g.getOptind(); i < args.length; ++i) {
-            Collection<String> values = argMap.get(Option.DOWNLOAD);
-            if (values == null) {
-                values = new ArrayList<>();
-                argMap.put(Option.DOWNLOAD, values);
-            }
-            values.add(args[i]);
-        }
-
-        return argMap;
-    }
-
-    /**
      * Main application Startup
      * @param argArray Command-line arguments
@@ -300 +177 @@
 
         // construct argument table
-        Map<Option, Collection<String>> args = null;
+        ProgramArguments args = null;
         try {
-            args = buildCommandLineArgumentMap(argArray);
+            args = new ProgramArguments(argArray);
         } catch (IllegalArgumentException e) {
             System.exit(1);
@@ -308 +185 @@
         }
 
-        final boolean languageGiven = args.containsKey(Option.LANGUAGE);
-
-        if (languageGiven) {
-            I18n.set(args.get(Option.LANGUAGE).iterator().next());
-        }
-
-        if (args.containsKey(Option.TRACE)) {
-            // Enable JOSM debug level
-            logLevel = 5;
-            // Enable debug in OAuth signpost via system preference, but only at trace level
-            Utils.updateSystemProperty("debug", "true");
-            Main.info(tr("Enabled detailed debug level (trace)"));
-        } else if (args.containsKey(Option.DEBUG)) {
-            // Enable JOSM debug level
-            logLevel = 4;
-            Main.info(tr("Printing debugging messages to console"));
-        }
+        Level logLevel = args.getLogLevel();
+        Logging.setLogLevel(logLevel);
+        Main.info(tr("Log level is at ", logLevel));
+
+        Optional<String> language = args.getSingle(Option.LANGUAGE);
+        I18n.set(language.orElse(null));
 
         Policy.setPolicy(new Policy() {
@@ -350 +216 @@
         Main.COMMAND_LINE_ARGS.addAll(Arrays.asList(argArray));
 
-        if (args.containsKey(Option.VERSION)) {
+        if (args.showVersion()) {
             System.out.println(Version.getInstance().getAgentString());
             System.exit(0);
-        }
-
-        boolean skipLoadingPlugins = false;
-        if (args.containsKey(Option.SKIP_PLUGINS)) {
-            skipLoadingPlugins = true;
-            Main.info(tr("Plugin loading skipped"));
-        }
-
-        Main.pref.init(args.containsKey(Option.RESET_PREFERENCES));
-
-        if (args.containsKey(Option.SET)) {
-            for (String i : args.get(Option.SET)) {
-                String[] kv = i.split("=", 2);
-                Main.pref.put(kv[0], "null".equals(kv[1]) ? null : kv[1]);
-            }
-        }
-
-        if (!languageGiven) {
-            I18n.set(Main.pref.get("language", null));
-        }
-        Main.pref.updateSystemProperties();
-
-        checkIPv6();
-
-        // asking for help? show help and exit
-        if (args.containsKey(Option.HELP)) {
+        } else if (args.showHelp()) {
             showHelp();
             System.exit(0);
         }
 
+        boolean skipLoadingPlugins = args.hasOption(Option.SKIP_PLUGINS);
+        if (skipLoadingPlugins) {
+            Main.info(tr("Plugin loading skipped"));
+        }
+
+        if (Logging.isLoggingEnabled(Logging.LEVEL_TRACE)) {
+            // Enable debug in OAuth signpost via system preference, but only at trace level
+            Utils.updateSystemProperty("debug", "true");
+            Main.info(tr("Enabled detailed debug level (trace)"));
+        }
+
+        Main.pref.init(args.hasOption(Option.RESET_PREFERENCES));
+
+        args.getPreferencesToSet().forEach(Main.pref::put);
+
+        if (!language.isPresent()) {
+            I18n.set(Main.pref.get("language", null));
+        }
+        Main.pref.updateSystemProperties();
+
+        checkIPv6();
+
+        // asking for help? show help and exit
+        if (args.hasOption(Option.HELP)) {
+            showHelp();
+            System.exit(0);
+        }
+
         processOffline(args);
 
@@ -392 +261 @@
 
         WindowGeometry geometry = WindowGeometry.mainWindow("gui.geometry",
-                args.containsKey(Option.GEOMETRY) ? args.get(Option.GEOMETRY).iterator().next() : null,
-                !args.containsKey(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
+                args.getSingle(Option.GEOMETRY).orElse(null),
+                !args.hasOption(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
         final MainFrame mainFrame = new MainFrame(contentPanePrivate, mainPanel, geometry);
         Main.parent = mainFrame;
 
-        if (args.containsKey(Option.LOAD_PREFERENCES)) {
+        if (args.hasOption(Option.LOAD_PREFERENCES)) {
             CustomConfigurator.XMLCommandProcessor config = new CustomConfigurator.XMLCommandProcessor(Main.pref);
             for (String i : args.get(Option.LOAD_PREFERENCES)) {
@@ -404 +273 @@
                     config.openAndReadXML(is);
                 } catch (IOException ex) {
-                    throw new RuntimeException(ex);
+                    throw BugReport.intercept(ex).put("file", i);
                 }
             }
@@ -467 +336 @@
 
         boolean maximized = Main.pref.getBoolean("gui.maximized", false);
-        if ((!args.containsKey(Option.NO_MAXIMIZE) && maximized) || args.containsKey(Option.MAXIMIZE)) {
+        if ((!args.hasOption(Option.NO_MAXIMIZE) && maximized) || args.hasOption(Option.MAXIMIZE)) {
             mainFrame.setMaximized(true);
         }
@@ -525 +394 @@
     }
 
-    private static void processOffline(Map<Option, Collection<String>> args) {
-        if (args.containsKey(Option.OFFLINE)) {
-            for (String s : args.get(Option.OFFLINE).iterator().next().split(",")) {
+    private static void processOffline(ProgramArguments args) {
+        for (String offlineNames : args.get(Option.OFFLINE)) {
+            for (String s : offlineNames.split(",")) {
                 try {
                     Main.setOffline(OnlineResource.valueOf(s.toUpperCase(Locale.ENGLISH)));
@@ -537 +406 @@
                 }
             }
-            Set<OnlineResource> offline = Main.getOfflineResources();
-            if (!offline.isEmpty()) {
-                Main.warn(trn("JOSM is running in offline mode. This resource will not be available: {0}",
-                        "JOSM is running in offline mode. These resources will not be available: {0}",
-                        offline.size(), offline.size() == 1 ? offline.iterator().next() : Arrays.toString(offline.toArray())));
-            }
+        }
+        Set<OnlineResource> offline = Main.getOfflineResources();
+        if (!offline.isEmpty()) {
+            Main.warn(trn("JOSM is running in offline mode. This resource will not be available: {0}",
+                    "JOSM is running in offline mode. These resources will not be available: {0}",
+                    offline.size(), offline.size() == 1 ? offline.iterator().next() : Arrays.toString(offline.toArray())));
         }
     }
@@ -597 +466 @@
     private static class GuiFinalizationWorker implements Runnable {
 
-        private final Map<Option, Collection<String>> args;
+        private final ProgramArguments args;
         private final DefaultProxySelector proxySelector;
 
-        GuiFinalizationWorker(Map<Option, Collection<String>> args, DefaultProxySelector proxySelector) {
+        GuiFinalizationWorker(ProgramArguments args, DefaultProxySelector proxySelector) {
             this.args = args;
             this.proxySelector = proxySelector;

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

@@ -6 +6 @@
 import java.io.StringWriter;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.actions.ShowStatusReportAction;
@@ -185 +186 @@
      */
     public static String getCallingMethod(int offset) {
+        String className = BugReport.class.getName();
+        String methodName = "getCallingMethod";
+        StackTraceElement found = getCallingMethod(offset, className, methodName::equals);
+        if (found != null) {
+            return found.getClassName().replaceFirst(".*\\.", "") + '#' + found.getMethodName();
+        } else {
+            return "?";
+        }
+    }
+
+    /**
+     * Find the method that called the given method on the current stack trace.
+     * @param offset
+     *           How many methods to look back in the stack trace. 1 gives the method calling this method, 0 gives you getCallingMethod().
+     * @param className The name of the class to search for
+     * @param methodName The name of the method to search for
+     * @return The class and method name or null if it is unknown.
+     */
+    public static StackTraceElement getCallingMethod(int offset, String className, Predicate<String> methodName) {
         StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-        String className = BugReport.class.getName();
         for (int i = 0; i < stackTrace.length - offset; i++) {
             StackTraceElement element = stackTrace[i];
-            if (className.equals(element.getClassName()) && "getCallingMethod".equals(element.getMethodName())) {
+            if (className.equals(element.getClassName()) && methodName.test(element.getMethodName())) {
                 StackTraceElement toReturn = stackTrace[i + offset];
-                return toReturn.getClassName().replaceFirst(".*\\.", "") + '#' + toReturn.getMethodName();
+                return toReturn;
             }
         }
-        return "?";
+        return null;
     }
 

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -22 +22 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -99 +100 @@
         Main.platform.preStartupHook();
 
-        Main.logLevel = 3;
+        Logging.setLogLevel(Logging.LEVEL_INFO);
         Main.pref.init(false);
         String url = Main.pref.get("osm-server.url");

trunk/test/unit/org/openstreetmap/josm/MainTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -12 +11 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main.DownloadParamType;
-import org.openstreetmap.josm.gui.MainApplication;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -43 +41 @@
 
     /**
-     * Unit test of {@code Main#preConstructorInit}.
-     */
-    @Test
-    public void testPreConstructorInit() {
-        Main.preConstructorInit(MainApplication.buildCommandLineArgumentMap(new String[0]));
-        Main.preConstructorInit(MainApplication.buildCommandLineArgumentMap(new String[]{"--geometry=400x300+10+5", "--no-maximize"}));
-        //assertEquals(new WindowGeometry(new Point(10, 5), new Dimension(400, 300)), Main.geometry); // FIXME see #12927
-    }
-
-    /**
      * Unit tests on log messages.
      */
@@ -78 +66 @@
         assertTrue(warnings.contains("W: Warning message on one line"));
         assertTrue(warnings.contains("W: First line of warning message on several lines"));
-
-        int defaultLevel = Main.logLevel;
-
-        // Check levels
-        Main.logLevel = 5;
-        assertTrue(Main.isTraceEnabled());
-        assertTrue(Main.isDebugEnabled());
-
-        Main.logLevel = 4;
-        assertFalse(Main.isTraceEnabled());
-        assertTrue(Main.isDebugEnabled());
-
-        Main.logLevel = 3;
-        assertFalse(Main.isTraceEnabled());
-        assertFalse(Main.isDebugEnabled());
-
-        Main.logLevel = defaultLevel;
     }
 }

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -20 +20 @@
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -182 +183 @@
         TimeZone.setDefault(DateUtils.UTC);
         // Set log level to info
-        Main.logLevel = 3;
+        Logging.setLogLevel(Logging.LEVEL_INFO);
 
         // Set up i18n