Changeset 3710 in josm

Timestamp:

Dec 10, 2010 10:15:21 AM (2 years ago)

Author:

bastiK

Message:

new list of recently opened files; little preference rework

Location:

trunk

Files:

• images/openrecent.png (added)
• src/org/openstreetmap/josm/actions/OpenFileAction.java (modified) (8 diffs)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/FileDrop.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (added)
• src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (modified) (1 diff)

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);
                 }
             }

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -631 +631 @@
     }
 
+    /**
+     * Get a list of values for a certain key
+     * @param key the identifier for the setting
+     * @return the corresponding value if the property has been set before,
+     *  an empty Collection otherwise.
+     */
+    synchronized public Collection<String> getCollection(String key) {
+        putCollectionDefault(key, null);
+        String s = get(key);
+        if (s != null && s.length() != 0)
+            return Arrays.asList(s.split("\u001e"));
+        return Collections.emptyList();
+    }
+
     synchronized public void removeFromCollection(String key, String value) {
         List<String> a = new ArrayList<String>(getCollection(key, Collections.<String>emptyList()));
@@ -638 +652 @@
 
     synchronized public boolean putCollection(String key, Collection<String> val) {
-        String s = null;
-        if(val != null)
-        {
-            for(String a : val)
-            {
-                if (a == null) {
-                    a = "";
-                }
-                if(s != null) {
-                    s += "\u001e" + a;
-                } else {
-                    s = a;
-                }
-            }
-        }
-        return put(key, s);
+        return put(key, join("\u001e", val));
     }
     
     synchronized private void putCollectionDefault(String key, Collection<String> val) {
-        if (val == null) {
-            putDefault(key, null);
-        } else {
-            String s = null;
-            for(String a : val)
-            {
-                if(s != null) {
-                    s += "\u001e" + a;
-                } else {
-                    s = a;
-                }
-            }
-            putDefault(key, s);
-        }
+        putDefault(key, join("\u001e", val));
     }
     
@@ -766 +752 @@
     }
 
+    /**
+     * Joins a collection of strings into a single string with fields
+     * separated by the value of sep.
+     * @param sep the separator
+     * @param values collection of strings, null strings are converted to the
+     *  empty string
+     * @return null if values is null. The joined string otherwise.
+     */
+    public static String join(String sep, Collection<?> values) {
+        if (values == null)
+            return null;
+        if (values.isEmpty())
+            return "";
+        StringBuilder s = null;
+        for (Object a : values) {
+            if (a == null) {
+                a = "";
+            }
+            if(s != null) {
+                s.append(sep).append(a.toString());
+            } else {
+                s = new StringBuilder(a.toString());
+            }
+        }
+        return s.toString();
+    }
+
 }

trunk/src/org/openstreetmap/josm/gui/FileDrop.java

@@ -78 +78 @@
                         // start asynchronous loading of files
                         OpenFileAction.OpenFileTask task = new OpenFileAction.OpenFileTask(Arrays.asList(files), null);
+                        task.setRecordHistory(true);
                         Main.worker.submit(task);
                     }

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -85 +85 @@
 import org.openstreetmap.josm.actions.audio.AudioSlowerAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
+import org.openstreetmap.josm.gui.io.RecentlyOpenedFilesMenu;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction;
@@ -102 +103 @@
     public final NewAction newAction = new NewAction();
     public final OpenFileAction openFile = new OpenFileAction();
+    public final RecentlyOpenedFilesMenu recentlyOpened = new RecentlyOpenedFilesMenu();
     public final OpenLocationAction openLocation = new OpenLocationAction();
     public final JosmAction save = new SaveAction();
@@ -223 +225 @@
         add(fileMenu, newAction);
         add(fileMenu, openFile);
+        fileMenu.add(recentlyOpened);
         add(fileMenu, openLocation);
         fileMenu.addSeparator();

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

@@ -58 +58 @@
             Component co = (Component)s;
             JPopupMenu pm = new JPopupMenu(getName());
-            for(Component c : menu.getMenuComponents())
+            for (Component c : menu.getMenuComponents()) {
                 pm.add(copyMenuComponent(c));
-            {
             }
             pm.show(co, co.getWidth()/2, co.getHeight()/2);