Changeset 32443 in osm for applications/editors/josm/plugins/ElevationProfile/src/org

Timestamp:

2016-06-29T21:05:34+02:00 (9 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation

Files:

• ElevationProfilePlugin.java (modified) (1 diff)
• actions/AddElevationLayerAction.java (modified) (2 diffs)
• gui/ElevationProfileDialog.java (modified) (8 diffs)

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfilePlugin.java

@@ -65 +65 @@
         if(currentLayer == null){
             currentLayer = new ElevationProfileLayer(tr("Elevation Profile"));
-            Main.main.addLayer(currentLayer);
+            Main.getLayerManager().addLayer(currentLayer);
         }
         return currentLayer;

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/actions/AddElevationLayerAction.java

@@ -14 +14 @@
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = -745642875640041385L;
@@ -27 +27 @@
         if (currentLayer == null) {
             currentLayer = new ElevationGridLayer(tr("Elevation Grid")); // TODO: Better name
-            Main.main.addLayer(currentLayer);
+            Main.getLayerManager().addLayer(currentLayer);
         }
     }

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 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.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
 import org.openstreetmap.josm.plugins.elevation.IElevationModel;
@@ -45 +49 @@
  * connection between layer and elevation profile.
  */
-public class ElevationProfileDialog extends ToggleDialog implements LayerChangeListener, ComponentListener {
+public class ElevationProfileDialog extends ToggleDialog implements LayerChangeListener, ActiveLayerChangeListener, ComponentListener {
 
     private static final String EMPTY_DATA_STRING = "-";
@@ -194 +198 @@
     @Override
     public void showNotify() {
-        MapView.addLayerChangeListener(this);
+        Main.getLayerManager().addLayerChangeListener(this);
+        Main.getLayerManager().addActiveLayerChangeListener(this);
         if (Main.isDisplayingMapView()) {
             Layer layer = Main.getLayerManager().getActiveLayer();
@@ -205 +210 @@
     @Override
     public void hideNotify() {
-        MapView.removeLayerChangeListener(this);
+        Main.getLayerManager().removeActiveLayerChangeListener(this);
+        Main.getLayerManager().removeLayerChangeListener(this);
     }
 
@@ -348 +354 @@
 
     @Override
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+        Layer newLayer = Main.getLayerManager().getActiveLayer();
         if (newLayer instanceof GpxLayer) {
             setActiveLayer((GpxLayer) newLayer);
@@ -366 +373 @@
             }
 
-            ElevationModel em = layerMap.get(newLayer);
-            setModel(em);
-        }
-    }
-
-    @Override
-    public void layerAdded(Layer newLayer) {
+            setModel(layerMap.get(newLayer));
+        }
+    }
+
+    @Override
+    public void layerAdded(LayerAddEvent e) {
+        Layer newLayer = e.getAddedLayer();
         if (newLayer instanceof GpxLayer) {
             GpxLayer gpxLayer = (GpxLayer) newLayer;
@@ -380 +387 @@
 
     @Override
-    public void layerRemoved(Layer oldLayer) {
+    public void layerRemoving(LayerRemoveEvent e) {
+        Layer oldLayer = e.getRemovedLayer();
         if (layerMap.containsKey(oldLayer)) {
             layerMap.remove(oldLayer);
@@ -394 +402 @@
 
     @Override
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
+    }
+
+    @Override
     public void componentHidden(ComponentEvent e) {
     }