Changeset 9537 in josm

Timestamp:

2016-01-19T11:20:23+01:00 (8 years ago)

Author:

bastiK

Message:

applied #12370 - adapted osm file filter to other file types (patch by kolesar)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (4 diffs)
• io/OsmBzip2Exporter.java (modified) (2 diffs)
• io/OsmBzip2Importer.java (deleted)
• io/OsmExporter.java (modified) (1 diff)
• io/OsmGzipExporter.java (modified) (2 diffs)
• io/OsmGzipImporter.java (deleted)
• io/OsmImporter.java (modified) (2 diffs)
• io/OsmZipImporter.java (deleted)

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

@@ -53 +53 @@
         final List<Class<? extends FileImporter>> importerNames = Arrays.asList(
                 org.openstreetmap.josm.io.OsmImporter.class,
-                org.openstreetmap.josm.io.OsmGzipImporter.class,
-                org.openstreetmap.josm.io.OsmZipImporter.class,
                 org.openstreetmap.josm.io.OsmChangeImporter.class,
                 org.openstreetmap.josm.io.GpxImporter.class,
                 org.openstreetmap.josm.io.NMEAImporter.class,
                 org.openstreetmap.josm.io.NoteImporter.class,
-                org.openstreetmap.josm.io.OsmBzip2Importer.class,
                 org.openstreetmap.josm.io.JpgImporter.class,
                 org.openstreetmap.josm.io.WMSLayerImporter.class,
@@ -142 +139 @@
     }
 
+    public enum AddArchiveExtension { NONE, BASE, ALL }
+
     /**
      * Updates the {@link AllFormatsImporter} that is contained in the importers list. If
@@ -287 +286 @@
         this.defaultExtension = defaultExtension;
         this.description = description;
+    }
+
+    /**
+     * Construct an extension file filter with the extensions supported by {@link org.openstreetmap.josm.io.Compression}
+     * automatically added to the {@code extensions}. The specified {@code extensions} will be added to the description
+     * in the form {@code old-description (*.ext1, *.ext2)}.
+     * @param extensions The comma-separated list of file extensions
+     * @param defaultExtension The default extension
+     * @param description A short textual description of the file type without supported extensions in parentheses
+     * @param addArchiveExtension Whether to also add the archive extensions to the description
+     * @param archiveExtensions List of extensions to be added
+     * @return The constructed filter
+     */
+    public static ExtensionFileFilter newFilterWithArchiveExtensions(
+            String extensions, String defaultExtension, String description, AddArchiveExtension addArchiveExtension, List<String> archiveExtensions) {
+        final Collection<String> extensionsPlusArchive = new LinkedHashSet<>();
+        final Collection<String> extensionsForDescription = new LinkedHashSet<>();
+        for (String e : extensions.split(",")) {
+            extensionsPlusArchive.add(e);
+            if (addArchiveExtension != AddArchiveExtension.NONE) {
+                extensionsForDescription.add("*." + e);
+            }
+            for (String extension : archiveExtensions) {
+                extensionsPlusArchive.add(e + '.' + extension);
+                if (addArchiveExtension == AddArchiveExtension.ALL) {
+                    extensionsForDescription.add("*." + e + '.' + extension);
+                }
+            }
+        }
+        return new ExtensionFileFilter(
+            Utils.join(",", extensionsPlusArchive),
+            defaultExtension,
+            description + (!extensionsForDescription.isEmpty()
+                ? " (" + Utils.join(", ", extensionsForDescription) + ")"
+                : "")
+            );
     }
 
@@ -301 +336 @@
     public static ExtensionFileFilter newFilterWithArchiveExtensions(
             String extensions, String defaultExtension, String description, boolean addArchiveExtensionsToDescription) {
-        final Collection<String> extensionsPlusArchive = new LinkedHashSet<>();
-        final Collection<String> extensionsForDescription = new LinkedHashSet<>();
-        for (String e : extensions.split(",")) {
-            extensionsPlusArchive.add(e);
-            extensionsPlusArchive.add(e + ".gz");
-            extensionsPlusArchive.add(e + ".bz2");
-            extensionsForDescription.add("*." + e);
-            if (addArchiveExtensionsToDescription) {
-                extensionsForDescription.add("*." + e + ".gz");
-                extensionsForDescription.add("*." + e + ".bz2");
-            }
-        }
-        return new ExtensionFileFilter(Utils.join(",", extensionsPlusArchive), defaultExtension,
-                description + " (" + Utils.join(", ", extensionsForDescription) + ")");
+
+        List<String> archiveExtensions = Arrays.asList("gz", "bz2");
+        return newFilterWithArchiveExtensions(
+            extensions,
+            defaultExtension,
+            description,
+            addArchiveExtensionsToDescription ? AddArchiveExtension.ALL : AddArchiveExtension.BASE,
+            archiveExtensions
+        );
     }
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 
 /**
@@ -11 +15 @@
      */
     public OsmBzip2Exporter() {
-        super(OsmBzip2Importer.FILE_FILTER);
+        super(new ExtensionFileFilter(
+            "osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed") + " (*.osm.bz2, *.osm.bz)"));
     }
 

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

@@ -32 +32 @@
      */
     public OsmExporter() {
-        super(OsmImporter.FILE_FILTER);
+        super(new ExtensionFileFilter(
+            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm)"));
     }
 

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 
 /**
@@ -11 +15 @@
      */
     public OsmGzipExporter() {
-        super(OsmGzipImporter.FILE_FILTER);
+        super(new ExtensionFileFilter(
+            "osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)"));
     }
 

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

@@ -8 +8 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 
 import javax.swing.JOptionPane;
@@ -24 +25 @@
      * The OSM file filter (*.osm and *.xml files).
      */
-    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)");
+    public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
+            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm, *.osm.gz, *.osm.bz2, *.osm.zip, *.xml)", ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "zip"));
 
     /**