Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

Timestamp:

2017-07-30T17:07:42+02:00 (7 years ago)

Author:

Don-vip

Message:

partial revert of r12537

File:

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

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

@@ -125 +125 @@
     }
 
-    private static final LinkedList<SearchSetting> SEARCH_HISTORY = new LinkedList<>();
+    private static final LinkedList<SearchSetting> searchHistory = new LinkedList<>();
     static {
         for (String s: Main.pref.getCollection("search.history", Collections.<String>emptyList())) {
             SearchSetting ss = SearchSetting.readFromString(s);
             if (ss != null) {
-                SEARCH_HISTORY.add(ss);
+                searchHistory.add(ss);
             }
         }
@@ -140 +140 @@
      */
     public static Collection<SearchSetting> getSearchHistory() {
-        return SEARCH_HISTORY;
+        return searchHistory;
     }
 
@@ -148 +148 @@
      */
     public static void saveToHistory(SearchSetting s) {
-        if (SEARCH_HISTORY.isEmpty() || !s.equals(SEARCH_HISTORY.getFirst())) {
-            SEARCH_HISTORY.addFirst(new SearchSetting(s));
-        } else if (SEARCH_HISTORY.contains(s)) {
+        if (searchHistory.isEmpty() || !s.equals(searchHistory.getFirst())) {
+            searchHistory.addFirst(new SearchSetting(s));
+        } else if (searchHistory.contains(s)) {
             // move existing entry to front, fixes #8032 - search history loses entries when re-using queries
-            SEARCH_HISTORY.remove(s);
-            SEARCH_HISTORY.addFirst(new SearchSetting(s));
+            searchHistory.remove(s);
+            searchHistory.addFirst(new SearchSetting(s));
         }
         int maxsize = Main.pref.getInteger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE);
-        while (SEARCH_HISTORY.size() > maxsize) {
-            SEARCH_HISTORY.removeLast();
-        }
-        Set<String> savedHistory = new LinkedHashSet<>(SEARCH_HISTORY.size());
-        for (SearchSetting item: SEARCH_HISTORY) {
+        while (searchHistory.size() > maxsize) {
+            searchHistory.removeLast();
+        }
+        Set<String> savedHistory = new LinkedHashSet<>(searchHistory.size());
+        for (SearchSetting item: searchHistory) {
             savedHistory.add(item.writeToString());
         }