Changeset 12634 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.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/layer/AutosaveTask.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/AutosaveTask.java ) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.data;
+package org.openstreetmap.josm.gui.layer;
 
 import static org.openstreetmap.josm.tools.I18n.marktr;
@@ -37 +37 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
@@ -42 +43 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmExporter;
@@ -371 +371 @@
         List<File> files = getUnsavedLayersFiles();
         final OpenFileTask openFileTsk = new OpenFileTask(files, null, tr("Restoring files"));
-        final Future<?> openFilesFuture = Main.worker.submit(openFileTsk);
-        return Main.worker.submit(() -> {
+        final Future<?> openFilesFuture = MainApplication.worker.submit(openFileTsk);
+        return MainApplication.worker.submit(() -> {
             try {
                 // Wait for opened tasks to be generated.