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

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
 import java.awt.event.KeyEvent;
 import java.io.File;
@@ -36 +37 @@
 import java.util.TreeSet;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.logging.Level;
@@ -59 +61 @@
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
-import org.openstreetmap.josm.data.AutosaveTask;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.CustomConfigurator;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -68 +68 @@
 import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
+import org.openstreetmap.josm.gui.io.CustomConfigurator.XMLCommandProcessor;
+import org.openstreetmap.josm.gui.layer.AutosaveTask;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
@@ -73 +75 @@
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
+import org.openstreetmap.josm.gui.progress.ProgressMonitorExecutor;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -124 +127 @@
 
     /**
+     * The worker thread slave. This is for executing all long and intensive
+     * calculations. The executed runnables are guaranteed to be executed separately and sequential.
+     * @since 12634 (as a replacement to {@code Main.worker})
+     */
+    public static final ExecutorService worker = new ProgressMonitorExecutor("main-worker-%d", Thread.NORM_PRIORITY);
+
+    /**
      * Constructs a new {@code MainApplication} without a window.
      */
@@ -227 +237 @@
     @Override
     protected void shutdown() {
+        if (!GraphicsEnvironment.isHeadless()) {
+            worker.shutdown();
+        }
         if (mainFrame != null) {
             mainFrame.storeState();
@@ -234 +247 @@
         }
         super.shutdown();
+        if (!GraphicsEnvironment.isHeadless()) {
+            worker.shutdownNow();
+        }
     }
 
@@ -456 +472 @@
 
         if (args.hasOption(Option.LOAD_PREFERENCES)) {
-            CustomConfigurator.XMLCommandProcessor config = new CustomConfigurator.XMLCommandProcessor(Main.pref);
+            XMLCommandProcessor config = new XMLCommandProcessor(Main.pref);
             for (String i : args.get(Option.LOAD_PREFERENCES)) {
                 Logging.info("Reading preferences from " + i);
@@ -671 +687 @@
         Future<?> future = task.download(true, b, null);
         // ... and the continuation when the download is finished (this will wait for the download to finish)
-        return Collections.singletonList(Main.worker.submit(new PostDownloadHandler(task, future)));
+        return Collections.singletonList(MainApplication.worker.submit(new PostDownloadHandler(task, future)));
     }
 
@@ -693 +709 @@
         final Collection<String> selectionArguments = args.get(Option.SELECTION);
         if (!selectionArguments.isEmpty()) {
-            tasks.add(Main.worker.submit(() -> {
+            tasks.add(MainApplication.worker.submit(() -> {
                 for (String s : selectionArguments) {
                     SearchAction.search(s, SearchAction.SearchMode.add);