Changeset 10781 in josm for trunk/src

Timestamp:

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

Author:

simon04

Message:

fix #11874 - No progress bar while downloading plugins

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/SplashScreen.java (modified) (2 diffs)
• plugins/PluginHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -216 +216 @@
         @Override
         public void beginTask(String title) {
-            if (title != null) {
+            if (title != null && !title.isEmpty()) {
                 if (Main.isDebugEnabled()) {
                     Main.debug(title);
@@ -258 +258 @@
         @Override
         public ProgressMonitor createSubTaskMonitor(int ticks, boolean internal) {
-            return latestSubtask;
+            if (latestSubtask != null) {
+                return latestSubtask;
+            } else {
+                // subTask has not been called before, such as for plugin update, #11874
+                return this;
+            }
         }
 

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) {