Changeset 4900 in josm

Timestamp:

2012-02-04T22:41:17+01:00 (12 years ago)

Author:

stoecker

Message:

fix #7358 - custom shortcuts broken

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• tools/Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -95 +95 @@
     protected final SortedMap<String, String> colornames = new TreeMap<String, String>();
 
-    /** Mapping for list settings. Must not conatin null values */
+    /** Mapping for list settings. Must not contain null values */
     protected final SortedMap<String, List<String>> collectionProperties = new TreeMap<String, List<String>>();
     /** Defaults, can contain null values */
@@ -376 +376 @@
     }
 
-    synchronized public List<String> getAllPrefixKeys(final String prefix) {
+    synchronized public List<String> getAllPrefixCollectionKeys(final String prefix) {
         final List<String> all = new LinkedList<String>();
-        for (final Entry<String,String> e : properties.entrySet()) {
-            if (e.getKey().startsWith(prefix)) {
-                all.add(e.getKey());
+        for (final String e : collectionProperties.keySet()) {
+            if (e.startsWith(prefix)) {
+                all.add(e);
             }
         }

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -314 +314 @@
         // (2) User defined shortcuts
         LinkedList<Shortcut> shortcuts = new LinkedList<Shortcut>();
-        for(String s : Main.pref.getAllPrefixKeys("shortcut.entry.")) {
+        for(String s : Main.pref.getAllPrefixCollectionKeys("shortcut.entry.")) {
             shortcuts.add(new Shortcut(s));
         }