- Timestamp:
- 2017-08-26T15:29:22+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
r12662 r12666 99 99 100 100 @Override 101 public Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError {101 public Match get(String keyword, boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) throws SearchParseError { 102 102 switch(keyword) { 103 103 case "inview": -
trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java
r12664 r12666 84 84 private static Map<String, BinaryMatchFactory> binaryMatchFactoryMap = new HashMap<>(); 85 85 86 static { 87 addMatchFactory(new CoreSimpleMatchFactory()); 88 addMatchFactory(new CoreUnaryMatchFactory()); 89 } 90 86 91 public SearchCompiler(boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) { 87 92 this.caseSensitive = caseSensitive; 88 93 this.regexSearch = regexSearch; 89 94 this.tokenizer = tokenizer; 90 91 // register core match factories at first instance, so plugins should never be able to generate a NPE92 if (simpleMatchFactoryMap.isEmpty()) {93 addMatchFactory(new CoreSimpleMatchFactory());94 }95 if (unaryMatchFactoryMap.isEmpty()) {96 addMatchFactory(new CoreUnaryMatchFactory());97 }98 95 } 99 96 … … 119 116 } 120 117 121 public class CoreSimpleMatchFactory implements SimpleMatchFactory {118 public static class CoreSimpleMatchFactory implements SimpleMatchFactory { 122 119 private final Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role", 123 120 "changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "deleted", "selected", … … 126 123 127 124 @Override 128 public Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError {125 public Match get(String keyword, boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) throws SearchParseError { 129 126 switch(keyword) { 130 127 case "modified": … … 248 245 249 246 public interface SimpleMatchFactory extends MatchFactory { 250 Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError;247 Match get(String keyword, boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) throws SearchParseError; 251 248 } 252 249 … … 1759 1756 SimpleMatchFactory factory = simpleMatchFactoryMap.get(key); 1760 1757 if (factory != null) 1761 return factory.get(key, tokenizer);1758 return factory.get(key, caseSensitive, regexSearch, tokenizer); 1762 1759 1763 1760 UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key); … … 1773 1770 SimpleMatchFactory factory = simpleMatchFactoryMap.get(key); 1774 1771 if (factory != null) 1775 return factory.get(key, null);1772 return factory.get(key, caseSensitive, regexSearch, null); 1776 1773 1777 1774 UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);
Note:
See TracChangeset
for help on using the changeset viewer.