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

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

@@ -54 +54 @@
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
 import org.openstreetmap.josm.data.preferences.StrokeProperty;
+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.MapViewState.MapViewPoint;
@@ -270 +272 @@
         snapCheckboxMenuItem.getAction().setEnabled(true);
 
-        Main.map.statusLine.getAnglePanel().addMouseListener(snapHelper.anglePopupListener);
+        MapFrame map = MainApplication.getMap();
+        map.statusLine.getAnglePanel().addMouseListener(snapHelper.anglePopupListener);
         Main.registerActionShortcut(backspaceAction, backspaceShortcut);
 
-        Main.map.mapView.addMouseListener(this);
-        Main.map.mapView.addMouseMotionListener(this);
-        Main.map.mapView.addTemporaryLayer(this);
+        map.mapView.addMouseListener(this);
+        map.mapView.addMouseMotionListener(this);
+        map.mapView.addTemporaryLayer(this);
         SelectionEventManager.getInstance().addSelectionListenerForEdt(this);
 
-        Main.map.keyDetector.addKeyListener(this);
-        Main.map.keyDetector.addModifierExListener(this);
+        map.keyDetector.addKeyListener(this);
+        map.keyDetector.addModifierExListener(this);
         ignoreNextKeyRelease = true;
     }
@@ -286 +289 @@
     public void exitMode() {
         super.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);
         SelectionEventManager.getInstance().removeSelectionListener(this);
         Main.unregisterActionShortcut(backspaceAction, backspaceShortcut);
@@ -294 +298 @@
         snapCheckboxMenuItem.getAction().setEnabled(false);
 
-        Main.map.statusLine.getAnglePanel().removeMouseListener(snapHelper.anglePopupListener);
-        Main.map.statusLine.activateAnglePanel(false);
+        map.statusLine.getAnglePanel().removeMouseListener(snapHelper.anglePopupListener);
+        map.statusLine.activateAnglePanel(false);
 
         removeHighlighting();
-        Main.map.keyDetector.removeKeyListener(this);
-        Main.map.keyDetector.removeModifierExListener(this);
+        map.keyDetector.removeKeyListener(this);
+        map.keyDetector.removeModifierExListener(this);
     }
 
@@ -307 +311 @@
     @Override
     public void modifiersExChanged(int modifiers) {
-        if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable())
+        if (!MainApplication.isDisplayingMapView() || !MainApplication.getMap().mapView.isActiveLayerDrawable())
             return;
         updateKeyModifiersEx(modifiers);
@@ -341 +345 @@
     @Override
     public void selectionChanged(SelectionChangeEvent event) {
-        if (!Main.map.mapView.isActiveLayerDrawable())
+        if (!MainApplication.getMap().mapView.isActiveLayerDrawable())
             return;
         computeHelperLine();
@@ -360 +364 @@
         lastUsedNode = null;
         wayIsFinished = true;
-        Main.map.selectSelectTool(true);
+        MainApplication.getMap().selectSelectTool(true);
         snapHelper.noSnapNow();
 
@@ -392 +396 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-        if (!Main.map.mapView.isActiveLayerDrawable())
+        MapView mapView = MainApplication.getMap().mapView;
+        if (!mapView.isActiveLayerDrawable())
             return;
         // request focus in order to enable the expected keyboard shortcuts
         //
-        Main.map.mapView.requestFocus();
+        mapView.requestFocus();
 
         if (e.getClickCount() > 1 && mousePos != null && mousePos.equals(oldMousePos)) {
@@ -417 +422 @@
 
         boolean newNode = false;
-        Node n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);
+        Node n = mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);
         if (ctrl) {
             Iterator<Way> it = ds.getSelectedWays().iterator();
@@ -453 +458 @@
                 newEN = snapHelper.getSnapPoint(foundPoint);
                 // do not add new node if there is some node within snapping distance
-                double tolerance = Main.map.mapView.getDist100Pixel() * toleranceMultiplier;
+                double tolerance = mapView.getDist100Pixel() * toleranceMultiplier;
                 if (foundPoint.distance(newEN) > tolerance) {
                     n = new Node(newEN); // point != projected, so we create new node
@@ -459 +464 @@
                 }
             } else { // n==null, no node found in clicked area
-                EastNorth mouseEN = Main.map.mapView.getEastNorth(e.getX(), e.getY());
+                EastNorth mouseEN = mapView.getEastNorth(e.getX(), e.getY());
                 newEN = snapHelper.isSnapOn() ? snapHelper.getSnapPoint(mouseEN) : mouseEN;
                 n = new Node(newEN); //create node at clicked point
@@ -486 +491 @@
             if (!ctrl) {
                 // Insert the node into all the nearby way segments
-                List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
-                        Main.map.mapView.getPoint(n), OsmPrimitive::isSelectable);
+                List<WaySegment> wss = mapView.getNearestWaySegments(
+                        mapView.getPoint(n), OsmPrimitive::isSelectable);
                 if (snapHelper.isActive()) {
                     tryToMoveNodeOnIntersection(wss, n);
@@ -622 +627 @@
         // from aerial imagery or GPS tracks.
         if (VIEWPORT_FOLLOWING.get()) {
-            Main.map.mapView.smoothScrollTo(n.getEastNorth());
+            mapView.smoothScrollTo(n.getEastNorth());
         }
         computeHelperLine();
@@ -767 +772 @@
     @Override
     public void mouseMoved(MouseEvent e) {
-        if (!Main.map.mapView.isActiveLayerDrawable())
+        if (!MainApplication.getMap().mapView.isActiveLayerDrawable())
             return;
 
@@ -787 +792 @@
     private void tryToSetBaseSegmentForAngleSnap() {
         if (mousePos != null) {
-            WaySegment seg = Main.map.mapView.getNearestWaySegment(mousePos, OsmPrimitive::isSelectable);
+            WaySegment seg = MainApplication.getMap().mapView.getNearestWaySegment(mousePos, OsmPrimitive::isSelectable);
             if (seg != null) {
                 snapHelper.setBaseSegment(seg);
@@ -809 +814 @@
         Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
 
-        MapView mv = Main.map.mapView;
+        MapView mv = MainApplication.getMap().mapView;
         Node currentMouseNode = null;
         mouseOnExistingNode = null;
@@ -864 +869 @@
 
     static void showStatusInfo(double angle, double hdg, double distance, boolean activeFlag) {
-        Main.map.statusLine.setAngle(angle);
-        Main.map.statusLine.activateAnglePanel(activeFlag);
-        Main.map.statusLine.setHeading(hdg);
-        Main.map.statusLine.setDist(distance);
+        MapFrame map = MainApplication.getMap();
+        map.statusLine.setAngle(angle);
+        map.statusLine.activateAnglePanel(activeFlag);
+        map.statusLine.setHeading(hdg);
+        map.statusLine.setDist(distance);
     }
 
@@ -1060 +1066 @@
         // fall through to default action.
         // (for semi-parallel lines, intersection might be miles away!)
-        if (Main.map.mapView.getPoint2D(n).distance(Main.map.mapView.getPoint2D(intersection)) < SNAP_TO_INTERSECTION_THRESHOLD.get()) {
+        MapFrame map = MainApplication.getMap();
+        if (map.mapView.getPoint2D(n).distance(map.mapView.getPoint2D(intersection)) < SNAP_TO_INTERSECTION_THRESHOLD.get()) {
             n.setEastNorth(intersection);
             return;
@@ -1113 +1120 @@
     private void addHighlighting() {
         newHighlights = new HashSet<>();
+        MapView mapView = MainApplication.getMap().mapView;
 
         // if ctrl key is held ("no join"), don't highlight anything
         if (ctrl) {
-            Main.map.mapView.setNewCursor(cursor, this);
+            mapView.setNewCursor(cursor, this);
             redrawIfRequired();
             return;
@@ -1123 +1131 @@
         // This happens when nothing is selected, but we still want to highlight the "target node"
         if (mouseOnExistingNode == null && mousePos != null && getLayerManager().getEditDataSet().selectionEmpty()) {
-            mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);
+            mouseOnExistingNode = mapView.getNearestNode(mousePos, OsmPrimitive::isSelectable);
         }
 
         if (mouseOnExistingNode != null) {
-            Main.map.mapView.setNewCursor(cursorJoinNode, this);
+            mapView.setNewCursor(cursorJoinNode, this);
             newHighlights.add(mouseOnExistingNode);
             redrawIfRequired();
@@ -1135 +1143 @@
         // Insert the node into all the nearby way segments
         if (mouseOnExistingWays.isEmpty()) {
-            Main.map.mapView.setNewCursor(cursor, this);
+            mapView.setNewCursor(cursor, this);
             redrawIfRequired();
             return;
         }
 
-        Main.map.mapView.setNewCursor(cursorJoinWay, this);
+        mapView.setNewCursor(cursorJoinWay, this);
         newHighlights.addAll(mouseOnExistingWays);
         redrawIfRequired();
@@ -1157 +1165 @@
     public void paint(Graphics2D g, MapView mv, Bounds box) {
         // sanity checks
-        if (Main.map.mapView == null || mousePos == null
+        MapView mapView = MainApplication.getMap().mapView;
+        if (mapView == null || mousePos == null
                 // don't draw line if we don't know where from or where to
                 || currentMouseEastNorth == null || getCurrentBaseNode() == null
                 // don't draw line if mouse is outside window
-                || !Main.map.mapView.getState().getForView(mousePos.getX(), mousePos.getY()).isInView())
+                || !mapView.getState().getForView(mousePos.getX(), mousePos.getY()).isInView())
             return;
 
@@ -1368 +1377 @@
         @Override
         protected void updateEnabledState() {
-            setEnabled(Main.map != null && Main.map.mapMode instanceof DrawAction);
+            MapFrame map = MainApplication.getMap();
+            setEnabled(map != null && map.mapMode instanceof DrawAction);
         }
     }