Changeset 1349 in josm for trunk/src/org

Timestamp:

2009-01-31T14:17:49+01:00 (16 years ago)

Author:

stoecker

Message:

fixed #2094, #2091

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• download/PlaceSelection.java (modified) (1 diff)
• preferences/ToolbarPreferences.java (modified) (4 diffs)
• tagging/TaggingPreset.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -118 +118 @@
             {
                 x.printStackTrace(); // SAXException does not chain correctly
-                throw new SAXException(tr("NullPointerException, possibly some missing tags."), x);
+                throw new SAXException(tr("Null pointer exception, possibly some missing tags."), x);
             }
         }

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

@@ -101 +101 @@
      */
     private Map<String, Action> actions = new HashMap<String, Action>();
+    private Map<String, Action> regactions = new HashMap<String, Action>();
 
     private DefaultListModel selected = new DefaultListModel();
@@ -383 +384 @@
         rootActionsNode.removeAllChildren();
         loadAction(rootActionsNode, Main.main.menu);
+        for(Map.Entry<String, Action> a : regactions.entrySet())
+        {
+            if(actions.get(a.getKey()) == null)
+                rootActionsNode.add(new DefaultMutableTreeNode(a.getValue()));
+        }
         rootActionsNode.add(new DefaultMutableTreeNode(null));
         actionsTree.updateUI();
@@ -391 +397 @@
     private static final String[] deftoolbar = {"open", "save", "exportgpx", "|",
     "download", "upload", "|", "undo", "redo", "|", "preference"};
+
     private Collection<String> getToolString() {
         return Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));
@@ -425 +432 @@
      */
     public Action register(Action action) {
-        actions.put((String) action.getValue("toolbar"), action);
+        regactions.put((String) action.getValue("toolbar"), action);
         return action;
     }

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -377 +377 @@
             if(locale_text == null)
                 locale_text = text == null ? tr("More information about this feature") : tr(text);
-            JButton b = new JButton(locale_text);
-            b.addActionListener(new ActionListener(){
-                public void actionPerformed(ActionEvent e) {
-                    OpenBrowser.displayUrl(locale_href != null ? locale_href : href);
-                }
-            });
             p.add(new UrlLabel(locale_href, locale_text), GBC.eol().anchor(GBC.WEST));
         }