Changeset 10386 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

Timestamp:

2016-06-15T17:25:04+02:00 (8 years ago)

Author:

Don-vip

Message:

gsoc-core - remove more deprecation warnings

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -51 +51 @@
 import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -62 +61 @@
 import org.openstreetmap.josm.gui.layer.JumpToMarkerActions.JumpToPreviousMarker;
 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.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.JpgImporter;
@@ -889 +894 @@
         mapModeListener.mapModeChange(null, Main.map.mapMode);
 
-        MapView.addLayerChangeListener(new LayerChangeListener() {
+        Main.getLayerManager().addActiveLayerChangeListener(new ActiveLayerChangeListener() {
             @Override
-            public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                if (newLayer == GeoImageLayer.this) {
+            public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+                if (Main.getLayerManager().getActiveLayer() == GeoImageLayer.this) {
                     // only in select mode it is possible to click the images
                     Main.map.selectSelectTool(false);
                 }
             }
-
+        });
+
+        Main.getLayerManager().addLayerChangeListener(new LayerChangeListener() {
             @Override
-            public void layerAdded(Layer newLayer) {
+            public void layerAdded(LayerAddEvent e) {
                 // Do nothing
             }
 
             @Override
-            public void layerRemoved(Layer oldLayer) {
-                if (oldLayer == GeoImageLayer.this) {
+            public void layerRemoving(LayerRemoveEvent e) {
+                if (e.getRemovedLayer() == GeoImageLayer.this) {
                     stopLoadThumbs();
                     Main.map.mapView.removeMouseListener(mouseAdapter);
@@ -915 +922 @@
                     data = null;
                     // stop listening to layer change events
-                    MapView.removeLayerChangeListener(this);
-                }
+                    Main.getLayerManager().removeLayerChangeListener(this);
+                }
+            }
+
+            @Override
+            public void layerOrderChanged(LayerOrderChangeEvent e) {
+                // Do nothing
             }
         });