Changeset 5138 in josm

Timestamp:

Mar 31, 2012 12:03:59 AM (15 months ago)

Author:

simon04

Message:

see #6964 - initialize main menu first in order to avoid problems (fix problem introduced in r5134)

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (2 diffs)

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

@@ -247 +247 @@
         platform.startupHook();
 
+        if (initListener != null) {
+            initListener.updateStatus(tr("Building main menu"));
+        }
+        contentPanePrivate.add(panel, BorderLayout.CENTER);
+        panel.add(gettingStarted, BorderLayout.CENTER);
+        menu = new MainMenu();
+
+        undoRedo.addCommandQueueListener(redoUndoListener);
+
+        // creating toolbar
+        contentPanePrivate.add(toolbar.control, BorderLayout.NORTH);
+
+        registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"),
+                KeyEvent.VK_F1, Shortcut.DIRECT));
+
         // contains several initialization tasks to be executed (in parallel) by a ExecutorService
         List<Callable<Void>> tasks = new ArrayList<Callable<Void>>();
@@ -265 +280 @@
                     // ignore any exception here.
                 }
-                return null;
-            }
-        });
-
-        tasks.add(new Callable<Void>() {
-
-            @Override
-            public Void call() throws Exception {
-                if (initListener != null) {
-                    initListener.updateStatus(tr("Building main menu"));
-                }
-                contentPanePrivate.add(panel, BorderLayout.CENTER);
-                panel.add(gettingStarted, BorderLayout.CENTER);
-                menu = new MainMenu();
-
-                undoRedo.addCommandQueueListener(redoUndoListener);
-
-                // creating toolbar
-                contentPanePrivate.add(toolbar.control, BorderLayout.NORTH);
-
-                registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"),
-                        KeyEvent.VK_F1, Shortcut.DIRECT));
-
                 return null;
             }