Ignore:
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()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r12620 r12630  
    3535import org.openstreetmap.josm.gui.HelpAwareOptionPane;
    3636import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
     37import org.openstreetmap.josm.gui.MainApplication;
     38import org.openstreetmap.josm.gui.MapView;
    3739import org.openstreetmap.josm.gui.Notification;
    3840import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
     
    7577
    7678        if (selectedNodes.size() == 1) {
    77             List<Node> nearestNodes = Main.map.mapView.getNearestNodes(
    78                     Main.map.mapView.getPoint(selectedNodes.get(0)), selectedNodes, OsmPrimitive::isUsable);
     79            MapView mapView = MainApplication.getMap().mapView;
     80            List<Node> nearestNodes = mapView.getNearestNodes(
     81                    mapView.getPoint(selectedNodes.get(0)), selectedNodes, OsmPrimitive::isUsable);
    7982            if (nearestNodes.isEmpty()) {
    8083                new Notification(
Note: See TracChangeset for help on using the changeset viewer.