Changeset 12656 in josm for trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
- Timestamp:
- 2017-08-26T00:40:19+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
r12630 r12656 7 7 8 8 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode; 9 import org.openstreetmap.josm. actions.search.SearchCompiler;10 import org.openstreetmap.josm. actions.search.SearchCompiler.Match;11 import org.openstreetmap.josm. actions.search.SearchCompiler.Not;12 import org.openstreetmap.josm. actions.search.SearchCompiler.ParseError;9 import org.openstreetmap.josm.data.osm.search.SearchParseError; 10 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 11 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match; 12 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Not; 13 13 import org.openstreetmap.josm.gui.MainApplication; 14 14 import org.openstreetmap.josm.gui.MapFrame; … … 79 79 private final boolean isInverted; 80 80 81 FilterInfo(Filter filter) throws ParseError {81 FilterInfo(Filter filter) throws SearchParseError { 82 82 if (filter.mode == SearchMode.remove || filter.mode == SearchMode.in_selection) { 83 83 isDelete = true; … … 98 98 * Clears the current filters, and adds the given filters 99 99 * @param filters the filters to add 100 * @throws ParseError if the search expression in one of the filters cannot be parsed101 */ 102 public void update(Collection<Filter> filters) throws ParseError {100 * @throws SearchParseError if the search expression in one of the filters cannot be parsed 101 */ 102 public void update(Collection<Filter> filters) throws SearchParseError { 103 103 reset(); 104 104 for (Filter filter : filters) { … … 118 118 * Adds a filter to the currently used filters 119 119 * @param filter the filter to add 120 * @throws ParseError if the search expression in the filter cannot be parsed121 */ 122 public void add(final Filter filter) throws ParseError {120 * @throws SearchParseError if the search expression in the filter cannot be parsed 121 */ 122 public void add(final Filter filter) throws SearchParseError { 123 123 if (!filter.enable) { 124 124 return; … … 330 330 * @param filters filters to add to the resulting filter matcher 331 331 * @return a new {@code FilterMatcher} containing the given filters 332 * @throws ParseError if the search expression in a filter cannot be parsed332 * @throws SearchParseError if the search expression in a filter cannot be parsed 333 333 * @since 12383 334 334 */ 335 public static FilterMatcher of(Filter... filters) throws ParseError {335 public static FilterMatcher of(Filter... filters) throws SearchParseError { 336 336 FilterMatcher result = new FilterMatcher(); 337 337 for (Filter filter : filters) {
Note:
See TracChangeset
for help on using the changeset viewer.