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

Timestamp:

2011-02-21T21:44:31+01:00 (14 years ago)

Author:

bastiK

Message:

applied #5757 - Getting rid of not existing files in "Open Recent" (anonymous contribution)

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/OpenFileAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -476 +476 @@
             if(!fileList.isEmpty())
             {
-                OpenFileAction.openFiles(fileList);
+                OpenFileAction.openFiles(fileList, true);
             }
         }

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

@@ -14 +14 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -73 +74 @@
      */
     static public void openFiles(List<File> fileList) {
+        openFiles(fileList, false);
+    }
+
+    static public void openFiles(List<File> fileList, boolean recordHistory) {
         OpenFileTask task = new OpenFileTask(fileList, null);
+        task.setRecordHistory(recordHistory);
         Main.worker.submit(task);
     }
@@ -225 +231 @@
             } else {
                 // find appropriate importer
-                MultiMap<FileImporter, File> map = new MultiMap<FileImporter, File>();
+                MultiMap<FileImporter, File> importerMap = new MultiMap<FileImporter, File>();
                 List<File> filesWithUnknownImporter = new LinkedList<File>();
                 FILES: for (File f : files) {
                     for (FileImporter importer : ExtensionFileFilter.importers) {
                         if (importer.acceptFile(f)) {
-                            map.put(importer, f);
+                            importerMap.put(importer, f);
                             continue FILES;
                         }
@@ -239 +245 @@
                     alertFilesWithUnknownImporter(filesWithUnknownImporter);
                 }
-                List<FileImporter> ims = new ArrayList<FileImporter>(map.keySet());
-                Collections.sort(ims);
-                Collections.reverse(ims);
+                List<FileImporter> importers = new ArrayList<FileImporter>(importerMap.keySet());
+                Collections.sort(importers);
+                Collections.reverse(importers);
 
                 Set<String> fileHistory = new LinkedHashSet<String>();
-
-                for (FileImporter importer : ims) {
-                    List<File> files = new ArrayList<File>(map.get(importer));
+                Set<String> failedAll = new HashSet<String>();
+
+                for (FileImporter importer : importers) {
+                    List<File> files = new ArrayList<File>(importerMap.get(importer));
                     importData(importer, files);
+                    // suppose all files will fail to load
+                    List<File> failedFiles = new ArrayList<File>(files);
 
                     if (recordHistory && !importer.isBatchImporter()) {
-                        for (File f : files) {
+                        // remove the files which didn't fail to load from the failed list
+                        failedFiles.removeAll(successfullyOpenedFiles);
+                        for (File f : successfullyOpenedFiles) {
                             fileHistory.add(f.getPath());
+                        }
+                        for (File f : failedFiles) {
+                            failedAll.add(f.getPath());
                         }
                     }
@@ -259 +273 @@
                     Collection<String> oldFileHistory = Main.pref.getCollection("file-open.history");
                     fileHistory.addAll(oldFileHistory);
+                    // remove the files which failed to load from the list
+                    fileHistory.removeAll(failedAll);
                     int maxsize = Math.max(0, Main.pref.getInteger("file-open.history.max-size", 15));
                     Collection<String> trimmedFileHistory = new ArrayList<String>(Math.min(maxsize, fileHistory.size()));