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

Timestamp:

2009-10-03T11:28:33+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #3544 - patch by singularita gmail com - fix search dialog history

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (3 diffs)

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

@@ -29 +29 @@
 public class SearchAction extends JosmAction{
 
-    public static final int SEARCH_HISTORY_SIZE = 10;
+    public static final int DEFAULT_SEARCH_HISTORY_SIZE = 10;
+
 
     public static enum SearchMode {
@@ -158 +159 @@
     public static void searchWithHistory(SearchSetting s) {
         if(searchHistory.isEmpty() || !s.equals(searchHistory.getFirst())) {
-            searchHistory.addFirst(s);
-        }
-        while (searchHistory.size() > SEARCH_HISTORY_SIZE) {
+            searchHistory.addFirst(new SearchSetting(s));
+        }
+        while (searchHistory.size() > Main.pref.getInteger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE)) {
             searchHistory.removeLast();
         }
@@ -280 +281 @@
         }
 
+        public SearchSetting(SearchSetting original) {
+            super();
+            this.caseSensitive = original.caseSensitive;
+            this.regexSearch = original.regexSearch;
+            this.mode = original.mode;
+            this.text = original.text;
+        }
+
         @Override
         public String toString() {