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

Timestamp:

2016-01-15T16:00:22+01:00 (9 years ago)

Author:

bastiK

Message:

see #12370, see #12369 - fix problems with default file extension (patch by kolesar)
[patch] adapted osm file filter to other file types

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ExtensionFileFilter.java (modified) (2 diffs)
• SaveActionBase.java (modified) (1 diff)

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

@@ -227 +227 @@
                 return exporter.filter;
         }
+        // if extension did not match defaultExtension of any exporter,
+        // scan all supported extensions
+        File file = new File("file." + extension);
+        for (FileExporter exporter : exporters) {
+            if (exporter.filter.accept(file))
+                return exporter.filter;
+        }
         return new AllFormatsImporter().filter;
     }
@@ -242 +249 @@
     public static void applyChoosableImportFileFilters(AbstractFileChooser fileChooser, String extension, boolean allTypes) {
         for (ExtensionFileFilter filter: getImportExtensionFileFilters()) {
+
             if (allTypes || filter.acceptName("file."+extension)) {
                 fileChooser.addChoosableFileFilter(filter);

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

@@ -169 +169 @@
             // No filefilter accepts current filename, add default extension
             String fn = file.getPath();
-            if (ff instanceof ExtensionFileFilter) {
+            if (extension != null) {
+                fn += '.' + extension;
+            } else if (ff instanceof ExtensionFileFilter) {
                 fn += '.' + ((ExtensionFileFilter) ff).getDefaultExtension();
-            } else if (extension != null) {
-                fn += '.' + extension;
             }
             file = new File(fn);