Changeset 14668 in josm for trunk/src/org/openstreetmap/josm/gui/widgets

Timestamp:

2019-01-08T21:33:32+01:00 (6 years ago)

Author:

simon04

Message:

fix #17185 - Do not offer unsupported file types for saving OsmDataLayer

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.function.Predicate;
 
 import javax.swing.JFileChooser;
@@ -46 +47 @@
     private int selectionMode = JFileChooser.FILES_ONLY;
     private String extension;
-    private boolean allTypes;
+    private Predicate<ExtensionFileFilter> additionalTypes = ignore -> false;
     private File file;
 
@@ -261 +262 @@
 
     /**
+     * Builder method to set {@code additionalTypes} property.
+     * @param value matching types will additionally be added to the "file type" combobox.
+     * @return this
+     */
+    public FileChooserManager additionalTypes(Predicate<ExtensionFileFilter> value) {
+        additionalTypes = value;
+        return this;
+    }
+
+    /**
      * Builder method to set {@code allTypes} property.
      * @param value If true, all the files types known by JOSM will be proposed in the "file type" combobox.
@@ -267 +278 @@
      */
     public FileChooserManager allTypes(boolean value) {
-        allTypes = value;
+        additionalTypes = ignore -> value;
         return this;
     }
@@ -311 +322 @@
             }
         } else if (open) {
-            ExtensionFileFilter.applyChoosableImportFileFilters(fc, extension, allTypes);
+            ExtensionFileFilter.applyChoosableImportFileFilters(fc, extension, additionalTypes);
         } else {
-            ExtensionFileFilter.applyChoosableExportFileFilters(fc, extension, allTypes);
+            ExtensionFileFilter.applyChoosableExportFileFilters(fc, extension, additionalTypes);
         }
         return this;