Changeset 3710 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2010-12-10T10:15:21+01:00 (13 years ago)

Author:

bastiK

Message:

new list of recently opened files; little preference rework

File:

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

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

@@ -14 +14 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 
+import java.util.Set;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -57 +59 @@
         File[] files = fc.getSelectedFiles();
         OpenFileTask task = new OpenFileTask(Arrays.asList(files), fc.getFileFilter());
+        task.setRecordHistory(true);
         Main.worker.submit(task);
     }
@@ -79 +82 @@
         private FileFilter fileFilter;
         private boolean cancelled;
+        private boolean recordHistory = false;
 
         public OpenFileTask(List<File> files, FileFilter fileFilter, String title) {
@@ -88 +92 @@
         public OpenFileTask(List<File> files, FileFilter fileFilter) {
             this(files, fileFilter, tr("Opening files"));
+        }
+
+        /**
+         * save filename in history (for list of recently opened files)
+         * default: false
+         */
+        public void setRecordHistory(boolean recordHistory) {
+            this.recordHistory = recordHistory;
+        }
+
+        public boolean isRecordHistory() {
+            return recordHistory;
         }
 
@@ -167 +183 @@
             }
             /**
-             * If the filter wasn't changed in the dialog, chosenImporter is null now.
-             * When the filter was explicitly set to AllFormatsImporter, treat this the same.
+             * If the filter hasn't been changed in the dialog, chosenImporter is null now.
+             * When the filter has been set explicitly to AllFormatsImporter, treat this the same.
              */
             if (chosenImporter instanceof AllFormatsImporter) {
@@ -210 +226 @@
                 // find appropriate importer
                 MultiMap<FileImporter, File> map = new MultiMap<FileImporter, File>();
-                List<File> filesWithKnownImporter = new LinkedList<File>();
                 List<File> filesWithUnknownImporter = new LinkedList<File>();
                 FILES: for (File f : files) {
@@ -216 +231 @@
                         if (importer.acceptFile(f)) {
                             map.put(importer, f);
-                            filesWithKnownImporter.add(f);
                             continue FILES;
                         }
@@ -228 +242 @@
                 Collections.sort(ims);
                 Collections.reverse(ims);
+
+                Set<String> fileHistory = new LinkedHashSet<String>();
+
                 for (FileImporter importer : ims) {
                     List<File> files = new ArrayList<File>(map.get(importer));
                     importData(importer, files);
+
+                    if (recordHistory && !importer.isBatchImporter()) {
+                        for (File f : files) {
+                            fileHistory.add(f.getPath());
+                        }
+                    }
+                }
+
+                if (recordHistory) {
+                    Collection<String> oldFileHistory = Main.pref.getCollection("file-open.history");
+                    fileHistory.addAll(oldFileHistory);
+                    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()));
+                    int i = 0;
+                    for (String s : fileHistory) {
+                        if (++i > maxsize) {
+                            break;
+                        }
+                        trimmedFileHistory.add(s);
+                    }
+                    Main.pref.putCollection("file-open.history", trimmedFileHistory);
                 }
             }