Changeset 5459 in josm for trunk/src/org/openstreetmap/josm/io

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• FileExporter.java (modified) (2 diffs)
• FileImporter.java (modified) (2 diffs)
• WMSLayerExporter.java (modified) (1 diff)
• WMSLayerImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/FileExporter.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 
-public abstract class FileExporter {
-    public ExtensionFileFilter filter;
+public abstract class FileExporter implements LayerChangeListener {
+    
+    public final ExtensionFileFilter filter;
+
+    private boolean enabled;
 
     public FileExporter(ExtensionFileFilter filter) {
         this.filter = filter;
+        this.enabled = true;
     }
 
@@ -24 +29 @@
         throw new IOException(tr("Could not export ''{0}''.", file.getName()));
     }
+
+    /**
+     * Returns the enabled state of this {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs. 
+     * @return true if this {@code FileExporter} is enabled
+     * @since 5459
+     */
+    public final boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Sets the enabled state of the {@code FileExporter}. When enabled, it is listed and usable in "File->Save" dialogs.
+     * @param enabled true to enable this {@code FileExporter}, false to disable it
+     * @since 5459
+     */
+    public final void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        // To be overriden by subclasses if their enabled state depends of the active layer nature
+    }
+
+    @Override
+    public void layerAdded(Layer newLayer) {
+        // To be overriden by subclasses if needed
+    }
+
+    @Override
+    public void layerRemoved(Layer oldLayer) {
+        // To be overriden by subclasses if needed
+    }
 }

trunk/src/org/openstreetmap/josm/io/FileImporter.java

@@ -17 +17 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
-public abstract class FileImporter implements Comparable<FileImporter> {
+public abstract class FileImporter implements Comparable<FileImporter>, LayerChangeListener {
 
     public final ExtensionFileFilter filter;
+    
+    private boolean enabled;
 
     public FileImporter(ExtensionFileFilter filter) {
         this.filter = filter;
+        this.enabled = true;
     }
 
@@ -122 +127 @@
         return new GZIPInputStream(in);
     }
+
+    /**
+     * Returns the enabled state of this {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog. 
+     * @return true if this {@code FileImporter} is enabled
+     * @since 5459
+     */
+    public final boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Sets the enabled state of the {@code FileImporter}. When enabled, it is listed and usable in "File->Open" dialog.
+     * @param enabled true to enable this {@code FileImporter}, false to disable it
+     * @since 5459
+     */
+    public final void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        // To be overriden by subclasses if their enabled state depends of the active layer nature
+    }
+
+    @Override
+    public void layerAdded(Layer newLayer) {
+        // To be overriden by subclasses if needed
+    }
+
+    @Override
+    public void layerRemoved(Layer oldLayer) {
+        // To be overriden by subclasses if needed
+    }
 }

trunk/src/org/openstreetmap/josm/io/WMSLayerExporter.java

@@ -38 +38 @@
         }
     }
+
+    @Override
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        setEnabled(newLayer instanceof WMSLayer);
+    }
 }

trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java

@@ -9 +9 @@
 import java.io.ObjectInputStream;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -55 +57 @@
             ois.close();
         }
+        
+        // FIXME: remove UI stuff from IO subsystem
+        GuiHelper.runInEDT(new Runnable() {
+            @Override
+            public void run() {
+                Main.main.addLayer(wmsLayer);
+                wmsLayer.onPostLoadFromFile();
+            }
+        });
     }