Changeset 1349 in josm


Ignore:
Timestamp:
2009-01-31T14:17:49+01:00 (11 years ago)
Author:
stoecker
Message:

fixed #2094, #2091

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

    r1346 r1349  
    118118            {
    119119                x.printStackTrace(); // SAXException does not chain correctly
    120                 throw new SAXException(tr("NullPointerException, possibly some missing tags."), x);
     120                throw new SAXException(tr("Null pointer exception, possibly some missing tags."), x);
    121121            }
    122122        }
  • trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

    r1343 r1349  
    101101     */
    102102    private Map<String, Action> actions = new HashMap<String, Action>();
     103    private Map<String, Action> regactions = new HashMap<String, Action>();
    103104
    104105    private DefaultListModel selected = new DefaultListModel();
     
    383384        rootActionsNode.removeAllChildren();
    384385        loadAction(rootActionsNode, Main.main.menu);
     386        for(Map.Entry<String, Action> a : regactions.entrySet())
     387        {
     388            if(actions.get(a.getKey()) == null)
     389                rootActionsNode.add(new DefaultMutableTreeNode(a.getValue()));
     390        }
    385391        rootActionsNode.add(new DefaultMutableTreeNode(null));
    386392        actionsTree.updateUI();
     
    391397    private static final String[] deftoolbar = {"open", "save", "exportgpx", "|",
    392398    "download", "upload", "|", "undo", "redo", "|", "preference"};
     399
    393400    private Collection<String> getToolString() {
    394401        return Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));
     
    425432     */
    426433    public Action register(Action action) {
    427         actions.put((String) action.getValue("toolbar"), action);
     434        regactions.put((String) action.getValue("toolbar"), action);
    428435        return action;
    429436    }
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r1345 r1349  
    377377            if(locale_text == null)
    378378                locale_text = text == null ? tr("More information about this feature") : tr(text);
    379             JButton b = new JButton(locale_text);
    380             b.addActionListener(new ActionListener(){
    381                 public void actionPerformed(ActionEvent e) {
    382                     OpenBrowser.displayUrl(locale_href != null ? locale_href : href);
    383                 }
    384             });
    385379            p.add(new UrlLabel(locale_href, locale_text), GBC.eol().anchor(GBC.WEST));
    386380        }
Note: See TracChangeset for help on using the changeset viewer.