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

trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java

@@ -8 +8 @@
 import java.awt.event.MouseEvent;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -53 +53 @@
     @Override
     public void selectionEnded(Rectangle r, MouseEvent e) {
-        if (r.width >= 3 && r.height >= 3 && Main.isDisplayingMapView()) {
-            MapView mv = Main.map.mapView;
+        if (r.width >= 3 && r.height >= 3 && MainApplication.isDisplayingMapView()) {
+            MapView mv = MainApplication.getMap().mapView;
             mv.zoomToFactor(mv.getEastNorth(r.x+r.width/2, r.y+r.height/2), r.getWidth()/mv.getWidth());
         }
@@ -61 +61 @@
     @Override public void enterMode() {
         super.enterMode();
-        selectionManager.register(Main.map.mapView, false);
+        selectionManager.register(MainApplication.getMap().mapView, false);
     }
 
     @Override public void exitMode() {
         super.exitMode();
-        selectionManager.unregister(Main.map.mapView);
+        selectionManager.unregister(MainApplication.getMap().mapView);
     }