Changeset 1393 in josm for trunk/src/org
- Timestamp:
- 2009-02-11T10:24:01+01:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
r1349 r1393 145 145 Icon i; 146 146 if (value != null) { 147 Action action = actions.get(value);147 Action action = getAction((String)value); 148 148 s = (String) action.getValue(Action.NAME); 149 149 i = (Icon) action.getValue(Action.SMALL_ICON); … … 349 349 if (s.equals("|")) 350 350 selected.addElement(null); 351 else { 352 if (actions.get(s) != null) { 353 selected.addElement(s); 354 } 355 } 351 else if (getAction(s) != null) 352 selected.addElement(s); 356 353 } 357 354 } … … 379 376 loadAction(newNode, item); 380 377 } 378 } 379 380 public Action getAction(String s) 381 { 382 Action e = actions.get(s); 383 if(e == null) 384 e = regactions.get(s); 385 return e; 381 386 } 382 387 … … 421 426 t.add("|"); 422 427 else 423 t.add((String)(( actions.get(selected.get(i))).getValue("toolbar")));428 t.add((String)((getAction((String)selected.get(i))).getValue("toolbar"))); 424 429 } 425 430 Main.pref.putCollection("toolbar", t); … … 449 454 control.addSeparator(); 450 455 else 451 control.add( actions.get(s));456 control.add(getAction(s)); 452 457 } 453 458 control.setVisible(control.getComponentCount() != 0);
Note:
See TracChangeset
for help on using the changeset viewer.