Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
- Timestamp:
- 2017-08-24T00:15:51+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
r12620 r12630 35 35 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 36 36 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; 37 import org.openstreetmap.josm.gui.MainApplication; 38 import org.openstreetmap.josm.gui.MapView; 37 39 import org.openstreetmap.josm.gui.Notification; 38 40 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog; … … 75 77 76 78 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); 79 82 if (nearestNodes.isEmpty()) { 80 83 new Notification(
Note:
See TracChangeset
for help on using the changeset viewer.