Changeset 8822 in josm for trunk

Timestamp:

2015-10-04T17:53:14+02:00 (9 years ago)

Author:

simon04

Message:

see #11916 - Search: allow to use multiple MapCSS selectors and child/parent selectors

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchCompiler.java (modified) (3 diffs)
• gui/mappaint/mapcss/MapCSSParser.jj (modified) (2 diffs)

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

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -29 +30 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.mappaint.Environment;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
@@ -1440 +1440 @@
     static Match compileMapCSS(String mapCSS) throws ParseError {
         try {
-            final Selector selector = new MapCSSParser(new StringReader(mapCSS)).selector();
+            final List<Selector> selectors = new MapCSSParser(new StringReader(mapCSS)).selectors();
             return new Match() {
                 @Override
                 public boolean match(OsmPrimitive osm) {
-                    return selector.matches(new Environment(osm));
+                    for (Selector selector : selectors) {
+                        if (selector.matches(new Environment(osm))) {
+                            return true;
+                        }
+                    }
+                    return false;
                 }
             };

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -604 +604 @@
 void rule():
 {
-    List<Selector> selectors = new ArrayList<Selector>();
-    Selector sel;
+    List<Selector> selectors;
     Declaration decl;
 }
 {
-    sel=child_selector() { selectors.add(sel); }
-    (
-        <COMMA> w()
-        sel=child_selector() { selectors.add(sel); }
-    )*
+    selectors=selectors()
     decl=declaration()
     { 
@@ -620 +615 @@
         }
     }
+}
+
+List<Selector> selectors():
+{
+    List<Selector> selectors = new ArrayList<Selector>();
+    Selector sel;
+}
+{
+    sel=child_selector() { selectors.add(sel); }
+    (
+        <COMMA> w()
+        sel=child_selector() { selectors.add(sel); }
+    )*
+    { return selectors; }
 }