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

Timestamp:

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

Author:

simon04

Message:

see #11916 - Refactoring of SearchAction/SearchCompiler

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/RelationListDialog.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• tagging/TaggingPreset.java (modified) (1 diff)
• tagging/TaggingPresetItems.java (modified) (2 diffs)

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

@@ -289 +289 @@
                     f.setBackground(UIManager.getColor("TextField.background"));
                     f.setToolTipText(tr("Relation list filter"));
-                    model.setFilter(SearchCompiler.compile(filter.getText(), false, false));
+                    model.setFilter(SearchCompiler.compile(filter.getText()));
                 } catch (SearchCompiler.ParseError ex) {
                     f.setBackground(new Color(255, 224, 224));

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

@@ -1323 +1323 @@
             }
 
-            SearchSetting ss = new SearchSetting(s.toString(), SearchMode.replace, true, false, false);
+            final SearchSetting ss = new SearchSetting();
+            ss.text = s.toString();
+            ss.caseSensitive = true;
             org.openstreetmap.josm.actions.search.SearchAction.searchWithoutHistory(ss);
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -664 +664 @@
             Match m;
             try {
-                m = SearchCompiler.compile(searchStr, false, false);
+                m = SearchCompiler.compile(searchStr);
             } catch (ParseError ex) {
                 return null;

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -202 +202 @@
     public void setName_template_filter(String filter) throws SAXException {
         try {
-            this.nameTemplateFilter = SearchCompiler.compile(filter, false, false);
+            this.nameTemplateFilter = SearchCompiler.compile(filter);
         } catch (org.openstreetmap.josm.actions.search.SearchCompiler.ParseError e) {
             Main.error("Error while parsing" + filter + ": " + e.getMessage());

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -52 +52 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -204 +205 @@
         public void setMember_expression(String member_expression) throws SAXException {
             try {
-                this.memberExpression = SearchCompiler.compile(member_expression, true, true);
+                final SearchAction.SearchSetting searchSetting = new SearchAction.SearchSetting();
+                searchSetting.text = member_expression;
+                searchSetting.caseSensitive = true;
+                searchSetting.regexSearch = true;
+                this.memberExpression = SearchCompiler.compile(searchSetting);
             } catch (SearchCompiler.ParseError ex) {
                 throw new SAXException(tr("Illegal member expression: {0}", ex.getMessage()), ex);