Changeset 1062 in josm for trunk

Timestamp:

2008-11-02T14:28:20+01:00 (16 years ago)

Author:

stoecker

Message:

added prefs support for collections

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• data/Preferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -221 +221 @@
         public static void loadPlugins(boolean early) {
                 List<String> plugins = new LinkedList<String>();
-                if (Main.pref.hasKey("plugins"))
-                        plugins.addAll(Arrays.asList(Main.pref.get("plugins").split(",")));
+                Collection<String> cp = Main.pref.getCollection("plugins", null);
+                if (cp != null)
+                        plugins.addAll(cp);
                 if (System.getProperty("josm.plugins") != null)
                         plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
@@ -232 +233 @@
                         {
                                 plugins.remove(p);
+                                Main.pref.removeFromCollection("plugins", p);
                                 System.out.println(tr("Warning - loading of {0} plugin was requested. This plugin is no longer required.", p));
                         }

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

@@ -10 +10 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -401 +402 @@
         }
 
+        synchronized public Collection<String> getCollection(String key, Collection<String> def) {
+                String s = get(key);
+                if(s != null)
+                {
+                        /* handle old comma separated stuff - remove in future */
+                        if(s.indexOf(',') >= 0)
+                                return Arrays.asList(s.split(","));
+                        else
+                                return Arrays.asList(s.split(";"));
+                }
+                else if(def != null)
+                        return def;
+                return null;
+        }
+        synchronized public void removeFromCollection(String key, String value) {
+                ArrayList<String> a = new ArrayList<String>(getCollection(key, null));
+                if(a != null)
+                {
+                        a.remove(value);
+                        putCollection(key, a);
+                }
+        }
+        synchronized public void putCollection(String key, Collection<String> val) {
+                String s = null;
+                if(val != null)
+                {
+                        for(String a : val)
+                        {
+                                if(s != null)
+                                        s += ";" + a;
+                                else
+                                        s = a;
+                        }
+                }
+
+                put(key, s);
+        }
+
         private void setSystemProperties() {
                 Properties sysProp = System.getProperties();