Changeset 15356 in josm for trunk/src/org

Timestamp:

2019-09-19T11:12:31+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18146 - don't remember last search performed from properties/selection dialogs

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (3 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)

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

@@ -224 +224 @@
         saveToHistory(s);
         lastSearch = new SearchSetting(s);
-        search(s);
+        searchStateless(s);
     }
 
@@ -234 +234 @@
     public static void searchWithoutHistory(SearchSetting s) {
         lastSearch = new SearchSetting(s);
-        search(s);
+        searchStateless(s);
     }
 
@@ -247 +247 @@
         searchSetting.text = search;
         searchSetting.mode = mode;
-        search(searchSetting);
-    }
-
-    static void search(SearchSetting s) {
+        searchStateless(searchSetting);
+    }
+
+    /**
+     * Performs a stateless search specified by the settings in <code>s</code>.
+     *
+     * @param s search settings
+     * @since 15356
+     */
+    public static void searchStateless(SearchSetting s) {
         SearchTask.newSearchTask(s, new SelectSearchReceiver()).run();
     }

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

@@ -746 +746 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            org.openstreetmap.josm.actions.search.SearchAction.searchWithoutHistory(s);
+            org.openstreetmap.josm.actions.search.SearchAction.searchStateless(s);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1192 +1192 @@
                 return;
             final SearchSetting ss = createSearchSetting(key, sel, sameType);
-            org.openstreetmap.josm.actions.search.SearchAction.searchWithoutHistory(ss);
+            org.openstreetmap.josm.actions.search.SearchAction.searchStateless(ss);
         }
     }