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

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

@@ -60 +60 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MainPanel;
@@ -119 +120 @@
      *
      * @return <code>true</code> if JOSM currently displays a map view
-     */
+     * @deprecated use {@link org.openstreetmap.josm.gui.MainApplication#isDisplayingMapView()}
+     */
+    @Deprecated
     public static boolean isDisplayingMapView() {
         return map != null && map.mapView != null;
@@ -151 +154 @@
      * There should be no need to access this to access any map data. Use {@link #layerManager} instead.
      *
+     * @deprecated Use {@link org.openstreetmap.josm.gui.MainApplication#getMap()} instead
      * @see MainPanel
      */
+    @Deprecated
     public static MapFrame map;
 
@@ -1135 +1140 @@
             }
             if (newValue != null && oldBounds != null) {
-                Main.map.mapView.zoomTo(oldBounds);
+                MainApplication.getMap().mapView.zoomTo(oldBounds);
             }
             /* TODO - remove layers with fixed projection */