Changeset 8895 in josm for trunk/src

Timestamp:

2015-10-18T13:00:40+02:00 (9 years ago)

Author:

simon04

Message:

Refactor usage of ExtensionFileFilter introduced in r8894

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (2 diffs)
• io/GpxImporter.java (modified) (1 diff)
• io/NMEAImporter.java (modified) (1 diff)
• io/NoteImporter.java (modified) (1 diff)
• io/OsmChangeImporter.java (modified) (1 diff)

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

@@ -287 +287 @@
      * @param defaultExtension The default extension
      * @param description A short textual description of the file type without supported extensions in parentheses
+     * @param addArchiveExtensionsToDescription Whether to also add the archive extensions to the description
      * @return The constructed filter
      */
-    public static ExtensionFileFilter newFilterWithArchiveExtensions(String extensions, String defaultExtension, String description) {
+    public static ExtensionFileFilter newFilterWithArchiveExtensions(
+            String extensions, String defaultExtension, String description, boolean addArchiveExtensionsToDescription) {
         final Collection<String> extensionsPlusArchive = new LinkedHashSet<>();
         final Collection<String> extensionsForDescription = new LinkedHashSet<>();
@@ -297 +299 @@
             extensionsPlusArchive.add(e + ".bz2");
             extensionsForDescription.add("*." + e);
-            // intentionally do not add [e].gz and [e].bz2 to extensionsForDescription in order to avoid long texts
+            if (addArchiveExtensionsToDescription) {
+                extensionsForDescription.add("*." + e + ".gz");
+                extensionsForDescription.add("*." + e + ".bz2");
+            }
         }
         return new ExtensionFileFilter(Utils.join(",", extensionsPlusArchive), defaultExtension,

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

@@ -28 +28 @@
      * The GPX file filter (*.gpx and *.gpx.gz files).
      */
-    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "gpx,gpx.gz,gpx.bz2", "gpx", tr("GPX Files") + " (*.gpx *.gpx.gz, *.gpx.bz2)");
+    public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
+            "gpx", "gpx", tr("GPX Files"), true);
 
     /**

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

@@ -31 +31 @@
      */
     public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
-            "nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files"));
+            "nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files"), false);
 
     /**

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

@@ -18 +18 @@
 
 /**
- * File importer that reads note dump files (*.osn and .osn.bz2)
+ * File importer that reads note dump files (*.osn, .osn.gz and .osn.bz2)
  * @since 7538
  */
 public class NoteImporter extends FileImporter {
 
-    private static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "osn,osn.bz2", "osn", tr("Note Files") + " (*.osn *.osn.bz2)");
+    private static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
+            "osn", "osn", tr("Note Files"), true);
 
     /** Create an importer for note dump files */

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

@@ -20 +20 @@
 public class OsmChangeImporter extends FileImporter {
 
-    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "osc,osc.bz2,osc.bz,osc.gz", "osc", tr("OsmChange File") + " (*.osc *.osc.bz2 *.osc.bz *.osc.gz)");
+    public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
+            "osc", "osc", tr("OsmChange File"), true);
 
     /**