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

Timestamp:

2012-08-20T01:11:45+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #2961 - Improve usability of WMS Layer Saving/Loading

• Replaced the unconventional method of creating a blank layer, then loading a .wms file to a standard File->Open approach
• Fixed memory leaks with some actions registered as listeners but never destroyed
• Layer interface modified to allow a generic approach of layer saving in SaveActionBase rather than the previous one restricted to OSM and GPX data
• FileImporters and FileExporters can now be enabled/disabled at runtime, for example when the active layer changes

File:

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

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

@@ -33 +33 @@
 import javax.swing.Action;
 import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JFileChooser;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -39 +38 @@
 import org.openstreetmap.gui.jmapviewer.AttributionSupport;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.DiskAccessAction;
 import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.Bounds;
@@ -62 +60 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
-import org.openstreetmap.josm.io.WMSLayerExporter;
 import org.openstreetmap.josm.io.WMSLayerImporter;
 import org.openstreetmap.josm.io.imagery.Grabber;
@@ -70 +66 @@
 import org.openstreetmap.josm.io.imagery.WMSGrabber;
 import org.openstreetmap.josm.io.imagery.WMSRequest;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 
@@ -124 +119 @@
     protected boolean settingsChanged;
     protected ImageryInfo info;
-    protected MapView mv;
     public WmsCache cache;
     private AttributionSupport attribution = new AttributionSupport();
@@ -178 +172 @@
     @Override
     public void hookUpMapView() {
-        mv = Main.map.mapView;
         if (info.getUrl() != null) {
             for (WMSLayer layer: Main.map.mapView.getLayersOfType(WMSLayer.class)) {
@@ -194 +187 @@
             this.info.setPixelPerDegree(getPPD());
         }
-        resolution = mv.getDist100PixelText();
+        resolution = Main.map.mapView.getDist100PixelText();
 
         final MouseAdapter adapter = new MouseAdapter() {
@@ -484 +477 @@
                 SeparatorLayerAction.INSTANCE,
                 new OffsetAction(),
-                new LoadWmsAction(),
-                new SaveWmsAction(),
+                new LayerSaveAction(this),
+                new LayerSaveAsAction(this),
                 new BookmarkWmsAction(),
                 SeparatorLayerAction.INSTANCE,
@@ -523 +516 @@
             return -1;
 
-        EastNorth cursorEastNorth = mv.getEastNorth(mv.lastMEvent.getX(), mv.lastMEvent.getY());
+        MouseEvent lastMEvent = Main.map.mapView.lastMEvent;
+        EastNorth cursorEastNorth = Main.map.mapView.getEastNorth(lastMEvent.getX(), lastMEvent.getY());
         int mouseX = getImageXIndex(cursorEastNorth.east());
         int mouseY = getImageYIndex(cursorEastNorth.north());
@@ -605 +599 @@
             if (request.getState() != null && !request.isPrecacheOnly()) {
                 finishedRequests.add(request);
-                mv.repaint();
+                Main.map.mapView.repaint();
             }
         } finally {
@@ -669 +663 @@
                         );
             } else {
-                downloadAndPaintVisible(mv.getGraphics(), mv, true);
+                downloadAndPaintVisible(Main.map.mapView.getGraphics(), Main.map.mapView, true);
             }
         }
@@ -680 +674 @@
 
         private void changeResolution(WMSLayer layer) {
-            layer.resolution = layer.mv.getDist100PixelText();
+            layer.resolution = Main.map.mapView.getDist100PixelText();
             layer.info.setPixelPerDegree(layer.getPPD());
             layer.settingsChanged = true;
@@ -761 +755 @@
                 }
             }
-            mv.repaint();
+            Main.map.mapView.repaint();
         }
         @Override
@@ -775 +769 @@
     }
 
-    public class SaveWmsAction extends AbstractAction {
-        public SaveWmsAction() {
-            super(tr("Save WMS layer to file"), ImageProvider.get("save"));
-        }
-        @Override
-        public void actionPerformed(ActionEvent ev) {
-            File f = SaveActionBase.createAndOpenSaveFileChooser(
-                    tr("Save WMS layer"), WMSLayerImporter.FILE_FILTER);
-            try {
-                new WMSLayerExporter().exportData(f, WMSLayer.this);
-            } catch (Exception ex) {
-                ex.printStackTrace(System.out);
-            }
-        }
-    }
-
-    public class LoadWmsAction extends AbstractAction {
-        public LoadWmsAction() {
-            super(tr("Load WMS layer from file"), ImageProvider.get("open"));
-        }
-        @Override
-        public void actionPerformed(ActionEvent ev) {
-            JFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true,
-                    false, tr("Load WMS layer"), WMSLayerImporter.FILE_FILTER, JFileChooser.FILES_ONLY, null);
-            if (fc == null) return;
-            File f = fc.getSelectedFile();
-            if (f == null) return;
-            try {
-                new WMSLayerImporter(WMSLayer.this).importData(f, NullProgressMonitor.INSTANCE);
-            } catch (InvalidClassException ex) {
-                JOptionPane.showMessageDialog(Main.parent, ex.getMessage(), tr("File Format Error"), JOptionPane.ERROR_MESSAGE);
-                return;
-            } catch (Exception ex) {
-                ex.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent, ex.getMessage(), tr("Error loading file"), JOptionPane.ERROR_MESSAGE);
-                return;
-            }
-        }
-    }
-    
     /**
      * This action will add a WMS layer menu entry with the current WMS layer
@@ -860 +814 @@
                     }
                 }
-                mv.repaint();
+                Main.map.mapView.repaint();
             }
         }
@@ -952 +906 @@
     }
 
-    protected Grabber getGrabber(boolean localOnly){
-        if(getInfo().getImageryType() == ImageryType.HTML)
-            return new HTMLGrabber(mv, this, localOnly);
-        else if(getInfo().getImageryType() == ImageryType.WMS)
-            return new WMSGrabber(mv, this, localOnly);
+    protected Grabber getGrabber(boolean localOnly) {
+        if (getInfo().getImageryType() == ImageryType.HTML)
+            return new HTMLGrabber(Main.map.mapView, this, localOnly);
+        else if (getInfo().getImageryType() == ImageryType.WMS)
+            return new WMSGrabber(Main.map.mapView, this, localOnly);
         else throw new IllegalStateException("getGrabber() called for non-WMS layer type");
     }
@@ -1042 +996 @@
         
         settingsChanged = true;
-        mv.repaint();
+        if (Main.isDisplayingMapView()) {
+            Main.map.mapView.repaint();
+        }
         if (cache != null) {
             cache.saveIndex();
             cache = null;
         }
+    }
+
+    @Override
+    public void onPostLoadFromFile() {
         if (info.getUrl() != null) {
             cache = new WmsCache(info.getUrl(), imageSize);
@@ -1052 +1012 @@
         }
     }
+
+    @Override
+    public boolean isSavable() {
+        return true; // With WMSLayerExporter
+    }
+
+    @Override
+    public File createAndOpenSaveFileChooser() {
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save WMS file"), WMSLayerImporter.FILE_FILTER);
+    }
 }