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

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
@@ -72 +75 @@
         EastNorth curOff = old == null ? EastNorth.ZERO : old.getDisplacement(Main.getProjection());
         LatLon center;
-        if (Main.isDisplayingMapView()) {
-            center = Main.getProjection().eastNorth2latlon(Main.map.mapView.getCenter());
+        if (MainApplication.isDisplayingMapView()) {
+            center = Main.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
         } else {
             center = LatLon.ZERO;
@@ -98 +101 @@
 
     protected void addListeners() {
-        Main.map.mapView.addMouseListener(this);
-        Main.map.mapView.addMouseMotionListener(this);
+        MapView mapView = MainApplication.getMap().mapView;
+        mapView.addMouseListener(this);
+        mapView.addMouseMotionListener(this);
         try {
             Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
@@ -126 +130 @@
             Logging.error(ex);
         }
-        if (Main.isDisplayingMapView()) {
-            Main.map.mapView.removeMouseMotionListener(this);
-            Main.map.mapView.removeMouseListener(this);
+        if (MainApplication.isDisplayingMapView()) {
+            MapFrame map = MainApplication.getMap();
+            map.mapView.removeMouseMotionListener(this);
+            map.mapView.removeMouseListener(this);
         }
     }
@@ -172 +177 @@
         if (layer.isVisible()) {
             requestFocusInMapView();
-            prevEastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
-            Main.map.mapView.setNewCursor(Cursor.MOVE_CURSOR, this);
+            MapView mapView = MainApplication.getMap().mapView;
+            prevEastNorth = mapView.getEastNorth(e.getX(), e.getY());
+            mapView.setNewCursor(Cursor.MOVE_CURSOR, this);
         }
     }
@@ -180 +186 @@
     public void mouseDragged(MouseEvent e) {
         if (layer == null || prevEastNorth == null) return;
-        EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
+        EastNorth eastNorth = MainApplication.getMap().mapView.getEastNorth(e.getX(), e.getY());
         EastNorth d = tempOffset.getDisplacement().add(eastNorth).subtract(prevEastNorth);
         tempOffset.setDisplacement(d);
@@ -192 +198 @@
     @Override
     public void mouseReleased(MouseEvent e) {
-        Main.map.mapView.repaint();
-        Main.map.mapView.resetCursor(this);
+        MapView mapView = MainApplication.getMap().mapView;
+        mapView.repaint();
+        mapView.resetCursor(this);
         prevEastNorth = null;
     }
@@ -199 +206 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (offsetDialog != null || layer == null || Main.map == null)
+        MapFrame map = MainApplication.getMap();
+        if (offsetDialog != null || layer == null || map == null)
             return;
-        oldMapMode = Main.map.mapMode;
+        oldMapMode = map.mapMode;
         super.actionPerformed(e);
     }
@@ -266 +274 @@
             }
             updateOffsetIntl();
-            if (Main.isDisplayingMapView()) {
-                Main.map.repaint();
+            if (MainApplication.isDisplayingMapView()) {
+                MainApplication.getMap().repaint();
             }
         }
@@ -334 +342 @@
 
         private void restoreMapModeState() {
-            if (Main.map == null)
+            MapFrame map = MainApplication.getMap();
+            if (map == null)
                 return;
             if (oldMapMode != null) {
-                Main.map.selectMapMode(oldMapMode);
+                map.selectMapMode(oldMapMode);
                 oldMapMode = null;
             } else {
-                Main.map.selectSelectTool(false);
+                map.selectSelectTool(false);
             }
         }