Changeset 12666 in josm for trunk/src/org

Timestamp:

2017-08-26T15:29:22+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - fix #15193 - fix SearchCompiler

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (1 diff)
• data/osm/search/SearchCompiler.java (modified) (6 diffs)

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

@@ -99 +99 @@
 
             @Override
-            public Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError {
+            public Match get(String keyword, boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) throws SearchParseError {
                 switch(keyword) {
                 case "inview":

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -84 +84 @@
     private static Map<String, BinaryMatchFactory> binaryMatchFactoryMap = new HashMap<>();
 
+    static {
+        addMatchFactory(new CoreSimpleMatchFactory());
+        addMatchFactory(new CoreUnaryMatchFactory());
+    }
+
     public SearchCompiler(boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) {
         this.caseSensitive = caseSensitive;
         this.regexSearch = regexSearch;
         this.tokenizer = tokenizer;
-
-        // register core match factories at first instance, so plugins should never be able to generate a NPE
-        if (simpleMatchFactoryMap.isEmpty()) {
-            addMatchFactory(new CoreSimpleMatchFactory());
-        }
-        if (unaryMatchFactoryMap.isEmpty()) {
-            addMatchFactory(new CoreUnaryMatchFactory());
-        }
     }
 
@@ -119 +116 @@
     }
 
-    public class CoreSimpleMatchFactory implements SimpleMatchFactory {
+    public static class CoreSimpleMatchFactory implements SimpleMatchFactory {
         private final Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role",
                 "changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "deleted", "selected",
@@ -126 +123 @@
 
         @Override
-        public Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError {
+        public Match get(String keyword, boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) throws SearchParseError {
             switch(keyword) {
             case "modified":
@@ -248 +245 @@
 
     public interface SimpleMatchFactory extends MatchFactory {
-        Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError;
+        Match get(String keyword, boolean caseSensitive, boolean regexSearch, PushbackTokenizer tokenizer) throws SearchParseError;
     }
 
@@ -1759 +1756 @@
                 SimpleMatchFactory factory = simpleMatchFactoryMap.get(key);
                 if (factory != null)
-                    return factory.get(key, tokenizer);
+                    return factory.get(key, caseSensitive, regexSearch, tokenizer);
 
                 UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);
@@ -1773 +1770 @@
                 SimpleMatchFactory factory = simpleMatchFactoryMap.get(key);
                 if (factory != null)
-                    return factory.get(key, null);
+                    return factory.get(key, caseSensitive, regexSearch, null);
 
                 UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);