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

Timestamp:

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

Author:

simon04

Message:

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

File:

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

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

@@ -13 +13 @@
 import java.util.Objects;
 import java.util.ServiceConfigurationError;
+import java.util.function.Predicate;
 
 import javax.swing.filechooser.FileFilter;
@@ -316 +317 @@
      * @param fileChooser the file chooser
      * @param extension the default extension
-     * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
-     *                 If false, only the file filters that include {@code extension} will be proposed
-     * @since 5438
-     */
-    public static void applyChoosableImportFileFilters(AbstractFileChooser fileChooser, String extension, boolean allTypes) {
+     * @param additionalTypes matching types will additionally be added to the "file type" combobox.
+     * @since 14668 (signature)
+     */
+    public static void applyChoosableImportFileFilters(
+            AbstractFileChooser fileChooser, String extension, Predicate<ExtensionFileFilter> additionalTypes) {
         for (ExtensionFileFilter filter: getImportExtensionFileFilters()) {
 
-            if (allTypes || filter.acceptName("file."+extension)) {
+            if (additionalTypes.test(filter) || filter.acceptName("file."+extension)) {
                 fileChooser.addChoosableFileFilter(filter);
             }
@@ -336 +337 @@
      * @param fileChooser the file chooser
      * @param extension the default extension
-     * @param allTypes If true, all the files types known by JOSM will be proposed in the "file type" combobox.
-     *                 If false, only the file filters that include {@code extension} will be proposed
-     * @since 5438
-     */
-    public static void applyChoosableExportFileFilters(AbstractFileChooser fileChooser, String extension, boolean allTypes) {
+     * @param additionalTypes matching types will additionally be added to the "file type" combobox.
+     * @since 14668 (signature)
+     */
+    public static void applyChoosableExportFileFilters(
+            AbstractFileChooser fileChooser, String extension, Predicate<ExtensionFileFilter> additionalTypes) {
         for (ExtensionFileFilter filter: getExportExtensionFileFilters()) {
-            if (allTypes || filter.acceptName("file."+extension)) {
+            if (additionalTypes.test(filter) || filter.acceptName("file."+extension)) {
                 fileChooser.addChoosableFileFilter(filter);
             }