Changeset 337 in josm for branch/0.5/src/org

Timestamp:

2007-10-02T23:52:53+02:00 (17 years ago)

Author:

framm

Message:

• fixed NPE on properties panel when no plugins active

File:

• branch/0.5/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) (2 diffs)

branch/0.5/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -13 +13 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -194 +195 @@
                 pluginMap = new HashMap<PluginDescription, Boolean>();
                 pluginPanel.removeAll();
-                Collection<String> enabledPlugins = Arrays.asList(Main.pref.get("plugins").split(","));
+
+                // 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.EMPTY_SET;
+                }
+                else
+                {
+                        enabledPlugins = Arrays.asList(enabledProp.split(","));
+                }
+                
                 for (final PluginDescription plugin : availablePlugins) {
                         boolean enabled = enabledPlugins.contains(plugin.name);