Changeset 32476 in osm for applications/editors/josm/plugins/walkingpapers/src

Timestamp:

2016-06-30T23:56:10+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers

Files:

• WalkingPapersAddLayerAction.java (modified) (1 diff)
• WalkingPapersLayer.java (modified) (9 diffs)

applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java

@@ -85 +85 @@
 
         WalkingPapersLayer wpl = new WalkingPapersLayer(mungedWpId, tile, b, minz, maxz);
-        Main.main.addLayer(wpl);
-
+        Main.getLayerManager().addLayer(wpl);
     }
 

applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 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.tools.ImageProvider;
 
@@ -67 +72 @@
         clearTileStorage();
 
-        MapView.addLayerChangeListener(new LayerChangeListener() {
-            public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                // if user changes to a walking papers layer, zoom there just as if
-                // it was newly added
-                layerAdded(newLayer);
-            }
-
-            public void layerAdded(Layer newLayer) {
-                // only do something if we are affected
-                if (newLayer != WalkingPapersLayer.this) return;
-                BoundingXYVisitor bbox = new BoundingXYVisitor();
-                bbox.visit(printBounds);
-                Main.map.mapView.zoomTo(bbox);
-                needRedraw = true;
-            }
-
-            public void layerRemoved(Layer oldLayer) {
-                if (oldLayer == WalkingPapersLayer.this) {
-                    MapView.removeLayerChangeListener(this);
+        final ActiveLayerChangeListener activeListener = new ActiveLayerChangeListener() {
+            @Override
+            public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+                // if user changes to a walking papers layer, zoom there just as if it was newly added
+                handleNewLayer(Main.getLayerManager().getActiveLayer());
+            }
+        };
+
+        Main.getLayerManager().addActiveLayerChangeListener(activeListener);
+        Main.getLayerManager().addLayerChangeListener(new LayerChangeListener() {
+
+            @Override
+            public void layerAdded(LayerAddEvent e) {
+                handleNewLayer(e.getAddedLayer());
+            }
+
+            @Override
+            public void layerRemoving(LayerRemoveEvent e) {
+                if (e.getRemovedLayer() == WalkingPapersLayer.this) {
+                    Main.getLayerManager().removeLayerChangeListener(this);
+                    Main.getLayerManager().removeActiveLayerChangeListener(activeListener);
                 }
             }
+
+            @Override
+            public void layerOrderChanged(LayerOrderChangeEvent e) {
+            }
         });
+    }
+
+    private void handleNewLayer(Layer newLayer) {
+        // only do something if we are affected
+        if (newLayer != WalkingPapersLayer.this) return;
+        BoundingXYVisitor bbox = new BoundingXYVisitor();
+        bbox.visit(printBounds);
+        Main.map.mapView.zoomTo(bbox);
+        needRedraw = true;
     }
 
@@ -117 +137 @@
 
     static class TileTimeComp implements Comparator<WalkingPapersTile> {
+        @Override
         public int compare(WalkingPapersTile s1, WalkingPapersTile s2) {
             long t1 = s1.access_time();
@@ -170 +191 @@
         int realHeight = img.getHeight(this);
         if (realWidth == -1 || realHeight == -1)
-                return null;
+            return null;
         int drawWidth = p1.x - p0.x;
         int drawHeight = p1.x - p0.x;
@@ -189 +210 @@
 
         if (botRight.lon() == 0.0 || botRight.lat() == 0) {
-                // probably still initializing
-                return;
+            // probably still initializing
+            return;
         }
         if (lastTopLeft != null && lastBotRight != null
@@ -209 +230 @@
 
         if (!LatLon.isValidLat(topLeft.lat())  ||
-            !LatLon.isValidLat(botRight.lat()) ||
-            !LatLon.isValidLon(topLeft.lon())  ||
-            !LatLon.isValidLon(botRight.lon()))
+                !LatLon.isValidLat(botRight.lat()) ||
+                !LatLon.isValidLon(topLeft.lon())  ||
+                !LatLon.isValidLon(botRight.lon()))
             return;
 
@@ -257 +278 @@
                     // check if tile is in range
                     Bounds tileBounds = new Bounds(new LatLon(tileYToLat(y+1), tileXToLon(x)),
-                        new LatLon(tileYToLat(y), tileXToLon(x+1)));
+                            new LatLon(tileYToLat(y), tileXToLon(x+1)));
                     if (!tileBounds.asRect().intersects(printBounds.asRect())) continue;
                     tile = new WalkingPapersTile(x, y, currentZoomLevel, this);
@@ -397 +418 @@
     }
 
+    @Override
     public boolean imageUpdate(Image img, int infoflags, int x, int y,
             int width, int height) {
@@ -414 +436 @@
     public URL formatImageUrl(int x, int y, int z) {
         String urlstr = tileUrlTemplate.
-            replace("{x}", String.valueOf(x)).
-            replace("{y}", String.valueOf(y)).
-            replace("{z}", String.valueOf(z));
+                replace("{x}", String.valueOf(x)).
+                replace("{y}", String.valueOf(y)).
+                replace("{z}", String.valueOf(z));
         try {
             return new URL(urlstr);