Changeset 5391 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

bastiK

Message:

add session support for imagery layers

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• ImageryLayer.java (modified) (1 diff)
• Layer.java (modified) (1 diff)
• TMSLayer.java (modified) (4 diffs)
• WMSLayer.java (modified) (4 diffs)

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

@@ -83 +83 @@
             icon = new ImageProvider(info.getIcon()).setOptional(true).
                     setMaxHeight(ICON_SIZE).setMaxWidth(ICON_SIZE).get();
-            if (icon == null) {
-                icon = ImageProvider.get("imagery_small");
-            }
+        }
+        if (icon == null) {
+            icon = ImageProvider.get("imagery_small");
         }
         this.sharpenLevel = PROP_SHARPEN_LEVEL.get();

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

@@ -126 +126 @@
 
     /**
+     * Initialization code, that depends on Main.map.mapView.
+     *
+     * It is always called in the event dispatching thread.
+     * Note that Main.map is null as long as no layer has been added, so do
+     * not execute code in the constructor, that assumes Main.map.mapView is
+     * not null. Instead override this method.
+     */
+    public void hookUpMapView() {
+    }
+
+    /**
      * Paint the dataset using the engine set.
      * @param mv The object that can translate GeoPoints to screen coordinates.

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

@@ -38 +38 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.gui.jmapviewer.AttributionSupport;
@@ -471 +470 @@
             throw new IllegalStateException("Cannot create TMSLayer with non-TMS ImageryInfo");
         initTileSource(source);
-
+    }
+
+    /**
+     * Adds a context menu to the mapView.
+     */
+    @Override
+    public void hookUpMapView() {
         tileOptionMenu = new JPopupMenu();
 
@@ -521 +526 @@
             @Override
             public void actionPerformed(ActionEvent ae) {
-                //Main.debug("info tile: " + clickedTile);
                 if (clickedTile != null) {
                     showMetadataTile = clickedTile;
@@ -559 +563 @@
 
         // increase and decrease commands
-        tileOptionMenu.add(new JMenuItem(
-                new AbstractAction(tr("Increase zoom")) {
+        tileOptionMenu.add(new JMenuItem(new AbstractAction(
+                tr("Increase zoom")) {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                increaseZoomLevel();
+                redraw();
+            }
+        }));
+
+        tileOptionMenu.add(new JMenuItem(new AbstractAction(
+                tr("Decrease zoom")) {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                decreaseZoomLevel();
+                redraw();
+            }
+        }));
+
+        tileOptionMenu.add(new JMenuItem(new AbstractAction(
+                tr("Snap to tile size")) {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                double new_factor = Math.sqrt(getScaleFactor(currentZoomLevel));
+                Main.map.mapView.zoomToFactor(new_factor);
+                redraw();
+            }
+        }));
+
+        tileOptionMenu.add(new JMenuItem(new AbstractAction(
+                tr("Flush Tile Cache")) {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                new PleaseWaitRunnable(tr("Flush Tile Cache")) {
                     @Override
-                    public void actionPerformed(ActionEvent ae) {
-                        increaseZoomLevel();
-                        redraw();
+                    protected void realRun() throws SAXException, IOException,
+                            OsmTransferException {
+                        clearTileCache(getProgressMonitor());
                     }
-                }));
-
-        tileOptionMenu.add(new JMenuItem(
-                new AbstractAction(tr("Decrease zoom")) {
+
                     @Override
-                    public void actionPerformed(ActionEvent ae) {
-                        decreaseZoomLevel();
-                        redraw();
+                    protected void finish() {
                     }
-                }));
-
-        // FIXME: currently ran in errors
-
-        tileOptionMenu.add(new JMenuItem(
-                new AbstractAction(tr("Snap to tile size")) {
+
                     @Override
-                    public void actionPerformed(ActionEvent ae) {
-                        double new_factor = Math.sqrt(getScaleFactor(currentZoomLevel));
-                        Main.map.mapView.zoomToFactor(new_factor);
-                        redraw();
+                    protected void cancel() {
                     }
-                }));
+                }.run();
+            }
+        }));
         // end of adding menu commands
 
-        tileOptionMenu.add(new JMenuItem(
-                new AbstractAction(tr("Flush Tile Cache")) {
-                    @Override
-                    public void actionPerformed(ActionEvent ae) {
-                        new PleaseWaitRunnable(tr("Flush Tile Cache")) {
-                            
-                            @Override
-                            protected void realRun() throws SAXException, IOException,
-                                    OsmTransferException {
-                                clearTileCache(getProgressMonitor());
-                            }
-                            
-                            @Override
-                            protected void finish() {
-                            }
-                            
-                            @Override
-                            protected void cancel() {
-                            }
-                        }.run();
-                        
-                    }
-                }));
-        // end of adding menu commands
-
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                final MouseAdapter adapter = new MouseAdapter() {
-                    @Override
-                    public void mouseClicked(MouseEvent e) {
-                        if (!isVisible()) return;
-                        if (e.getButton() == MouseEvent.BUTTON3) {
-                            clickedTile = getTileForPixelpos(e.getX(), e.getY());
-                            tileOptionMenu.show(e.getComponent(), e.getX(), e.getY());
-                        } else 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 == TMSLayer.this) {
-                            Main.map.mapView.removeMouseListener(adapter);
-                            MapView.removeLayerChangeListener(this);
-                        }
-                    }
-                });
+        final MouseAdapter adapter = new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (!isVisible()) return;
+                if (e.getButton() == MouseEvent.BUTTON3) {
+                    clickedTile = getTileForPixelpos(e.getX(), e.getY());
+                    tileOptionMenu.show(e.getComponent(), e.getX(), e.getY());
+                } else 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 == TMSLayer.this) {
+                    Main.map.mapView.removeMouseListener(adapter);
+                    MapView.removeLayerChangeListener(this);
+                }
             }
         });

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);
+                }
             }
         });