Changeset 8895 in josm for trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

Timestamp:

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

Author:

simon04

Message:

Refactor usage of ExtensionFileFilter introduced in r8894

File:

• trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) (2 diffs)

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,