Changeset 8202 in josm

Timestamp:

2015-04-17T20:55:39+02:00 (10 years ago)

Author:

simon04

Message:

Opening files: guess file extension if specified filename does not exist

This allows to open foo.osm when entering foo. Previously, a "does not exist" had been displayed.

File:

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

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

@@ -10 +10 @@
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -102 +103 @@
         private boolean recordHistory = false;
 
-        public OpenFileTask(List<File> files, FileFilter fileFilter, String title) {
+        public OpenFileTask(final List<File> files, final FileFilter fileFilter, final String title) {
             super(title, false /* don't ignore exception */);
-            this.files = new ArrayList<>(files);
             this.fileFilter = fileFilter;
+            this.files = new ArrayList<>(files.size());
+            for (final File file : files) {
+                if (file.exists()) {
+                    this.files.add(file);
+                } else {
+                    // try to guess an extension using the specified fileFilter
+                    final File[] matchingFiles = file.getParentFile().listFiles(new FilenameFilter() {
+                        @Override
+                        public boolean accept(File dir, String name) {
+                            return name.startsWith(file.getName()) && fileFilter.accept(new File(dir, name));
+                        }
+                    });
+                    if (matchingFiles.length == 1) {
+                        // use the unique match as filename
+                        this.files.add(matchingFiles[0]);
+                    } else {
+                        // add original filename for error reporting later on
+                        this.files.add(file);
+                    }
+                }
+            }
         }