Changeset 4613 in josm for trunk/src/org

Timestamp:

2011-11-26T21:53:31+01:00 (12 years ago)

Author:

bastiK

Message:

see #6974 - fix problem caused by preference rework

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (1 diff)
• gui/preferences/ToolbarPreferences.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -306 +306 @@
             String res = actionParser.saveAction(aDef);
             
-            Collection<String> t = new LinkedList<String>(Main.pref.getCollection("toolbar"));
-            if (t!=null) {
-                // add custom search button to toolbar preferences
-                if (!t.contains(res)) t.add(res);
-                Main.pref.putCollection("toolbar", t);
-                Main.toolbar.refreshToolbarControl();
-            }
+            Collection<String> t = new LinkedList<String>(ToolbarPreferences.getToolString());
+            // add custom search button to toolbar preferences
+            if (!t.contains(res)) t.add(res);
+            Main.pref.putCollection("toolbar", t);
+            Main.toolbar.refreshToolbarControl();
         }
         return initialValues;

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

@@ -876 +876 @@
     "tagginggroup_Man Made/Man Made"};
 
-    private static Collection<String> getToolString() {
+    public static Collection<String> getToolString() {
 
         Collection<String> toolStr = Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));