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

Timestamp:

2010-03-10T18:51:45+01:00 (15 years ago)

Author:

mjulius

Message:

fix issue that when plugins are updated only the updated plugins are loaded. - don't modify list of plugins in PluginHandler.updatePlugins()

File:

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

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

@@ -650 +650 @@
             // filter plugins which actually have to be updated
             //
-            Iterator<PluginInformation> it = plugins.iterator();
-            while(it.hasNext()) {
-                PluginInformation pi = it.next();
-                if (!pi.isUpdateRequired()) {
-                    it.remove();
+            Collection<PluginInformation> pluginsToUpdate = new ArrayList<PluginInformation>();
+            for(PluginInformation pi: plugins) {
+                if (pi.isUpdateRequired()) {
+                    pluginsToUpdate.add(pi);
                 }
             }
 
-            if (!plugins.isEmpty()) {
+            if (!pluginsToUpdate.isEmpty()) {
                 // try to update the locally installed plugins
                 //
                 PluginDownloadTask task2 = new PluginDownloadTask(
                         monitor.createSubTaskMonitor(1,false),
-                        plugins,
+                        pluginsToUpdate,
                         tr("Update plugins")
                 );
@@ -672 +671 @@
                 } catch(ExecutionException e) {
                     e.printStackTrace();
-                    alertFailedPluginUpdate(parent, plugins);
+                    alertFailedPluginUpdate(parent, pluginsToUpdate);
                     return;
                 } catch(InterruptedException e) {
                     e.printStackTrace();
-                    alertFailedPluginUpdate(parent, plugins);
+                    alertFailedPluginUpdate(parent, pluginsToUpdate);
                     return;
                 }