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

Timestamp:

2008-09-09T08:28:56+02:00 (16 years ago)

Author:

framm

Message:

+ npe fix as suggested by Christoph Seitz <christoph_seitz@…>

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) (1 diff)

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

@@ -336 +336 @@
                 Object pd[] = pluginMap.keySet().toArray();
                 Arrays.sort(pd);
-                for(Object d : pd)
-                {
-                        if(pluginMap.get(d))
+                for (Object d : pd) {
+                        if (pluginMap.get(d))
                                 plugins += ((PluginDescription)d).name + ",";
                 }
-                if(plugins.endsWith(","))
+                if (plugins.endsWith(","))
                         plugins = plugins.substring(0, plugins.length()-1);
-                if(plugins.length() == 0)
+                if (plugins.length() == 0)
                         plugins = null;
 
                 String oldPlugins = Main.pref.get("plugins");
-                if(oldPlugins == null && plugins == null)
-                        return;
-                if(plugins == null || oldPlugins == null || !plugins.equals(oldPlugins))
-                {
+                if ((plugins == null && oldPlugins != null) ||
+            plugins != null && !plugins.equals(oldPlugins)) {
                         Main.pref.put("plugins", plugins);
                         gui.requiresRestart = true;