Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java

Timestamp:

2017-08-24T00:15:51+02:00 (9 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/FollowLineAction.java (modified) (4 diffs)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -63 +65 @@
         if (osmLayer == null)
             return;
-        if (!(Main.map.mapMode instanceof DrawAction)) return; // We are not on draw mode
+        MapFrame map = MainApplication.getMap();
+        if (!(map.mapMode instanceof DrawAction)) return; // We are not on draw mode
 
         Collection<Node> selectedPoints = osmLayer.data.getSelectedNodes();
@@ -70 +73 @@
             return;
 
-        Node last = ((DrawAction) Main.map.mapMode).getCurrentBaseNode();
+        Node last = ((DrawAction) map.mapMode).getCurrentBaseNode();
         if (last == null)
             return;
@@ -122 +125 @@
             // from aerial imagery or GPS tracks.
             if (DrawAction.VIEWPORT_FOLLOWING.get()) {
-                Main.map.mapView.smoothScrollTo(newPoint.getEastNorth());
+                map.mapView.smoothScrollTo(newPoint.getEastNorth());
             }
         }