Changeset 12634 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2017-08-24T15:54:00+02:00 (8 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

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserDialog.java (modified) (2 diffs)
• HistoryBrowserDialogManager.java (modified) (3 diffs)
• HistoryLoadTask.java (modified) (1 diff)
• NodeListViewer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -182 +183 @@
             HistoryLoadTask task = new HistoryLoadTask();
             task.add(browser.getHistory());
-            Main.worker.submit(task);
+            MainApplication.worker.submit(task);
         }
     }

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.history.History;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -213 +214 @@
                 task.add(p);
             }
-            Main.worker.submit(task);
+            MainApplication.worker.submit(task);
         }
 
@@ -229 +230 @@
             }
         };
-        Main.worker.submit(r);
+        MainApplication.worker.submit(r);
     }
 }

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -43 +43 @@
  *      .add(aHistoryItem);
  *
- *   Main.worker.execute(task);
+ *   MainApplication.worker.execute(task);
  * </pre>
  */

trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.history.History;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.AdjustmentSynchronizer;
@@ -302 +303 @@
         public void run() {
             if (HistoryDataSet.getInstance().getHistory(primitiveId) == null) {
-                Main.worker.submit(new HistoryLoadTask().add(primitiveId));
+                MainApplication.worker.submit(new HistoryLoadTask().add(primitiveId));
             }
-            Main.worker.submit(() -> {
+            MainApplication.worker.submit(() -> {
                 final History h = HistoryDataSet.getInstance().getHistory(primitiveId);
                 if (h == null)