Ticket #17746: 17746-v2.patch

File 17746-v2.patch, 1.4 KB (added by GerdP, 6 years ago)
  • src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

     
    19951995
    19961996    static Match compileMapCSS(String mapCSS) throws SearchParseError {
    19971997        try {
    1998             final List<Selector> selectors = new MapCSSParser(new StringReader(mapCSS)).selectors();
     1998            final List<Selector> selectors = new MapCSSParser(new StringReader(mapCSS)).selectors_for_search();
    19991999            return new Match() {
    20002000                @Override
    20012001                public boolean match(OsmPrimitive osm) {
  • src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

     
    656656    }
    657657}
    658658
     659/** Read selectors, make sure that we read all tokens  See #17746 */
     660List<Selector> selectors_for_search():
     661{
     662    List<Selector> selectors;
     663}
     664{
     665    selectors=selectors() <EOF>
     666    { return selectors; }
     667}
     668
    659669List<Selector> selectors():
    660670{
    661671    List<Selector> selectors = new ArrayList<Selector>();