Changeset 5733 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-02-20T18:34:07+01:00 (12 years ago)

Author:

bastiK

Message:

fixed #8446 - Can't put imagery sources in the toolbar anymore after r5728

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ImageryMenu.java (modified) (2 diffs)
• preferences/imagery/ImageryPreference.java (modified) (1 diff)

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

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -106 +107 @@
     }
 
-    protected void refreshImageryMenu() {
+    /**
+     * Refresh imagery menu.
+     *
+     * Outside this class only called in {@link ImageryPreference#initialize()}.
+     * (In order to have actions ready for the toolbar, see #8446.)
+     */
+    public void refreshImageryMenu() {
         removeAll();
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -829 +829 @@
         ImageryLayerInfo.instance.load();
         OffsetBookmark.loadBookmarks();
+        Main.main.menu.imageryMenu.refreshImageryMenu();
         Main.main.menu.imageryMenu.refreshOffsetMenu();
     }