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

trunk/src/org/openstreetmap/josm/Main.java

@@ -59 +59 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
-import org.openstreetmap.josm.gui.progress.ProgressMonitorExecutor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.RedirectInputMap;
@@ -123 +122 @@
     /**
      * The worker thread slave. This is for executing all long and intensive
-     * calculations. The executed runnables are guaranteed to be executed separately
-     * and sequential.
-     */
-    public static final ExecutorService worker = new ProgressMonitorExecutor("main-worker-%d", Thread.NORM_PRIORITY);
+     * calculations. The executed runnables are guaranteed to be executed separately and sequential.
+     * @deprecated use {@link MainApplication#worker} instead
+     */
+    @Deprecated
+    public static final ExecutorService worker = MainApplication.worker;
 
     /**
@@ -855 +855 @@
     protected void shutdown() {
         if (!GraphicsEnvironment.isHeadless()) {
-            worker.shutdown();
             ImageProvider.shutdown(false);
             JCSCacheManager.shutdown();
@@ -867 +866 @@
         }
         if (!GraphicsEnvironment.isHeadless()) {
-            worker.shutdownNow();
             ImageProvider.shutdown(true);
         }