Ticket #19098: 19098-real-fix.patch

src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java

@@ -229 +229 @@
                     );
             return SuppressionMode.NONE;
         } else {
+            PluginDownloadTask downloadTask = PluginHandler.updateOrdisablePluginAfterException(e);
             return GuiHelper.runInEDTAndWaitAndReturn(() -> {
-                PluginDownloadTask downloadTask = PluginHandler.updateOrdisablePluginAfterException(e);
                 if (downloadTask != null) {
                     // Ask for restart to install new plugin
                     PluginPreference.notifyDownloadResults(

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

@@ -37 +37 @@
 import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 import java.util.jar.JarFile;
@@ -64 +66 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.progress.swing.ProgressMonitorExecutor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -953 +956 @@
             monitor = NullProgressMonitor.INSTANCE;
         }
         try {
+            Map<String, PluginInformation> ret = new HashMap<>();
+            ExecutorService service = new ProgressMonitorExecutor("plugin-loader-%d", Thread.NORM_PRIORITY);
             ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask(monitor);
+            Future<?> future = service.submit(task);
             try {
-                task.run();
-            } catch (RuntimeException e) { // NOPMD
+                future.get();
+            } catch (ExecutionException e) {
                 Logging.error(e);
-                return null;
+                return ret;
+            } catch (InterruptedException e) {
+                Logging.warn("InterruptedException in " + PluginHandler.class.getSimpleName()
+                        + " while loading locally available plugin information");
+                return ret;
             }
-            Map<String, PluginInformation> ret = new HashMap<>();
             for (PluginInformation pi: task.getAvailablePlugins()) {
                 ret.put(pi.name, pi);
             }
@@ -1112 +1121 @@
         }
         try {
             monitor.beginTask("");
+            ExecutorService service = new ProgressMonitorExecutor("plugin-updater-%d", Thread.NORM_PRIORITY);
 
             // try to download the plugin lists
             ReadRemotePluginInformationTask task1 = new ReadRemotePluginInformationTask(
                     monitor.createSubTaskMonitor(1, false),
                     Preferences.main().getOnlinePluginSites(), displayErrMsg
-            );
-            task1.run();
-            List<PluginInformation> allPlugins = task1.getAvailablePlugins();
+                    );
+            List<PluginInformation> allPlugins = null;
+            Future<?> future = service.submit(task1);
 
             try {
+                future.get();
+                allPlugins = task1.getAvailablePlugins();
                 plugins = buildListOfPluginsToLoad(parent, monitor.createSubTaskMonitor(1, false));
                 // If only some plugins have to be updated, filter the list
                 if (pluginsWanted != null && !pluginsWanted.isEmpty()) {
@@ -1128 +1140 @@
                     final Collection<String> pluginsWantedName = Utils.transform(pluginsWanted, piw -> piw.name);
                     plugins = SubclassFilteredCollection.filter(plugins, pi -> pluginsWantedName.contains(pi.name));
                 }
-            } catch (RuntimeException e) { // NOPMD
-                Logging.warn(tr("Failed to download plugin information list"));
+            } catch (ExecutionException e) {
+                Logging.warn(tr("Failed to download plugin information list") + ": ExecutionException");
                 Logging.error(e);
                 // don't abort in case of error, continue with downloading plugins below
+            } catch (InterruptedException e) {
+                Logging.warn(tr("Failed to download plugin information list") + ": InterruptedException");
+                // don't abort in case of error, continue with downloading plugins below
             }
 
             // filter plugins which actually have to be updated
@@ -1169 +1184 @@
                         monitor.createSubTaskMonitor(1, false),
                         pluginsToDownload,
                         tr("Update plugins")
-                );
+                        );
+                future = service.submit(pluginDownloadTask);
+
                 try {
-                    pluginDownloadTask.run();
-                } catch (RuntimeException e) { // NOPMD
+                    future.get();
+                } catch (ExecutionException e) {
                     Logging.error(e);
                     alertFailedPluginUpdate(parent, pluginsToUpdate);
                     return plugins;
+                } catch (InterruptedException e) {
+                    Logging.warn("InterruptedException in " + PluginHandler.class.getSimpleName()
+                            + " while updating plugins");
+                    alertFailedPluginUpdate(parent, pluginsToUpdate);
+                    return plugins;
                 }
 
                 // Update Plugin info for downloaded plugins