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

Timestamp:

2016-06-20T00:06:54+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13001 - Add MainPanel + some new methods (patch by michael2402, modified) - gsoc-core

File:

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

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

@@ -317 +317 @@
         initApplicationPreferences();
 
+        // Can only be called after preferences are initialized.
+        // We can move this to MainPanel constructor as soon as noone depends on Main#panel any more.
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override
+            public void run() {
+                mainPanel.updateContent();
+            }
+        });
+
         Policy.setPolicy(new Policy() {
             // Permissions for plug-ins loaded when josm is started via webstart
@@ -399 +408 @@
                 args.containsKey(Option.GEOMETRY) ? args.get(Option.GEOMETRY).iterator().next() : null,
                 !args.containsKey(Option.NO_MAXIMIZE) && Main.pref.getBoolean("gui.maximized", false));
-        final MainFrame mainFrame = new MainFrame(contentPanePrivate, geometry);
+        final MainFrame mainFrame = new MainFrame(contentPanePrivate, mainPanel, geometry);
         Main.parent = mainFrame;