Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2017-08-24T00:15:51+02:00 (8 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• AddNoteAction.java (modified) (6 diffs)
• DeleteAction.java (modified) (7 diffs)
• DrawAction.java (modified) (23 diffs)
• DrawSnapHelper.java (modified) (5 diffs)
• ExtrudeAction.java (modified) (17 diffs)
• ImproveWayAccuracyAction.java (modified) (6 diffs)
• ImproveWayAccuracyHelper.java (modified) (3 diffs)
• MapMode.java (modified) (5 diffs)
• ParallelWayAction.java (modified) (6 diffs)
• PlayHeadDragMode.java (modified) (4 diffs)
• SelectAction.java (modified) (10 diffs)
• ZoomAction.java (modified) (3 diffs)

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.NoteInputDialog;
 import org.openstreetmap.josm.gui.Notification;
@@ -48 +50 @@
     public void enterMode() {
         super.enterMode();
-        Main.map.mapView.addMouseListener(this);
-        Main.map.keyDetector.addKeyListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.addMouseListener(this);
+        map.keyDetector.addKeyListener(this);
     }
 
@@ -55 +58 @@
     public void exitMode() {
         super.exitMode();
-        Main.map.mapView.removeMouseListener(this);
-        Main.map.keyDetector.removeKeyListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.removeMouseListener(this);
+        map.keyDetector.removeKeyListener(this);
     }
 
@@ -65 +69 @@
             return;
         }
-        Main.map.selectMapMode(Main.map.mapModeSelect);
+        MapFrame map = MainApplication.getMap();
+        map.selectMapMode(map.mapModeSelect);
 
         NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Create new note"), tr("Create note"));
@@ -76 +81 @@
         String input = dialog.getInputText();
         if (input != null && !input.isEmpty()) {
-            LatLon latlon = Main.map.mapView.getLatLon(e.getPoint().x, e.getPoint().y);
+            LatLon latlon = map.mapView.getLatLon(e.getPoint().x, e.getPoint().y);
             noteData.createNote(latlon, input);
         } else {
@@ -86 +91 @@
     public void doKeyPressed(KeyEvent e) {
         if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
-            Main.map.selectMapMode(Main.map.mapModeSelect);
+            MapFrame map = MainApplication.getMap();
+            map.selectMapMode(map.mapModeSelect);
         }
     }

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationDialogManager;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -110 +113 @@
         drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
 
-        Main.map.mapView.addMouseListener(this);
-        Main.map.mapView.addMouseMotionListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.addMouseListener(this);
+        map.mapView.addMouseMotionListener(this);
         // This is required to update the cursors when ctrl/shift/alt is pressed
-        Main.map.keyDetector.addModifierExListener(this);
+        map.keyDetector.addModifierExListener(this);
     }
 
@@ -119 +123 @@
     public void exitMode() {
         super.exitMode();
-        Main.map.mapView.removeMouseListener(this);
-        Main.map.mapView.removeMouseMotionListener(this);
-        Main.map.keyDetector.removeModifierExListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.removeMouseListener(this);
+        map.mapView.removeMouseMotionListener(this);
+        map.keyDetector.removeModifierExListener(this);
         removeHighlighting();
     }
@@ -245 +250 @@
      */
     private void updateCursor(MouseEvent e, int modifiers) {
-        if (!Main.isDisplayingMapView())
-            return;
-        if (!Main.map.mapView.isActiveLayerVisible() || e == null)
+        if (!MainApplication.isDisplayingMapView())
+            return;
+        MapFrame map = MainApplication.getMap();
+        if (!map.mapView.isActiveLayerVisible() || e == null)
             return;
 
         DeleteParameters parameters = getDeleteParameters(e, modifiers);
-        Main.map.mapView.setNewCursor(parameters.mode.cursor(), this);
+        map.mapView.setNewCursor(parameters.mode.cursor(), this);
     }
 
@@ -288 +294 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-        if (!Main.map.mapView.isActiveLayerVisible())
+        MapFrame map = MainApplication.getMap();
+        if (!map.mapView.isActiveLayerVisible())
             return;
 
         // request focus in order to enable the expected keyboard shortcuts
         //
-        Main.map.mapView.requestFocus();
+        map.mapView.requestFocus();
 
         Command c = buildDeleteCommands(e, e.getModifiersEx(), false);
@@ -318 +325 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.isDisplayingMapView() && Main.map.mapView.isActiveLayerDrawable());
+        setEnabled(MainApplication.isDisplayingMapView() && MainApplication.getMap().mapView.isActiveLayerDrawable());
     }
 
@@ -363 +370 @@
         DeleteParameters result = new DeleteParameters();
 
-        result.nearestNode = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive::isSelectable);
+        MapView mapView = MainApplication.getMap().mapView;
+        result.nearestNode = mapView.getNearestNode(e.getPoint(), OsmPrimitive::isSelectable);
         if (result.nearestNode == null) {
-            result.nearestSegment = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive::isSelectable);
+            result.nearestSegment = mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive::isSelectable);
             if (result.nearestSegment != null) {
                 if (shift) {

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);
         }
     }

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
@@ -335 +337 @@
      */
     public void checkAngleSnapping(EastNorth currentEN, double baseHeading, double curHeading) {
+        MapView mapView = MainApplication.getMap().mapView;
         EastNorth p0 = drawAction.getCurrentBaseNode().getEastNorth();
         EastNorth snapPoint = currentEN;
@@ -375 +378 @@
                 pe = Math.sin(phi);
                 pn = Math.cos(phi);
-                double scale = 20 * Main.map.mapView.getDist100Pixel();
+                double scale = 20 * mapView.getDist100Pixel();
                 dir2 = new EastNorth(e0 + scale * pe, n0 + scale * pn);
                 snapPoint = getSnapPoint(currentEN);
@@ -384 +387 @@
 
         // find out the distance, in metres, between the base point and projected point
-        LatLon mouseLatLon = Main.map.mapView.getProjection().eastNorth2latlon(snapPoint);
+        LatLon mouseLatLon = mapView.getProjection().eastNorth2latlon(snapPoint);
         double distance = this.drawAction.getCurrentBaseNode().getCoor().greatCircleDistance(mouseLatLon);
         double hdg = Utils.toDegrees(p0.heading(snapPoint));
@@ -436 +439 @@
         double dn = p.north()-n0;
         double l = de*pe+dn*pn;
-        double delta = Main.map.mapView.getDist100Pixel()/20;
+        double delta = MainApplication.getMap().mapView.getDist100Pixel()/20;
         if (!absoluteFix && l < delta) {
             active = false;

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();
 

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

@@ -40 +40 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.preferences.StrokeProperty;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.draw.MapViewPath;
@@ -138 +140 @@
         readPreferences();
 
-        mv = Main.map.mapView;
+        MapFrame map = MainApplication.getMap();
+        mv = map.mapView;
         mousePos = null;
         oldModeHelpText = "";
@@ -148 +151 @@
         updateStateByCurrentSelection();
 
-        Main.map.mapView.addMouseListener(this);
-        Main.map.mapView.addMouseMotionListener(this);
-        Main.map.mapView.addTemporaryLayer(temporaryLayer);
+        map.mapView.addMouseListener(this);
+        map.mapView.addMouseMotionListener(this);
+        map.mapView.addTemporaryLayer(temporaryLayer);
         DataSet.addSelectionListener(this);
 
-        Main.map.keyDetector.addModifierExListener(this);
+        map.keyDetector.addModifierExListener(this);
     }
 
@@ -165 +168 @@
         super.exitMode();
 
-        Main.map.mapView.removeMouseListener(this);
-        Main.map.mapView.removeMouseMotionListener(this);
-        Main.map.mapView.removeTemporaryLayer(temporaryLayer);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.removeMouseListener(this);
+        map.mapView.removeMouseMotionListener(this);
+        map.mapView.removeTemporaryLayer(temporaryLayer);
         DataSet.removeSelectionListener(this);
 
-        Main.map.keyDetector.removeModifierExListener(this);
+        map.keyDetector.removeModifierExListener(this);
         temporaryLayer.invalidate();
     }
@@ -179 +183 @@
         if (!newModeHelpText.equals(oldModeHelpText)) {
             oldModeHelpText = newModeHelpText;
-            Main.map.statusLine.setHelpText(newModeHelpText);
-            Main.map.statusLine.repaint();
+            MapFrame map = MainApplication.getMap();
+            map.statusLine.setHelpText(newModeHelpText);
+            map.statusLine.repaint();
         }
     }
@@ -348 +353 @@
     @Override
     public void modifiersExChanged(int modifiers) {
-        if (!Main.isDisplayingMapView() || !Main.map.mapView.isActiveLayerDrawable()) {
+        if (!MainApplication.isDisplayingMapView() || !MainApplication.getMap().mapView.isActiveLayerDrawable()) {
             return;
         }

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

@@ -6 +6 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -12 +11 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.tools.Geometry;
@@ -57 +57 @@
         }
 
-        return Main.map.mapView.getNearestWay(p, OsmPrimitive::isSelectable);
+        return MainApplication.getMap().mapView.getNearestWay(p, OsmPrimitive::isSelectable);
     }
 

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -99 +100 @@
         Main.pref.addPreferenceChangeListener(this);
         readPreferences();
-        Main.map.mapView.setNewCursor(cursor, this);
+        MainApplication.getMap().mapView.setNewCursor(cursor, this);
         updateStatusLine();
     }
@@ -109 +110 @@
         putValue("active", Boolean.FALSE);
         Main.pref.removePreferenceChangeListener(this);
-        Main.map.mapView.resetCursor(this);
+        MainApplication.getMap().mapView.resetCursor(this);
     }
 
     protected void updateStatusLine() {
-        if (Main.map != null && Main.map.statusLine != null) {
-            Main.map.statusLine.setHelpText(getModeHelpText());
-            Main.map.statusLine.repaint();
+        MapFrame map = MainApplication.getMap();
+        if (map != null && map.statusLine != null) {
+            map.statusLine.setHelpText(getModeHelpText());
+            map.statusLine.repaint();
         }
     }
@@ -134 +136 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (Main.isDisplayingMapView()) {
-            Main.map.selectMapMode(this);
+        if (MainApplication.isDisplayingMapView()) {
+            MainApplication.getMap().selectMapMode(this);
         }
     }
@@ -225 +227 @@
         if (isEnabled()) {
             // request focus in order to enable the expected keyboard shortcuts (see #8710)
-            Main.map.mapView.requestFocus();
+            MainApplication.getMap().mapView.requestFocus();
         }
     }

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

@@ -25 +25 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
@@ -40 +39 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.preferences.StrokeProperty;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -172 +172 @@
         mv.addTemporaryLayer(temporaryLayer);
 
-        //// Needed to update the mouse cursor if modifiers are changed when the mouse is motionless
-        Main.map.keyDetector.addModifierExListener(this);
+        // Needed to update the mouse cursor if modifiers are changed when the mouse is motionless
+        MainApplication.getMap().keyDetector.addModifierExListener(this);
         sourceWays = new LinkedHashSet<>(getLayerManager().getEditDataSet().getSelectedWays());
         for (Way w : sourceWays) {
@@ -186 +186 @@
         mv.removeMouseMotionListener(this);
         mv.removeTemporaryLayer(temporaryLayer);
-        Main.map.statusLine.setDist(-1);
-        Main.map.statusLine.repaint();
-        Main.map.keyDetector.removeModifierExListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.statusLine.setDist(-1);
+        map.statusLine.repaint();
+        map.keyDetector.removeModifierExListener(this);
         removeWayHighlighting(sourceWays);
         pWays = null;
@@ -217 +218 @@
     @Override
     public void modifiersExChanged(int modifiers) {
-        if (Main.map == null || mv == null || !mv.isActiveLayerDrawable())
+        if (MainApplication.getMap() == null || mv == null || !mv.isActiveLayerDrawable())
             return;
 
@@ -431 +432 @@
         pWays.changeOffset(d);
 
-        Main.map.statusLine.setDist(Math.abs(snappedRealD));
-        Main.map.statusLine.repaint();
+        MapFrame map = MainApplication.getMap();
+        map.statusLine.setDist(Math.abs(snappedRealD));
+        map.statusLine.repaint();
         temporaryLayer.invalidate();
     }

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

@@ -8 +8 @@
 import java.awt.event.MouseEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -38 +39 @@
     @Override 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);
     }
 
     @Override public void exitMode() {
         super.exitMode();
-        Main.map.mapView.removeMouseListener(this);
-        Main.map.mapView.removeMouseMotionListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.mapView.removeMouseListener(this);
+        map.mapView.removeMouseMotionListener(this);
     }
 
@@ -62 +65 @@
         }
         if (p.distance(mousePos) == 0) return;
-        playHeadMarker.drag(Main.map.mapView.getEastNorth(ev.getX(), ev.getY()));
+        playHeadMarker.drag(MainApplication.getMap().mapView.getEastNorth(ev.getX(), ev.getY()));
         mousePos = p;
     }
@@ -74 +77 @@
         updateKeyModifiers(ev);
 
-        EastNorth en = Main.map.mapView.getEastNorth(ev.getX(), ev.getY());
+        EastNorth en = MainApplication.getMap().mapView.getEastNorth(ev.getX(), ev.getY());
         if (!shift) {
             playHeadMarker.reposition(en);

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

@@ -40 +40 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.WireframeMapRenderer;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -209 +210 @@
         virtualManager.init();
         // This is required to update the cursors when ctrl/shift/alt is pressed
-        Main.map.keyDetector.addModifierExListener(this);
-        Main.map.keyDetector.addKeyListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.keyDetector.addModifierExListener(this);
+        map.keyDetector.addKeyListener(this);
     }
 
@@ -220 +222 @@
         mv.removeMouseMotionListener(this);
         mv.setVirtualNodesEnabled(false);
-        Main.map.keyDetector.removeModifierExListener(this);
-        Main.map.keyDetector.removeKeyListener(this);
+        MapFrame map = MainApplication.getMap();
+        map.keyDetector.removeModifierExListener(this);
+        map.keyDetector.removeKeyListener(this);
         removeHighlighting();
     }
@@ -227 +230 @@
     @Override
     public void modifiersExChanged(int modifiers) {
-        if (!Main.isDisplayingMapView() || oldEvent == null) return;
+        if (!MainApplication.isDisplayingMapView() || oldEvent == null) return;
         if (giveUserFeedback(oldEvent, modifiers)) {
             mv.repaint();
@@ -568 +571 @@
         startingDraggingPos = null;
         mouseReleaseTime = System.currentTimeMillis();
+        MapFrame map = MainApplication.getMap();
 
         if (mode == Mode.SELECT) {
@@ -578 +582 @@
             // Select Draw Tool if no selection has been made
             if (!cancelDrawMode && getLayerManager().getEditDataSet().selectionEmpty()) {
-                Main.map.selectDrawTool(true);
+                map.selectDrawTool(true);
                 updateStatusLine();
                 return;
@@ -599 +603 @@
                         // We need to do it like this as otherwise drawAction will see a double
                         // click and switch back to SelectMode
-                        Main.worker.execute(() -> Main.map.selectDrawTool(true));
+                        Main.worker.execute(() -> map.selectDrawTool(true));
                         return;
                     }
@@ -630 +634 @@
     @Override
     public void doKeyPressed(KeyEvent e) {
-        if (!repeatedKeySwitchLassoOption || !Main.isDisplayingMapView() || !getShortcut().isEvent(e))
+        if (!repeatedKeySwitchLassoOption || !MainApplication.isDisplayingMapView() || !getShortcut().isEvent(e))
             return;
         if (Logging.isDebugEnabled()) {
@@ -636 +640 @@
         }
         e.consume();
+        MapFrame map = MainApplication.getMap();
         if (!lassoMode) {
-            Main.map.selectMapMode(Main.map.mapModeSelectLasso);
+            map.selectMapMode(map.mapModeSelectLasso);
         } else {
-            Main.map.selectMapMode(Main.map.mapModeSelect);
+            map.selectMapMode(map.mapModeSelect);
         }
     }
@@ -751 +756 @@
                 Collection<Way> ways = ds.getSelectedWays();
                 if (doesImpactStatusLine(affectedNodes, ways)) {
-                    Main.map.statusLine.setDist(ways);
+                    MainApplication.getMap().statusLine.setDist(ways);
                 }
             } finally {

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);
     }