Changeset 4634 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

04.12.2011 19:17:56 (6 months ago)

Author:

bastiK

Message:

advanced preference: dialogs to edit complex preference settings (list, list of lists, list of maps) (see #7027)

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (14 diffs)

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

@@ -65 +65 @@
  * accessed using one of the get...() methods. You can use the same preference
  * key in different parts of the code, but the default value must be the same
- * everywhere. null is a legitimate default value.
+ * everywhere. A default value of null means, the setting has been requested, but
+ * no default value was set. This is used in advanced preferences to present a list
+ * off all possible settings.
  *
  * At the moment, there is no such thing as an empty value.
@@ -99 +101 @@
         T getValue();
         void visit(SettingVisitor visitor);
+        Setting<T> getNullInstance();
     }
 
@@ -118 +121 @@
             visitor.visit(this);
         }
+        public StringSetting getNullInstance() {
+            return new StringSetting(null);
+        }
     }
 
@@ -127 +133 @@
             visitor.visit(this);
         }
+        public ListSetting getNullInstance() {
+            return new ListSetting(null);
+        }
     }
 
@@ -136 +145 @@
             visitor.visit(this);
         }
+        public ListListSetting getNullInstance() {
+            return new ListListSetting(null);
+        }
     }
 
@@ -144 +156 @@
         public void visit(SettingVisitor visitor) {
             visitor.visit(this);
+        }
+        public MapListSetting getNullInstance() {
+            return new MapListSetting(null);
         }
     }
@@ -825 +840 @@
      */
     public Collection<String> getCollection(String key, Collection<String> def) {
-        if (def != null) {
-            putCollectionDefault(key, new ArrayList<String>(def));
-        }
+        putCollectionDefault(key, def == null ? null : new ArrayList<String>(def));
         Collection<String> prop = getCollectionInternal(key);
         if (prop != null)
@@ -904 +917 @@
     }
 
-    private static boolean equalCollection(Collection<String> a, Collection<String> b) {
+    public static boolean equalCollection(Collection<String> a, Collection<String> b) {
         if (a == null) return b == null;
         if (b == null) return false;
@@ -947 +960 @@
             }
             putArrayDefault(key, Collections.unmodifiableList(defCopy));
+        } else {
+            putArrayDefault(key, null);
         }
         List<List<String>> prop = getArrayInternal(key);
@@ -955 +970 @@
         } else
             return def;
+    }
+
+    public Collection<Collection<String>> getArray(String key) {
+        putArrayDefault(key, null);
+        List<List<String>> prop = getArrayInternal(key);
+        if (prop != null) {
+            @SuppressWarnings("unchecked")
+            Collection<Collection<String>> prop_cast = (Collection) prop;
+            return prop_cast;
+        } else
+            return Collections.emptyList();
     }
 
@@ -1020 +1046 @@
     }
 
-    private static boolean equalArray(Collection<Collection<String>> a, Collection<List<String>> b) {
+    public static boolean equalArray(Collection<Collection<String>> a, Collection<List<String>> b) {
         if (a == null) return b == null;
         if (b == null) return false;
@@ -1043 +1069 @@
             }
             putListOfStructsDefault(key, Collections.unmodifiableList(defCopy));
+        } else {
+            putListOfStructsDefault(key, null);
         }
         Collection<Map<String, String>> prop = getListOfStructsInternal(key);
@@ -1117 +1145 @@
     }
 
-    private static boolean equalListOfStructs(Collection<Map<String, String>> a, Collection<Map<String, String>> b) {
+    public static boolean equalListOfStructs(Collection<Map<String, String>> a, Collection<Map<String, String>> b) {
         if (a == null) return b == null;
         if (b == null) return false;
@@ -1298 +1326 @@
         }
         return struct;
+    }
+
+    public boolean putSetting(final String key, Setting value) {
+        if (value == null) return false;
+        class PutVisitor implements SettingVisitor {
+            public boolean changed;
+            public void visit(StringSetting setting) {
+                changed = put(key, setting.getValue());
+            }
+            public void visit(ListSetting setting) {
+                changed = putCollection(key, setting.getValue());
+            }
+            public void visit(ListListSetting setting) {
+                changed = putArray(key, (Collection) setting.getValue());
+            }
+            public void visit(MapListSetting setting) {
+                changed = putListOfStructs(key, setting.getValue());
+            }
+        };
+        PutVisitor putVisitor = new PutVisitor();
+        value.visit(putVisitor);
+        return putVisitor.changed;
+    }
+
+    public Map<String, Setting> getAllSettings() {
+        Map<String, Setting> settings = new TreeMap<String, Setting>();
+
+        for (Entry<String, String> e : properties.entrySet()) {
+            settings.put(e.getKey(), new StringSetting(e.getValue()));
+        }
+        for (Entry<String, List<String>> e : collectionProperties.entrySet()) {
+            settings.put(e.getKey(), new ListSetting(e.getValue()));
+        }
+        for (Entry<String, List<List<String>>> e : arrayProperties.entrySet()) {
+            settings.put(e.getKey(), new ListListSetting(e.getValue()));
+        }
+        for (Entry<String, List<Map<String, String>>> e : listOfStructsProperties.entrySet()) {
+            settings.put(e.getKey(), new MapListSetting(e.getValue()));
+        }
+        return settings;
+    }
+
+    public Map<String, Setting> getAllDefaults() {
+        Map<String, Setting> allDefaults = new TreeMap<String, Setting>();
+
+        for (Entry<String, String> e : defaults.entrySet()) {
+            allDefaults.put(e.getKey(), new StringSetting(e.getValue()));
+        }
+        for (Entry<String, List<String>> e : collectionDefaults.entrySet()) {
+            allDefaults.put(e.getKey(), new ListSetting(e.getValue()));
+        }
+        for (Entry<String, List<List<String>>> e : arrayDefaults.entrySet()) {
+            allDefaults.put(e.getKey(), new ListListSetting(e.getValue()));
+        }
+        for (Entry<String, List<Map<String, String>>> e : listOfStructsDefaults.entrySet()) {
+            allDefaults.put(e.getKey(), new MapListSetting(e.getValue()));
+        }
+        return allDefaults;
     }