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

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

@@ -45 +45 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.draw.MapViewPath;
@@ -205 +207 @@
         @Override
         protected void updateEnabledState() {
-            setEnabled(Main.map != null && Main.map.mapMode instanceof ExtrudeAction);
+            MapFrame map = MainApplication.getMap();
+            setEnabled(map != null && map.mapMode instanceof ExtrudeAction);
         }
     }
@@ -293 +296 @@
     public void enterMode() {
         super.enterMode();
-        Main.map.mapView.addMouseListener(this);
-        Main.map.mapView.addMouseMotionListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.addMouseListener(this);
+        map.mapView.addMouseMotionListener(this);
         ignoreNextKeyRelease = true;
-        Main.map.keyDetector.addKeyListener(this);
-        Main.map.keyDetector.addModifierExListener(this);
+        map.keyDetector.addKeyListener(this);
+        map.keyDetector.addModifierExListener(this);
     }
 
@@ -321 +325 @@
     @Override
     public void exitMode() {
-        Main.map.mapView.removeMouseListener(this);
-        Main.map.mapView.removeMouseMotionListener(this);
-        Main.map.mapView.removeTemporaryLayer(this);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.removeMouseListener(this);
+        map.mapView.removeMouseMotionListener(this);
+        map.mapView.removeTemporaryLayer(this);
         dualAlignCheckboxMenuItem.getAction().setEnabled(false);
-        Main.map.keyDetector.removeKeyListener(this);
-        Main.map.keyDetector.removeModifierExListener(this);
+        map.keyDetector.removeKeyListener(this);
+        map.keyDetector.removeModifierExListener(this);
         super.exitMode();
     }
@@ -339 +344 @@
     @Override
     public void modifiersExChanged(int modifiers) {
-        if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable())
+        MapFrame map = MainApplication.getMap();
+        if (!MainApplication.isDisplayingMapView() || !map.mapView.isActiveLayerDrawable())
             return;
         updateKeyModifiersEx(modifiers);
         if (mode == Mode.select) {
-            Main.map.mapView.setNewCursor(ctrl ? cursorTranslate : alt ? cursorCreateNew : shift ? cursorCreateNodes : cursor, this);
+            map.mapView.setNewCursor(ctrl ? cursorTranslate : alt ? cursorCreateNew : shift ? cursorCreateNodes : cursor, this);
         }
     }
@@ -380 +386 @@
     @Override
     public void mousePressed(MouseEvent e) {
-        if (!Main.map.mapView.isActiveLayerVisible())
+        MapFrame map = MainApplication.getMap();
+        if (!map.mapView.isActiveLayerVisible())
             return;
         if (!(Boolean) this.getValue("active"))
@@ -390 +397 @@
         updateKeyModifiers(e);
 
-        selectedNode = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive::isSelectable);
-        selectedSegment = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive::isSelectable);
+        selectedNode = map.mapView.getNearestNode(e.getPoint(), OsmPrimitive::isSelectable);
+        selectedSegment = map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive::isSelectable);
 
         // If nothing gets caught, stay in select mode
@@ -441 +448 @@
         moveCommand2 = null;
 
-        Main.map.mapView.addTemporaryLayer(this);
+        map.mapView.addTemporaryLayer(this);
 
         updateStatusLine();
-        Main.map.mapView.repaint();
+        map.mapView.repaint();
 
         // Make note of time pressed
@@ -459 +466 @@
     @Override
     public void mouseDragged(MouseEvent e) {
-        if (!Main.map.mapView.isActiveLayerVisible())
+        MapView mapView = MainApplication.getMap().mapView;
+        if (!mapView.isActiveLayerVisible())
             return;
 
@@ -471 +479 @@
             //move, create new and extrude mode - move the selected segment
 
-            EastNorth mouseEn = Main.map.mapView.getEastNorth(e.getPoint().x, e.getPoint().y);
+            EastNorth mouseEn = mapView.getEastNorth(e.getPoint().x, e.getPoint().y);
             EastNorth bestMovement = calculateBestMovementAndNewNodes(mouseEn);
 
-            Main.map.mapView.setNewCursor(Cursor.MOVE_CURSOR, this);
+            mapView.setNewCursor(Cursor.MOVE_CURSOR, this);
 
             if (dualAlignActive) {
@@ -511 +519 @@
             }
 
-            Main.map.mapView.repaint();
+            mapView.repaint();
         }
     }
@@ -522 +530 @@
     public void mouseReleased(MouseEvent e) {
 
-        if (!Main.map.mapView.isActiveLayerVisible())
+        MapView mapView = MainApplication.getMap().mapView;
+        if (!mapView.isActiveLayerVisible())
             return;
 
@@ -553 +562 @@
             updateKeyModifiers(e);
             // Switch back into select mode
-            Main.map.mapView.setNewCursor(ctrl ? cursorTranslate : alt ? cursorCreateNew : shift ? cursorCreateNodes : cursor, this);
-            Main.map.mapView.removeTemporaryLayer(this);
+            mapView.setNewCursor(ctrl ? cursorTranslate : alt ? cursorCreateNew : shift ? cursorCreateNodes : cursor, this);
+            mapView.removeTemporaryLayer(this);
             selectedSegment = null;
             moveCommand = null;
@@ -560 +569 @@
             dualAlignSegmentCollapsed = false;
             updateStatusLine();
-            Main.map.mapView.repaint();
+            mapView.repaint();
         }
     }
@@ -574 +583 @@
     private static void addNewNode(MouseEvent e) {
         // Should maybe do the same as in DrawAction and fetch all nearby segments?
-        WaySegment ws = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive::isSelectable);
+        MapView mapView = MainApplication.getMap().mapView;
+        WaySegment ws = mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive::isSelectable);
         if (ws != null) {
-            Node n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY()));
+            Node n = new Node(mapView.getLatLon(e.getX(), e.getY()));
             EastNorth a = ws.getFirstNode().getEastNorth();
             EastNorth b = ws.getSecondNode().getEastNorth();
@@ -743 +753 @@
     private EastNorth calculateBestMovement(EastNorth mouseEn) {
 
-        EastNorth initialMouseEn = Main.map.mapView.getEastNorth(initialMousePos.x, initialMousePos.y);
+        EastNorth initialMouseEn = MainApplication.getMap().mapView.getEastNorth(initialMousePos.x, initialMousePos.y);
         EastNorth mouseMovement = mouseEn.subtract(initialMouseEn);
 
@@ -926 +936 @@
         double distance = Main.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance(
                 Main.getProjection().eastNorth2latlon(n1movedEn));
-        Main.map.statusLine.setDist(distance);
+        MainApplication.getMap().statusLine.setDist(distance);
         updateStatusLine();