Changeset 5391 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

Timestamp:

2012-08-04T16:33:49+02:00 (12 years ago)

Author:

bastiK

Message:

add session support for imagery layers

File:

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

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -121 +121 @@
     protected boolean settingsChanged;
     protected ImageryInfo info;
-    protected final MapView mv;
+    protected MapView mv;
     public WmsCache cache;
     private AttributionSupport attribution = new AttributionSupport();
@@ -160 +160 @@
         super(info);
         imageSize = PROP_IMAGE_SIZE.get();
-        mv = Main.map.mapView;
         setBackgroundLayer(true); /* set global background variable */
         initializeImages();
+        this.info = new ImageryInfo(info);
+
+        attribution.initialize(this.info);
+
+        if(info.getUrl() != null) {
+            startGrabberThreads();
+        }
+        
+        Main.pref.addPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void hookUpMapView() {
+        mv = Main.map.mapView;
         if (info.getUrl() != null) {
             for (WMSLayer layer: Main.map.mapView.getLayersOfType(WMSLayer.class)) {
@@ -175 +188 @@
             }
         }
-        this.info = new ImageryInfo(info);
         if(this.info.getPixelPerDegree() == 0.0) {
             this.info.setPixelPerDegree(getPPD());
@@ -181 +193 @@
         resolution = mv.getDist100PixelText();
 
-        attribution.initialize(this.info);
-
-        if(info.getUrl() != null) {
-            startGrabberThreads();
-        }
-
-
-        Main.pref.addPreferenceChangeListener(this);
-
-        SwingUtilities.invokeLater(new Runnable() {
+        final MouseAdapter adapter = new MouseAdapter() {
             @Override
-            public void run() {
-                final MouseAdapter adapter = new MouseAdapter() {
-                    @Override
-                    public void mouseClicked(MouseEvent e) {
-                        if (!isVisible()) return;
-                        if (e.getButton() == MouseEvent.BUTTON1) {
-                            attribution.handleAttribution(e.getPoint(), true);
-                        }
-                    }
-                };
-                Main.map.mapView.addMouseListener(adapter);
-
-                MapView.addLayerChangeListener(new LayerChangeListener() {
-                    @Override
-                    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                        //
-                    }
-
-                    @Override
-                    public void layerAdded(Layer newLayer) {
-                        //
-                    }
-
-                    @Override
-                    public void layerRemoved(Layer oldLayer) {
-                        if (oldLayer == WMSLayer.this) {
-                            Main.map.mapView.removeMouseListener(adapter);
-                            MapView.removeLayerChangeListener(this);
-                        }
-                    }
-                });
+            public void mouseClicked(MouseEvent e) {
+                if (!isVisible()) return;
+                if (e.getButton() == MouseEvent.BUTTON1) {
+                    attribution.handleAttribution(e.getPoint(), true);
+                }
+            }
+        };
+        Main.map.mapView.addMouseListener(adapter);
+
+        MapView.addLayerChangeListener(new LayerChangeListener() {
+            @Override
+            public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+                //
+            }
+
+            @Override
+            public void layerAdded(Layer newLayer) {
+                //
+            }
+
+            @Override
+            public void layerRemoved(Layer oldLayer) {
+                if (oldLayer == WMSLayer.this) {
+                    Main.map.mapView.removeMouseListener(adapter);
+                    MapView.removeLayerChangeListener(this);
+                }
             }
         });