Changeset 17662 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2021-03-25T00:28:04+01:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
r17651 r17662 48 48 import org.openstreetmap.josm.data.osm.RelationMember; 49 49 import org.openstreetmap.josm.data.osm.Tag; 50 import org.openstreetmap.josm.data.osm.Tagged; 50 51 import org.openstreetmap.josm.data.osm.Way; 51 52 import org.openstreetmap.josm.data.osm.search.SearchCompiler; … … 135 136 public transient TemplateEntry nameTemplate; 136 137 public transient Match nameTemplateFilter; 138 public transient Match matchExpression; 137 139 138 140 /** … … 288 290 } 289 291 292 public void setMatch_expression(String filter) throws SAXException { 293 try { 294 this.matchExpression = SearchCompiler.compile(filter); 295 } catch (SearchParseError e) { 296 Logging.error("Error while parsing" + filter + ": " + e.getMessage()); 297 throw new SAXException(e); 298 } 299 } 300 290 301 private static class PresetPanel extends JPanel { 291 302 private boolean hasElements; … … 646 657 if ((onlyShowable && !isShowable()) || !typeMatches(t)) { 647 658 return false; 659 } else if (matchExpression != null && !matchExpression.match(Tagged.ofMap(tags))) { 660 return false; 648 661 } else { 649 662 return TaggingPresetItem.matches(data, tags);
Note:
See TracChangeset
for help on using the changeset viewer.