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

Timestamp:

2016-08-11T15:26:20+02:00 (7 years ago)

Author:

simon04

Message:

fix #11874 - No progress bar while downloading plugins

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (2 diffs)

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

@@ -67 +67 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -986 +987 @@
                 // If only some plugins have to be updated, filter the list
                 if (pluginsWanted != null && !pluginsWanted.isEmpty()) {
-                    for (Iterator<PluginInformation> it = plugins.iterator(); it.hasNext();) {
-                        PluginInformation pi = it.next();
-                        boolean found = false;
-                        for (PluginInformation piw : pluginsWanted) {
-                            if (pi.name.equals(piw.name)) {
-                                found = true;
-                                break;
-                            }
-                        }
-                        if (!found) {
-                            it.remove();
-                        }
-                    }
+                    final Collection<String> pluginsWantedName = Utils.transform(pluginsWanted, piw -> piw.name);
+                    plugins = SubclassFilteredCollection.filter(plugins, pi -> pluginsWantedName.contains(pi.name));
                 }
             } catch (RuntimeException e) {