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

Timestamp:

10.03.2010 10:00:20 (2 years ago)

Author:

Gubaer

Message:

fixed #4651: Ability to download incomplete relation from selection
fixed #4098: Popup Menu entry "download relation members" in relation dialog should be "download incomplete relation members"
fixed two NPEs in RelationListDialog and SelectionListDialog
refactored SelectionListDialog to support better user feedback (enabled/disabled buttons and menu items)
Finally removed the sort() method on DataSet, marked as FIXME since a long time.

CAVEAT: DataSet.getSelected() now returns an unmodifiable list instead of a copy of the selection list. This may lead to UnsupportedOperationExceptions in the next few days. I tried to make sure the JOSM core uses getSelected() only for reading, but I didn't check the plugins.

File:

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

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

@@ -55 +55 @@
         if (!isEnabled())
             return;
-        SearchSetting s = lastSearch;
-        if (s == null) {
-            s = new SearchSetting();
-        }
-        SearchSetting se = showSearchDialog(s);
-        if(se != null) {
-            searchWithHistory(se);
-        }
+        search();
     }
 
@@ -74 +67 @@
 
     public static SearchSetting showSearchDialog(SearchSetting initialValues) {
-
+        if (initialValues == null) {
+            initialValues = new SearchSetting();
+        }
         // -- prepare the combo box with the search expressions
         //
@@ -178 +173 @@
 
     /**
+     * Launches the dialog for specifying search criteria and runs
+     * a search
+     */
+    public static void search() {
+        SearchSetting se = showSearchDialog(lastSearch);
+        if(se != null) {
+            searchWithHistory(se);
+        }
+    }
+
+    /**
      * Adds the search specified by the settings in <code>s</code> to the
      * search history and performs the search.