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

Timestamp:

2009-09-16T17:45:50+02:00 (15 years ago)

Author:

stoecker

Message:

see #3475 - patch by Petr Dlouhý - cleanups

File:

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

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

@@ -141 +141 @@
                 : (add.isSelected() ? SearchAction.SearchMode.add
                 : (remove.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection));
-        if(initialValues instanceof Filter){
-           return new Filter(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected());
-        } else {
-           return new SearchSetting(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected());
-        }
+        initialValues.text = input.getText();
+        initialValues.mode = mode;
+        initialValues.caseSensitive = caseSensitive.isSelected();
+        initialValues.regexSearch = regexSearch.isSelected();
+        return initialValues;
     }
 
@@ -179 +179 @@
             String searchText = s.text;
             if(s instanceof Filter){
-               searchText = ((Filter)s).inverted ? "-" : "";
-               searchText = searchText + "(" + ((Filter)s).text + ")" + (((Filter)s).applyForChildren ? ("| child (" + ((Filter)s).text + ")"): "");
+               searchText = "(" + s.text + ")" + (((Filter)s).applyForChildren ? ("| child (" + s.text + ")"): "");
+               searchText = (((Filter)s).inverted ? "-" : "") + "(" +  searchText + ")";
             }
-            /*System.out.println(searchText);  */
+            System.out.println(searchText);
             SearchCompiler.Match matcher = SearchCompiler.compile(searchText, s.caseSensitive, s.regexSearch);
             foundMatches = 0;