Changeset 3176 in josm for trunk/src

Timestamp:

2010-04-11T13:11:33+02:00 (14 years ago)

Author:

jttt

Message:

Fix #3952 Search history not remembered across restarts

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (3 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -66 +66 @@
     }
 
-    public static final LinkedList<SearchSetting> searchHistory = new LinkedList<SearchSetting>();
+    private static LinkedList<SearchSetting> searchHistory = null;
+
+    public static Collection<SearchSetting> getSearchHistory() {
+        if (searchHistory == null) {
+            searchHistory = new LinkedList<SearchSetting>();
+            for (String s: Main.pref.getCollection("search.history", Collections.<String>emptyList())) {
+                SearchSetting ss = SearchSetting.readFromString(s);
+                if (ss != null) {
+                    searchHistory.add(ss);
+                }
+            }
+        }
+
+        return searchHistory;
+    }
+
+    public static void saveToHistory(SearchSetting s) {
+        if(searchHistory.isEmpty() || !s.equals(searchHistory.getFirst())) {
+            searchHistory.addFirst(new SearchSetting(s));
+        }
+        int maxsize = Main.pref.getInteger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE);
+        while (searchHistory.size() > maxsize) {
+            searchHistory.removeLast();
+        }
+        List<String> savedHistory = new ArrayList<String>();
+        for (SearchSetting item: searchHistory) {
+            savedHistory.add(item.writeToString());
+        }
+        Main.pref.putCollection("search.history", savedHistory);
+    }
+
+    public static List<String> getSearchExpressionHistory() {
+        ArrayList<String> ret = new ArrayList<String>(getSearchHistory().size());
+        for (SearchSetting ss: getSearchHistory()) {
+            ret.add(ss.text);
+        }
+        return ret;
+    }
+
+
+
+
+
 
     private static SearchSetting lastSearch = null;
@@ -88 +130 @@
             searchWithoutHistory((SearchSetting) parameters.get(SEARCH_EXPRESSION));
         }
-    }
-
-    public static List<String> getSearchExpressionHistory() {
-        ArrayList<String> ret = new ArrayList<String>(searchHistory.size());
-        for (SearchSetting ss: searchHistory) {
-            ret.add(ss.text);
-        }
-        return ret;
     }
 
@@ -222 +256 @@
      */
     public static void searchWithHistory(SearchSetting s) {
-        if(searchHistory.isEmpty() || !s.equals(searchHistory.getFirst())) {
-            searchHistory.addFirst(new SearchSetting(s));
-        }
-        int maxsize = Main.pref.getInteger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE);
-        while (searchHistory.size() > maxsize) {
-            searchHistory.removeLast();
-        }
+        saveToHistory(s);
         lastSearch = new SearchSetting(s);
         search(s);

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -83 +83 @@
  */
 public class SelectionListDialog extends ToggleDialog  {
+    @SuppressWarnings("unused")
     static private final Logger logger = Logger.getLogger(SelectionListDialog.class.getName());
 
@@ -639 +640 @@
      */
     protected static class SearchMenuItem extends JMenuItem implements ActionListener {
-        protected SearchSetting s;
+        final protected SearchSetting s;
 
         public SearchMenuItem(SearchSetting s) {
@@ -658 +659 @@
     protected static class SearchPopupMenu extends JPopupMenu {
         static public void launch(Component parent) {
-            if (org.openstreetmap.josm.actions.search.SearchAction.searchHistory.isEmpty())
+            if (org.openstreetmap.josm.actions.search.SearchAction.getSearchHistory().isEmpty())
                 return;
             JPopupMenu menu = new SearchPopupMenu();
@@ -666 +667 @@
 
         public SearchPopupMenu() {
-            for (SearchSetting ss: org.openstreetmap.josm.actions.search.SearchAction.searchHistory) {
+            for (SearchSetting ss: org.openstreetmap.josm.actions.search.SearchAction.getSearchHistory()) {
                 add(new SearchMenuItem(ss));
             }