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

Timestamp:

2017-08-26T01:29:38+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - remove dependence on GUI from data.osm.search.SearchCompiler

Location:

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

Files:

• InView.java (added)
• SearchAction.java (modified) (2 diffs)

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

@@ -47 +47 @@
 import org.openstreetmap.josm.data.osm.Filter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.search.PushbackTokenizer;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler.SimpleMatchFactory;
+import org.openstreetmap.josm.data.osm.search.SearchMode;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.data.osm.search.SearchSetting;
-import org.openstreetmap.josm.data.osm.search.SearchCompiler;
-import org.openstreetmap.josm.data.osm.search.SearchMode;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -89 +92 @@
     private static final LinkedList<SearchSetting> searchHistory = new LinkedList<>();
     static {
+        SearchCompiler.addMatchFactory(new SimpleMatchFactory() {
+            @Override
+            public Collection<String> getKeywords() {
+                return Arrays.asList("inview", "allinview");
+            }
+
+            @Override
+            public Match get(String keyword, PushbackTokenizer tokenizer) throws SearchParseError {
+                switch(keyword) {
+                case "inview":
+                    return new InView(false);
+                case "allinview":
+                    return new InView(true);
+                default:
+                    throw new IllegalStateException("Not expecting keyword " + keyword);
+                }
+            }
+        });
+
         for (String s: Main.pref.getCollection("search.history", Collections.<String>emptyList())) {
             SearchSetting ss = SearchSetting.readFromString(s);