Changeset 12383 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-06-10T00:50:51+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14929 - new methods to ease the direct handling of filters

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• FilterMatcher.java (modified) (1 diff)
• FilterWorker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java

@@ -325 +325 @@
     }
 
+    /**
+     * Returns a new {@code FilterMatcher} containing the given filters.
+     * @param filters filters to add to the resulting filter matcher
+     * @return a new {@code FilterMatcher} containing the given filters
+     * @throws ParseError if the search expression in a filter cannot be parsed
+     * @since 12383
+     */
+    public static FilterMatcher of(Filter... filters) throws ParseError {
+        FilterMatcher result = new FilterMatcher();
+        for (Filter filter : filters) {
+            result.add(filter);
+        }
+        return result;
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java

@@ -5 +5 @@
 import java.util.Collections;
 
+import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
 import org.openstreetmap.josm.data.osm.FilterMatcher.FilterType;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -19 +20 @@
     private FilterWorker() {
         // Hide default constructor for utils classes
+    }
+
+    /**
+     * Apply the filters to the primitives of the data set.
+     *
+     * @param all the collection of primitives for that the filter state should be updated
+     * @param filters the filters
+     * @return true, if the filter state (normal / disabled / hidden) of any primitive has changed in the process
+     * @throws ParseError if the search expression in a filter cannot be parsed
+     * @since 12383
+     */
+    public static boolean executeFilters(Collection<OsmPrimitive> all, Filter... filters) throws ParseError {
+        return executeFilters(all, FilterMatcher.of(filters));
     }