Changeset 1451 in josm for trunk/src/org

Timestamp:

2009-02-28T20:27:54+01:00 (15 years ago)

Author:

stoecker

Message:

fix #2247. patch by xeen - cleanup search history

File:

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

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

@@ -124 +124 @@
      */
     public static void searchWithHistory(SearchSetting s) {
-        searchHistory.addFirst(s);
+        if(searchHistory.isEmpty() || !s.equals(searchHistory.getFirst()))
+            searchHistory.addFirst(s);
         while (searchHistory.size() > SEARCH_HISTORY_SIZE)
             searchHistory.removeLast();
@@ -203 +204 @@
         }
 
+        public boolean equals(Object other) {
+            if(!(other instanceof SearchSetting))
+                return false;
+            SearchSetting o = (SearchSetting) other;
+            return (o.caseSensitive == this.caseSensitive
+                 && o.regexSearch == this.regexSearch
+                 && o.mode.equals(this.mode)
+                 && o.text.equals(this.text));
+        }
     }
 }