Changeset 12634 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.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/actions/downloadtasks/DownloadOsmChangeTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java

@@ -77 +77 @@
         // Extract .osc filename from URL to set the new layer name
         extractOsmFilename("https?://.*/(.*\\.osc)", url);
-        return Main.worker.submit(downloadTask);
+        return MainApplication.worker.submit(downloadTask);
     }
 
@@ -123 +123 @@
                 if (isCanceled()) return;
                 // Let's load all required history
-                Main.worker.submit(new HistoryLoaderAndListener(toLoad));
+                MainApplication.worker.submit(new HistoryLoaderAndListener(toLoad));
             } catch (RejectedExecutionException e) {
                 rememberException(e);
@@ -200 +200 @@
                 // Some primitives still need to be loaded
                 // Let's load all required history
-                Main.worker.submit(new HistoryLoaderAndListener(toLoadNext));
+                MainApplication.worker.submit(new HistoryLoaderAndListener(toLoadNext));
             }
         }