Changeset 14147 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-08-12T15:16:18+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - code refactoring - move getAllPrefix* methods from Preferences to AbstractPreferences

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (3 diffs)
• spi/preferences/AbstractPreferences.java (modified) (2 diffs)

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

@@ -21 +21 @@
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -48 +46 @@
 import org.openstreetmap.josm.spi.preferences.ListSetting;
 import org.openstreetmap.josm.spi.preferences.Setting;
-import org.openstreetmap.josm.spi.preferences.StringSetting;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ListenerList;
@@ -286 +283 @@
 
     /**
-     * Gets all normal (string) settings that have a key starting with the prefix
-     * @param prefix The start of the key
-     * @return The key names of the settings
-     */
-    public synchronized Map<String, String> getAllPrefix(final String prefix) {
-        final Map<String, String> all = new TreeMap<>();
-        for (final Entry<String, Setting<?>> e : settingsMap.entrySet()) {
-            if (e.getKey().startsWith(prefix) && (e.getValue() instanceof StringSetting)) {
-                all.put(e.getKey(), ((StringSetting) e.getValue()).getValue());
-            }
-        }
-        return all;
-    }
-
-    /**
-     * Gets all list settings that have a key starting with the prefix
-     * @param prefix The start of the key
-     * @return The key names of the list settings
-     */
-    public synchronized List<String> getAllPrefixCollectionKeys(final String prefix) {
-        final List<String> all = new LinkedList<>();
-        for (Map.Entry<String, Setting<?>> entry : settingsMap.entrySet()) {
-            if (entry.getKey().startsWith(prefix) && entry.getValue() instanceof ListSetting) {
-                all.add(entry.getKey());
-            }
-        }
-        return all;
-    }
-
-    /**
      * Get all named colors, including customized and the default ones.
      * @return a map of all named colors (maps preference key to {@link ColorInfo})

trunk/src/org/openstreetmap/josm/spi/preferences/AbstractPreferences.java

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
 
 import org.openstreetmap.josm.tools.Logging;
@@ -148 +151 @@
      */
     public abstract <T extends Setting<?>> T getSetting(String key, T def, Class<T> klass);
+
+    /**
+     * Gets all normal (string) settings that have a key starting with the prefix
+     * @param prefix The start of the key
+     * @return The key names of the settings
+     */
+    public Map<String, String> getAllPrefix(String prefix) {
+        final Map<String, String> all = new TreeMap<>();
+        for (final Entry<String, Setting<?>> e : getAllSettings().entrySet()) {
+            if (e.getKey().startsWith(prefix) && (e.getValue() instanceof StringSetting)) {
+                all.put(e.getKey(), ((StringSetting) e.getValue()).getValue());
+            }
+        }
+        return all;
+    }
+
+    /**
+     * Gets all list settings that have a key starting with the prefix
+     * @param prefix The start of the key
+     * @return The key names of the list settings
+     */
+    public List<String> getAllPrefixCollectionKeys(String prefix) {
+        final List<String> all = new LinkedList<>();
+        for (Entry<String, Setting<?>> entry : getAllSettings().entrySet()) {
+            if (entry.getKey().startsWith(prefix) && entry.getValue() instanceof ListSetting) {
+                all.add(entry.getKey());
+            }
+        }
+        return all;
+    }
 }