Changeset 32465 in osm for applications/editors/josm/plugins/routing

Timestamp:

2016-06-30T20:00:35+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/routing

Files:

• .settings/org.eclipse.jdt.ui.prefs (added)
• src/com/innovant/josm/plugin/routing/RoutingPlugin.java (modified) (6 diffs)

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

@@ -42 +42 @@
 import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -65 +67 @@
  * @version 0.3
  */
-public class RoutingPlugin extends Plugin implements LayerChangeListener,DataSetListenerAdapter.Listener {
+public class RoutingPlugin extends Plugin implements LayerChangeListener, DataSetListenerAdapter.Listener {
     /**
      * Logger
@@ -152 +154 @@
         menu = new RoutingMenu();
         // Register this class as LayerChangeListener
-        MapView.addLayerChangeListener(this);
+        Main.getLayerManager().addLayerChangeListener(this);
         DatasetEventManager.getInstance().addDatasetListener(datasetAdapter, FireMode.IN_EDT_CONSOLIDATED);
         logger.debug("Finished loading plugin");
@@ -228 +230 @@
     }
 
-    public void layerAdded(Layer newLayer) {
+    @Override
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
+        // Do nothing
+    }
+
+    @Override
+    public void layerAdded(LayerAddEvent evt) {
+        Layer newLayer = evt.getAddedLayer();
         // Add button(s) to the tool bar when the routing layer is added
         if (newLayer instanceof RoutingLayer) {
@@ -238 +247 @@
     }
 
-    public void layerRemoved(Layer oldLayer) {
+    @Override
+    public void layerRemoving(LayerRemoveEvent evt) {
+        Layer oldLayer = evt.getRemovedLayer();
         if ((oldLayer instanceof RoutingLayer) & (layers.size()==1)) {
             // Remove button(s) from the tool bar when the last routing layer is removed
@@ -269 +280 @@
     }
 
+    @Override
     public void processDatasetEvent(AbstractDatasetChangedEvent event){