Changeset 15985 in josm for trunk

Timestamp:

2020-03-01T23:36:00+01:00 (4 years ago)

Author:

simon04

Message:

see #18802 - Add Selector.getConditions

Location:

trunk

Files:

• scripts/TagInfoExtract.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (4 diffs)

trunk/scripts/TagInfoExtract.java

@@ -58 +58 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule;
 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;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
@@ -343 +342 @@
         private List<TagInfoTag> convertStyleSheet() {
             return styleSource.rules.stream()
-                    .map(rule -> rule.selector)
-                    .filter(Selector.GeneralSelector.class::isInstance)
-                    .map(Selector.GeneralSelector.class::cast)
-                    .map(Selector.AbstractSelector::getConditions)
-                    .flatMap(Collection::stream)
+                    .flatMap(rule -> rule.selector.getConditions().stream())
                     .filter(ConditionFactory.SimpleKeyValueCondition.class::isInstance)
                     .map(ConditionFactory.SimpleKeyValueCondition.class::cast)

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

@@ -37 +37 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.OpenEndPseudoClassCondition;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.CompositeList;
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
@@ -124 +125 @@
      */
     Selector optimizedBaseCheck();
+
+    /**
+     * Returns the list of conditions.
+     * @return the list of conditions
+     */
+    List<Condition> getConditions();
 
     /**
@@ -170 +177 @@
             this.right = b;
             this.type = type;
+        }
+
+        @Override
+        public List<Condition> getConditions() {
+            return new CompositeList<>(left.getConditions(), right.getConditions());
         }
 
@@ -643 +655 @@
         }
 
-        /**
-         * Returns the list of conditions.
-         * @return the list of conditions
-         */
+        @Override
         public List<Condition> getConditions() {
             return conds;