Changeset 8811 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-10-01T21:06:10+02:00 (7 years ago)

Author:

simon04

Message:

see #11916 - Refactoring of SearchAction/SearchCompiler

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (7 diffs)
• SearchCompiler.java (modified) (1 diff)

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

@@ -286 +286 @@
                 if (buttonIndex == 0) {
                     try {
-                        SearchCompiler.compile(hcbSearchString.getText(), caseSensitive.isSelected(), regexSearch.isSelected());
+                        SearchSetting ss = new SearchSetting();
+                        ss.text = hcbSearchString.getText();
+                        ss.caseSensitive = caseSensitive.isSelected();
+                        ss.regexSearch = regexSearch.isSelected();
+                        SearchCompiler.compile(ss);
                         super.buttonAction(buttonIndex, evt);
                     } catch (ParseError e) {
@@ -454 +458 @@
         int foundMatches = 0;
         try {
-            String searchText = s.text;
-            SearchCompiler.Match matcher = SearchCompiler.compile(searchText, s.caseSensitive, s.regexSearch);
+            SearchCompiler.Match matcher = SearchCompiler.compile(s);
 
             if (s.mode == SearchMode.replace) {
@@ -508 +511 @@
     public static void getSelection(SearchSetting s, Collection<OsmPrimitive> all, Property<OsmPrimitive, Boolean> p) {
         try {
-            String searchText = s.text;
             if (s instanceof Filter && ((Filter) s).inverted) {
-                searchText = String.format("-(%s)", searchText);
-            }
-            SearchCompiler.Match matcher = SearchCompiler.compile(searchText, s.caseSensitive, s.regexSearch);
+                s = new SearchSetting(s);
+                s.text = String.format("-(%s)", s.text);
+            }
+            SearchCompiler.Match matcher = SearchCompiler.compile(s);
 
             for (OsmPrimitive osm : all) {
@@ -540 +543 @@
 
     public static void search(String search, SearchMode mode) {
-        search(new SearchSetting(search, mode, false, false, false));
+        final SearchSetting searchSetting = new SearchSetting();
+        searchSetting.text = search;
+        searchSetting.mode = mode;
+        search(searchSetting);
     }
 
@@ -579 +585 @@
 
     public static class SearchSetting {
-        public String text;
-        public SearchMode mode;
+        public String text = "";
+        public SearchMode mode = SearchMode.replace;
         public boolean caseSensitive;
         public boolean regexSearch;
@@ -589 +595 @@
          */
         public SearchSetting() {
-            this("", SearchMode.replace, false /* case insensitive */,
-                    false /* no regexp */, false /* only useful primitives */);
-        }
-
-        public SearchSetting(String text, SearchMode mode, boolean caseSensitive,
-                boolean regexSearch, boolean allElements) {
-            this.caseSensitive = caseSensitive;
-            this.regexSearch = regexSearch;
-            this.allElements = allElements;
-            this.mode = mode;
-            this.text = text;
         }
 
         public SearchSetting(SearchSetting original) {
-            this(original.text, original.mode, original.caseSensitive,
-                    original.regexSearch, original.allElements);
+            text = original.text;
+            mode = original.mode;
+            caseSensitive = original.caseSensitive;
+            regexSearch = original.regexSearch;
+            allElements = original.allElements;
         }
 
@@ -612 +610 @@
                     /*case sensitive*/  trc("search", "CS") :
                         /*case insensitive*/  trc("search", "CI");
-                    String rx = regexSearch ? ", " +
+            String rx = regexSearch ? ", " +
                             /*regex search*/ trc("search", "RX") : "";
-                    String all = allElements ? ", " +
+            String all = allElements ? ", " +
                             /*all elements*/ trc("search", "A") : "";
-                    return "\"" + text + "\" (" + cs + rx + all + ", " + mode + ")";
+            return "\"" + text + "\" (" + cs + rx + all + ", " + mode + ")";
         }
 

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

@@ -1402 +1402 @@
     }
 
-    public static Match compile(String searchStr, boolean caseSensitive, boolean regexSearch) throws ParseError {
-        return new SearchCompiler(caseSensitive, regexSearch,
+    /**
+     * Compiles the search expression.
+     * @param searchStr the search expression
+     * @return a {@link Match} object for the expression
+     * @throws ParseError if an error has been encountered while compiling
+     * @see #compile(org.openstreetmap.josm.actions.search.SearchAction.SearchSetting)
+     */
+    public static Match compile(String searchStr) throws ParseError {
+        return new SearchCompiler(false, false,
                 new PushbackTokenizer(
                         new PushbackReader(new StringReader(searchStr))))
-        .parse();
+                .parse();
+    }
+
+    /**
+     * Compiles the search expression.
+     * @param setting the settings to use
+     * @return a {@link Match} object for the expression
+     * @throws ParseError if an error has been encountered while compiling
+     * @see #compile(String)
+     */
+    public static Match compile(SearchAction.SearchSetting setting) throws ParseError {
+        return new SearchCompiler(setting.caseSensitive, setting.regexSearch,
+                new PushbackTokenizer(
+                        new PushbackReader(new StringReader(setting.text))))
+                .parse();
     }