Changeset 12150 in josm

Timestamp:

2017-05-15T10:07:09+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14792 - fix --version handling: restore a single main() method

File:

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

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

@@ -88 +88 @@
      */
     private static final List<String> COMMAND_LINE_ARGS = new ArrayList<>();
-
-    private static ProgramArguments args;
-    private static boolean skipLoadingPlugins;
 
     private final MainFrame mainFrame;
@@ -211 +208 @@
      */
     public static void main(final String[] argArray) {
-        // First initializes all stuff that do not require AWT/Swing
-        mainNoGui(argArray);
-        // Then initializes all AWT/Swing stuff
-        mainGui();
-    }
-
-    /**
-     * Initializes all stuff that do not require AWT/Swing.
-     * @param argArray Command-line arguments
-     */
-    private static void mainNoGui(final String[] argArray) {
         I18n.init();
 
+        ProgramArguments args = null;
         // construct argument table
         try {
@@ -274 +261 @@
         COMMAND_LINE_ARGS.addAll(Arrays.asList(argArray));
 
-        skipLoadingPlugins = args.hasOption(Option.SKIP_PLUGINS);
+        boolean skipLoadingPlugins = args.hasOption(Option.SKIP_PLUGINS);
         if (skipLoadingPlugins) {
             Main.info(tr("Plugin loading skipped"));
@@ -299 +286 @@
 
         Main.platform.afterPrefStartupHook();
-    }
-
-    /**
-     * Initializes all AWT/Swing stuff.
-     */
-    private static void mainGui() {
+
         FontsManager.initialize();