Changeset 12634 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

Timestamp:

2017-08-24T15:54:00+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.worker, replace it by gui.MainApplication.worker + code refactoring to make sure only editor packages use it

File:

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

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

@@ -57 +57 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.download.DownloadSelection;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -590 +591 @@
         final ReadRemotePluginInformationTask pluginInfoDownloadTask = new ReadRemotePluginInformationTask(
                 Main.pref.getOnlinePluginSites());
-        Main.worker.submit(pluginInfoDownloadTask);
+        MainApplication.worker.submit(pluginInfoDownloadTask);
 
         // Continuation
-        Main.worker.submit(() -> {
+        MainApplication.worker.submit(() -> {
             // Build list of plugins to download
             Set<PluginInformation> toDownload = new HashSet<>(pluginInfoDownloadTask.getAvailablePlugins());
@@ -601 +602 @@
                 // download plugins
                 final PluginDownloadTask task = new PluginDownloadTask(parent, toDownload, tr("Download plugins"));
-                Main.worker.submit(task);
-                Main.worker.submit(() -> {
+                MainApplication.worker.submit(task);
+                MainApplication.worker.submit(() -> {
                     // restart if some plugins have been downloaded
                     if (!task.getDownloadedPlugins().isEmpty()) {