Changeset 32349 in osm

Timestamp:

2016-06-21T00:11:48+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing

Files:

• RoutingLayer.java (modified) (1 diff)
• RoutingPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java

@@ -221 +221 @@
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds bounds) {
-        boolean isActiveLayer = (mv.getActiveLayer().equals(this));
+        boolean isActiveLayer = (mv.getLayerManager().getActiveLayer().equals(this));
         // Get routing nodes (start, middle, end)
         List<Node> nodes = routingModel.getSelectedNodes();

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java

@@ -174 +174 @@
 
     public void addLayer() {
-        OsmDataLayer osmLayer = Main.main.getEditLayer();
+        OsmDataLayer osmLayer = Main.getLayerManager().getEditLayer();
         if (osmLayer != null) {
             RoutingLayer layer = new RoutingLayer(tr("Routing") + " [" + osmLayer.getName() + "]", osmLayer);
             layers.add(layer);
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
         }
     }
@@ -256 +256 @@
                     try {
                         // Remove layer
-                        Main.main.removeLayer(layersArray[i]);
+                        Main.getLayerManager().removeLayer(layersArray[i]);
                     } catch (IllegalArgumentException e) {
+                        Main.error(e);
                     }
                 }