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

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• gui/widgets/FileChooserManager.java (modified) (5 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);
             }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -105 +105 @@
 import org.openstreetmap.josm.gui.io.UploadDialog;
 import org.openstreetmap.josm.gui.io.UploadLayerTask;
+import org.openstreetmap.josm.gui.io.importexport.NoteExporter;
 import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
+import org.openstreetmap.josm.gui.io.importexport.ValidatorErrorExporter;
+import org.openstreetmap.josm.gui.io.importexport.WMSLayerImporter;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.preferences.display.DrawingPreference;
@@ -1187 +1190 @@
             .extension(extension)
             .file(file)
-            .allTypes(true)
+            .additionalTypes(t -> t != WMSLayerImporter.FILE_FILTER && t != NoteExporter.FILE_FILTER && t != ValidatorErrorExporter.FILE_FILTER)
             .getFileForSave();
     }

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;