Changeset 1393 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-02-11T10:24:01+01:00 (15 years ago)

Author:

stoecker

Message:

fix #2156

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (5 diffs)

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

@@ -145 +145 @@
                 Icon i;
                 if (value != null) {
-                    Action action = actions.get(value);
+                    Action action = getAction((String)value);
                     s = (String) action.getValue(Action.NAME);
                     i = (Icon) action.getValue(Action.SMALL_ICON);
@@ -349 +349 @@
             if (s.equals("|"))
                 selected.addElement(null);
-            else {
-                if (actions.get(s) != null) {
-                    selected.addElement(s);
-                }
-            }
+            else if (getAction(s) != null)
+                selected.addElement(s);
         }
     }
@@ -379 +376 @@
             loadAction(newNode, item);
         }
+    }
+
+    public Action getAction(String s)
+    {
+        Action e = actions.get(s);
+        if(e == null)
+            e = regactions.get(s);
+        return e;
     }
 
@@ -421 +426 @@
                 t.add("|");
             else
-                t.add((String)((actions.get(selected.get(i))).getValue("toolbar")));
+                t.add((String)((getAction((String)selected.get(i))).getValue("toolbar")));
         }
         Main.pref.putCollection("toolbar", t);
@@ -449 +454 @@
                 control.addSeparator();
             else
-                control.add(actions.get(s));
+                control.add(getAction(s));
         }
         control.setVisible(control.getComponentCount() != 0);