Changeset 3001 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2010-02-17T08:43:05+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #4542: don't offer build-in plugins for installation

File:

• trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (modified) (3 diffs)

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

@@ -16 +16 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -182 +185 @@
 
     /**
+     * Filter information about deprecated plugins from the list of downloaded
+     * plugins
+     * 
+     * @param plugins the plugin informations
+     * @return the plugin informations, without deprecated plugins
+     */
+    protected List<PluginInformation> filterDeprecatedPlugins(List<PluginInformation> plugins) {
+        List<PluginInformation> ret = new ArrayList<PluginInformation>(plugins.size());
+        HashSet<String> deprecatedPluginNames = new HashSet<String>(Arrays.asList(PluginHandler.DEPRECATED_PLUGINS));
+        for (PluginInformation plugin: plugins) {
+            if (deprecatedPluginNames.contains(plugin.name)) {
+                continue;
+            }
+            ret.add(plugin);
+        }
+        return ret;
+    }
+
+    /**
      * Parses the plugin list
      * 
@@ -192 +214 @@
             InputStream in = new ByteArrayInputStream(doc.getBytes("UTF-8"));
             List<PluginInformation> pis = new PluginListParser().parse(in);
-            availabePlugins.addAll(pis);
+            availabePlugins.addAll(filterDeprecatedPlugins(pis));
         } catch(UnsupportedEncodingException e) {
             System.err.println(tr("Failed to parse plugin list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));