Changeset 1671 in josm for trunk/src

Timestamp:

2009-06-16T08:38:42+02:00 (15 years ago)

Author:

stoecker

Message:

fix #2741 - NPE

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java

@@ -106 +106 @@
                 PluginInformation ap = availablePlugins.get(name);
                 PluginInformation pi = localPlugins.get(name);
-                boolean add = false;
-                if(pi == null)
-                    add = true;
-                else if(!pi.version.equals(ap.version))
-                {
-                    add = true;
-                    for (PluginProxy proxy : PluginHandler.pluginList)
-                        if(proxy.info.name.equals(ap.name))
-                            add = false;
-                }
-                if(add)
+                if(pi == null || (pi.version == null && ap.version != null)
+                || (pi.version != null && !pi.version.equals(ap.version)))
                 {
                     toDownload.add(ap);