Changeset 11654 in josm

Timestamp:

2017-03-03T22:37:42+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14450 - Cannot add local imagery to toolbar

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• gui/ImageryMenu.java (modified) (3 diffs)
• gui/preferences/ToolbarPreferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -64 +64 @@
      */
     public AddImageryLayerAction(ImageryInfo info) {
-        super(info.getMenuName(), /* ICON */"imagery_menu", tr("Add imagery layer {0}", info.getName()), null, false, false);
-        putValue("toolbar", "imagery_" + info.getToolbarName());
+        super(info.getMenuName(), /* ICON */"imagery_menu", tr("Add imagery layer {0}", info.getName()), null,
+                true, "imagery_" + info.getToolbarName(), false);
         putValue("help", ht("/Preferences/Imagery"));
         setTooltip(info.getToolTipText().replaceAll("</?html>", ""));
@@ -203 +203 @@
         }
     }
+
+    @Override
+    public String toString() {
+        return "AddImageryLayerAction [info=" + info + ']';
+    }
 }

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

@@ -15 +15 @@
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 
 import javax.swing.Action;
@@ -264 +265 @@
 
     /**
-     * Remove all the items in @field dynamicItems collection
+     * Remove all the items in dynamic items collection
      * @since 5803
      */
@@ -270 +271 @@
         for (Object item : dynamicItems) {
             if (item instanceof JMenuItem) {
+                Optional.ofNullable(((JMenuItem) item).getAction()).ifPresent(Main.toolbar::unregister);
                 remove((JMenuItem) item);
-            }
-            if (item instanceof MenuComponent) {
+            } else if (item instanceof MenuComponent) {
                 remove((MenuComponent) item);
-            }
-            if (item instanceof Component) {
+            } else if (item instanceof Component) {
                 remove((Component) item);
             }

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -939 +939 @@
                 selected.addElement(actionDefinition);
             }
+            actionsTreeModel.reload();
         }
 
@@ -1077 +1078 @@
 
     /**
+     * Registers an action to the toolbar preferences.
      * @param action Action to register
      * @return The parameter (for better chaining)
@@ -1096 +1098 @@
         }
         return action;
+    }
+
+    /**
+     * Unregisters an action from the toolbar preferences.
+     * @param action Action to unregister
+     * @return The removed action, or null
+     * @since 11654
+     */
+    public Action unregister(Action action) {
+        String toolbar = (String) action.getValue("toolbar");
+        if (toolbar != null) {
+            return regactions.remove(toolbar);
+        }
+        return null;
     }