Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

Timestamp:

2017-08-24T00:15:51+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

File:

• trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapStatus.BackgroundProgressMonitor;
@@ -107 +108 @@
 
         BackgroundProgressMonitor backgroundMonitor = null;
-        MapFrame map = Main.map;
+        MapFrame map = MainApplication.getMap();
         if (map != null) {
             backgroundMonitor = map.statusLine.progressMonitor;
@@ -314 +315 @@
         }
         BackgroundProgressMonitor backgroundMonitor = null;
-        MapFrame map = Main.map;
+        MapFrame map = MainApplication.getMap();
         if (map != null) {
             backgroundMonitor = map.statusLine.progressMonitor;
@@ -339 +340 @@
                 dialog = null;
                 Main.currentProgressMonitor = null;
-                MapFrame map = Main.map;
+                MapFrame map = MainApplication.getMap();
                 if (map != null) {
                     map.statusLine.progressMonitor.setVisible(false);
@@ -354 +355 @@
         doInEDT(() -> {
             if (dialog != null) {
-                dialog.setInBackgroundPossible(taskId != null && Main.isDisplayingMapView());
+                dialog.setInBackgroundPossible(taskId != null && MainApplication.isDisplayingMapView());
                 reset();
                 getDialog();
@@ -366 +367 @@
         doInEDT(() -> {
             if (dialog != null) {
-                dialog.setInBackgroundPossible(taskId != null && Main.isDisplayingMapView());
+                dialog.setInBackgroundPossible(taskId != null && MainApplication.isDisplayingMapView());
             }
         });