Changeset 8776 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-09-21T21:50:16+02:00 (9 years ago)

Author:

simon04

Message:

see #11843 - Run plugin tasks in the same thread

Before, a separate thread had been spawned for which termination had being waited immediately afterwards.

File:

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

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

@@ -35 +35 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.jar.JarFile;
@@ -815 +812 @@
         try {
             ReadLocalPluginInformationTask task = new ReadLocalPluginInformationTask(monitor);
-            ExecutorService service = Executors.newSingleThreadExecutor(Utils.newThreadFactory("plugin-loader-%d", Thread.NORM_PRIORITY));
-            Future<?> future = service.submit(task);
             try {
-                future.get();
-            } catch (ExecutionException e) {
+                task.run();
+            } catch (RuntimeException e) {
                 Main.error(e);
-                return null;
-            } catch (InterruptedException e) {
-                Main.warn("InterruptedException in "+PluginHandler.class.getSimpleName()+" while loading locally available plugin information");
                 return null;
             }
@@ -972 +964 @@
         try {
             monitor.beginTask("");
-            ExecutorService service = Executors.newSingleThreadExecutor(Utils.newThreadFactory("plugin-updater-%d", Thread.NORM_PRIORITY));
 
             // try to download the plugin lists
@@ -980 +971 @@
                     Main.pref.getOnlinePluginSites(), displayErrMsg
             );
-            Future<?> future = service.submit(task1);
+            task1.run();
             List<PluginInformation> allPlugins = null;
 
             try {
-                future.get();
                 allPlugins = task1.getAvailablePlugins();
                 plugins = buildListOfPluginsToLoad(parent, monitor.createSubTaskMonitor(1, false));
@@ -1003 +993 @@
                     }
                 }
-            } catch (ExecutionException e) {
-                Main.warn(tr("Failed to download plugin information list")+": ExecutionException");
+            } catch (RuntimeException e) {
+                Main.warn(tr("Failed to download plugin information list"));
                 Main.error(e);
-                // don't abort in case of error, continue with downloading plugins below
-            } catch (InterruptedException e) {
-                Main.warn(tr("Failed to download plugin information list")+": InterruptedException");
                 // don't abort in case of error, continue with downloading plugins below
             }
@@ -1048 +1035 @@
                 );
 
-                future = service.submit(pluginDownloadTask);
                 try {
-                    future.get();
-                } catch (ExecutionException e) {
+                    pluginDownloadTask.run();
+                } catch (RuntimeException e) {
                     Main.error(e);
-                    alertFailedPluginUpdate(parent, pluginsToUpdate);
-                    return plugins;
-                } catch (InterruptedException e) {
-                    Main.warn("InterruptedException in "+PluginHandler.class.getSimpleName()+" while updating plugins");
                     alertFailedPluginUpdate(parent, pluginsToUpdate);
                     return plugins;