Ignore:
Timestamp:
2017-11-06T23:17:11+01:00 (7 years ago)
Author:
donvip
Message:

update to JOSM 12840

Location:
applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java

    r32768 r33794  
    77
    88import org.apache.log4j.Logger;
    9 import org.openstreetmap.josm.Main;
    109import org.openstreetmap.josm.actions.mapmode.MapMode;
    1110import org.openstreetmap.josm.data.osm.Node;
    12 import org.openstreetmap.josm.gui.MapFrame;
     11import org.openstreetmap.josm.gui.MainApplication;
    1312import org.openstreetmap.josm.gui.layer.Layer;
    1413import org.openstreetmap.josm.tools.ImageProvider;
    … …  
    3534     * @param mapFrame map frame
    3635     */
    37     public AddRouteNodeAction(MapFrame mapFrame) {
     36    public AddRouteNodeAction() {
    3837        // TODO Use constructor with shortcut
    3938        super(tr("Routing"), "add",
    4039                tr("Click to add destination."),
    41                 mapFrame, ImageProvider.getCursor("crosshair", null));
     40                ImageProvider.getCursor("crosshair", null));
    4241    }
    4342
    4443    @Override public void enterMode() {
    4544        super.enterMode();
    46         Main.map.mapView.addMouseListener(this);
     45        MainApplication.getMap().mapView.addMouseListener(this);
    4746    }
    4847
    4948    @Override public void exitMode() {
    5049        super.exitMode();
    51         Main.map.mapView.removeMouseListener(this);
     50        MainApplication.getMap().mapView.removeMouseListener(this);
    5251    }
    5352
    … …  
    5756            // Search for nearest highway node
    5857            Node node = null;
    59             if (Main.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
    60                 RoutingLayer layer = (RoutingLayer) Main.getLayerManager().getActiveLayer();
     58            if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
     59                RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
    6160                node = layer.getNearestHighwayNode(e.getPoint());
    6261                if (node == null) {
    … …  
    6968            }
    7069        }
    71         Main.map.repaint();
     70        MainApplication.getMap().repaint();
    7271    }
    7372

  • applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java

    r32768 r33794  
    99
    1010import org.apache.log4j.Logger;
    11 import org.openstreetmap.josm.Main;
    1211import org.openstreetmap.josm.actions.mapmode.MapMode;
    1312import org.openstreetmap.josm.data.osm.Node;
    14 import org.openstreetmap.josm.gui.MapFrame;
     13import org.openstreetmap.josm.gui.MainApplication;
    1514import org.openstreetmap.josm.gui.layer.Layer;
    1615import org.openstreetmap.josm.tools.ImageProvider;
    … …  
    4948     * @param mapFrame map frame
    5049     */
    51     public MoveRouteNodeAction(MapFrame mapFrame) {
     50    public MoveRouteNodeAction() {
    5251        // TODO Use constructor with shortcut
    5352        super(tr("Routing"), "move",
    5453                tr("Click and drag to move destination"),
    55                 mapFrame, ImageProvider.getCursor("normal", "move"));
     54                ImageProvider.getCursor("normal", "move"));
    5655    }
    5756
    5857    @Override public void enterMode() {
    5958        super.enterMode();
    60         Main.map.mapView.addMouseListener(this);
     59        MainApplication.getMap().mapView.addMouseListener(this);
    6160    }
    6261
    6362    @Override public void exitMode() {
    6463        super.exitMode();
    65         Main.map.mapView.removeMouseListener(this);
     64        MainApplication.getMap().mapView.removeMouseListener(this);
    6665    }
    6766
    … …  
    6968        // If left button is pressed
    7069        if (e.getButton() == MouseEvent.BUTTON1) {
    71             if (Main.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
     70            if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
    7271                requestFocusInMapView();
    73                 RoutingLayer layer = (RoutingLayer) Main.getLayerManager().getActiveLayer();
     72                RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
    7473                RoutingModel routingModel = layer.getRoutingModel();
    7574                // Search for the nearest node in the list
    … …  
    7978                for (int i = 0; i < nl.size(); i++) {
    8079                    Node node = nl.get(i);
    81                     double d = Main.map.mapView.getPoint(node).distanceSq(e.getPoint());
     80                    double d = MainApplication.getMap().mapView.getPoint(node).distanceSq(e.getPoint());
    8281                    if (d < dmax) {
    8382                        dmax = d;
    … …  
    102101
    103102    private void searchAndReplaceNode(Point point) {
    104         if (Main.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
    105             RoutingLayer layer = (RoutingLayer) Main.getLayerManager().getActiveLayer();
     103        if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
     104            RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
    106105            RoutingModel routingModel = layer.getRoutingModel();
    107106            RoutingDialog routingDialog = RoutingPlugin.getInstance().getRoutingDialog();
    … …  
    118117            routingModel.insertNode(index, node);
    119118            routingDialog.insertNode(index, node);
    120             Main.map.repaint();
     119            MainApplication.getMap().repaint();
    121120        }
    122121    }

  • applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java

    r32768 r33794  
    88
    99import org.apache.log4j.Logger;
    10 import org.openstreetmap.josm.Main;
    1110import org.openstreetmap.josm.actions.mapmode.MapMode;
    1211import org.openstreetmap.josm.data.osm.Node;
    13 import org.openstreetmap.josm.gui.MapFrame;
     12import org.openstreetmap.josm.gui.MainApplication;
    1413import org.openstreetmap.josm.gui.layer.Layer;
    1514import org.openstreetmap.josm.tools.ImageProvider;
    … …  
    3837    static Logger logger = Logger.getLogger(RoutingLayer.class);
    3938
    40     public RemoveRouteNodeAction(MapFrame mapFrame) {
     39    public RemoveRouteNodeAction() {
    4140        // TODO Use constructor with shortcut
    4241        super(tr("Routing"), "remove",
    4342                tr("Click to remove destination"),
    44                 mapFrame, ImageProvider.getCursor("normal", "delete"));
     43                ImageProvider.getCursor("normal", "delete"));
    4544    }
    4645
    4746    @Override public void enterMode() {
    4847        super.enterMode();
    49         Main.map.mapView.addMouseListener(this);
     48        MainApplication.getMap().mapView.addMouseListener(this);
    5049    }
    5150
    5251    @Override public void exitMode() {
    5352        super.exitMode();
    54         Main.map.mapView.removeMouseListener(this);
     53        MainApplication.getMap().mapView.removeMouseListener(this);
    5554    }
    5655
    … …  
    5857        // If left button is clicked
    5958        if (e.getButton() == MouseEvent.BUTTON1) {
    60             if (Main.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
    61                 RoutingLayer layer = (RoutingLayer) Main.getLayerManager().getActiveLayer();
     59            if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
     60                RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
    6261                RoutingModel routingModel = layer.getRoutingModel();
    6362                // Search for the nearest node in the list
    … …  
    6766                for (int i = 0; i < nl.size(); i++) {
    6867                    Node node = nl.get(i);
    69                     double d = Main.map.mapView.getPoint(node).distanceSq(e.getPoint());
     68                    double d = MainApplication.getMap().mapView.getPoint(node).distanceSq(e.getPoint());
    7069                    if (d < dmax) {
    7170                        dmax = d;
    … …  
    7978                    routingModel.removeNode(index);
    8079                    RoutingPlugin.getInstance().getRoutingDialog().removeNode(index);
    81                     Main.map.repaint();
     80                    MainApplication.getMap().repaint();
    8281                } else {
    8382                    logger.debug("Can't find a node to remove.");
Note: See TracChangeset for help on using the changeset viewer.