Changeset 15985 in josm for trunk/scripts

Timestamp:

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

Author:

simon04

Message:

see #18802 - Add Selector.getConditions

File:

• trunk/scripts/TagInfoExtract.java (modified) (2 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)