Changeset 12987 in josm for trunk/src/org/openstreetmap/josm/spi/preferences

Timestamp:

2017-10-12T16:02:15+02:00 (7 years ago)

Author:

bastiK

Message:

see #15410 - change preferences scheme for named colors - makes runtime color name registry obsolete

Location:

trunk/src/org/openstreetmap/josm/spi/preferences

Files:

• IPreferences.java (modified) (2 diffs)
• ListSetting.java (modified) (1 diff)
• MemoryPreferences.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
@@ -234 +235 @@
     boolean putListOfMaps(String key, List<Map<String, String>> value);
 
+    /**
+     * Get the set of all keys that are mapped to a value in this preferences.
+     * @return the set of all keys
+     */
+    Set<String> getKeySet();
 }

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

@@ -37 +37 @@
     private void consistencyTest() {
         if (value != null && value.contains(null))
-            throw new IllegalArgumentException("Error: Null as list element in preference setting");
+            throw new IllegalArgumentException("Error: Null as list element in preference setting: " + value);
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 /**
@@ -41 +43 @@
 
     @Override
+    public Set<String> getKeySet() {
+        return Collections.unmodifiableSet(settings.keySet());
+    }
+
+    @Override
     public void addPreferenceChangeListener(PreferenceChangedListener listener) {
         // do nothing