Changeset 5459 in josm for trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.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/actions/ExtensionFileFilter.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -12 +12 @@
 import javax.swing.filechooser.FileFilter;
 
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.io.AllFormatsImporter;
 import org.openstreetmap.josm.io.FileExporter;
@@ -51 +52 @@
                 "org.openstreetmap.josm.io.OsmBzip2Importer",
                 "org.openstreetmap.josm.io.JpgImporter",
+                "org.openstreetmap.josm.io.WMSLayerImporter",
                 "org.openstreetmap.josm.io.AllFormatsImporter"
         };
@@ -56 +58 @@
         for (String classname : importerNames) {
             try {
-                Class<?> klass = Class.forName(classname);
-                importers.add((FileImporter) klass.newInstance());
-            } catch (Exception e) {}
+                FileImporter importer = (FileImporter) Class.forName(classname).newInstance();
+                importers.add(importer);
+                MapView.addLayerChangeListener(importer);
+            } catch (Throwable t) { }
         }
 
@@ -69 +72 @@
                 "org.openstreetmap.josm.io.OsmBzip2Exporter",
                 "org.openstreetmap.josm.io.GeoJSONExporter",
+                "org.openstreetmap.josm.io.WMSLayerExporter"
         };
 
         for (String classname : exporterNames) {
             try {
-                Class<?> klass = Class.forName(classname);
-                exporters.add((FileExporter)klass.newInstance());
-            } catch (Exception e) {}
+                FileExporter exporter = (FileExporter)Class.forName(classname).newInstance();
+                exporters.add(exporter);
+                MapView.addLayerChangeListener(exporter);
+            } catch (Throwable t) { }
         }
     }
@@ -134 +139 @@
 
     /**
-     * Replies an ordered list of {@link ExtensionFileFilter}s for exporting.
+     * Replies an ordered list of enabled {@link ExtensionFileFilter}s for exporting.
      * The list is ordered according to their description, an {@link AllFormatsImporter}
      * is append at the end.
      *
-     * @return an ordered list of {@link ExtensionFileFilter}s for exporting.
+     * @return an ordered list of enabled {@link ExtensionFileFilter}s for exporting.
      * @since 2029
      */
@@ -144 +149 @@
         LinkedList<ExtensionFileFilter> filters = new LinkedList<ExtensionFileFilter>();
         for (FileExporter exporter : exporters) {
-            if (filters.contains(exporter.filter)) {
+            if (filters.contains(exporter.filter) || !exporter.isEnabled()) {
                 continue;
             }