Changeset 1120 in josm

Timestamp:

Dec 13, 2008 7:08:56 PM (4 years ago)

Author:

stoecker

Message:

fix plugin loss

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/preferences/PluginPreference.java (modified) (2 diffs)

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

@@ -229 +229 @@
             plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
 
-        String [] oldplugins = new String[] {"mappaint", "unglueplugin", "lang-de","lang-en_GB","lang-fr","lang-it","lang-pl","lang-ro","lang-ru"};
+        String [] oldplugins = new String[] {"mappaint", "unglueplugin",
+        "lang-de", "lang-en_GB", "lang-fr", "lang-it", "lang-pl", "lang-ro",
+        "lang-ru", "ewmsplugin", "ywms"};
         for (String p : oldplugins) {
             if (plugins.contains(p)) {
@@ -240 +242 @@
         if (plugins.isEmpty())
             return;
-        
+
         SortedMap<Integer, Collection<PluginInformation>> p = new TreeMap<Integer, Collection<PluginInformation>>();
         for (String pluginName : plugins) {

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -243 +243 @@
 
                 // the following could probably be done more elegantly?
-                Collection<String> enabledPlugins = null;
-                String enabledProp = Main.pref.get("plugins");
-                if ((enabledProp == null) || ("".equals(enabledProp))) {
-                        enabledPlugins = Collections.emptySet();
-                }
-                else
-                {
-                        enabledPlugins = Arrays.asList(enabledProp.split(","));
-                }
+                Collection<String> enabledPlugins = Main.pref.getCollection("plugins", null);
                 
                 for (final PluginDescription plugin : availablePlugins) {
@@ -384 +376 @@
                 }
 
-                String plugins = "";
+                String oldPlugins = Main.pref.get("plugins");
+                LinkedList<String> plugins = new LinkedList<String>();
                 Object pd[] = pluginMap.keySet().toArray();
                 Arrays.sort(pd);
                 for (Object d : pd) {
                         if (pluginMap.get(d))
-                                plugins += ((PluginDescription)d).name + ",";
-                }
-                if (plugins.endsWith(","))
-                        plugins = plugins.substring(0, plugins.length()-1);
-                if (plugins.length() == 0)
-                        plugins = null;
-
-                String oldPlugins = Main.pref.get("plugins");
+                                plugins.add(((PluginDescription)d).name);
+                }
+
+                Main.pref.putCollection("plugins", plugins);
+                String newPlugins = Main.pref.get("plugins");
                 if(oldPlugins == null && plugins == null)
                         return;
                 if(plugins == null || oldPlugins == null || !plugins.equals(oldPlugins))
-                {
-                        Main.pref.put("plugins", plugins);
                         gui.requiresRestart = true;
-                }
         }
 }