Changeset 17862 in josm for trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java

Timestamp:

2021-05-06T17:39:27+02:00 (3 years ago)

Author:

simon04

Message:

fix #17177 - Add support for Mapbox Vector Tile (patch by taylor.smock)

Signed-off-by: Taylor Smock <tsmock@…>

File:

• trunk/src/org/openstreetmap/josm/data/osm/FilterWorker.java (modified) (5 diffs)

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

@@ -10 +10 @@
 
 /**
- * Class for applying {@link Filter}s to {@link OsmPrimitive}s.
+ * Class for applying {@link Filter}s to {@link IPrimitive}s.
  *
  * Provides a bridge between Filter GUI and the data.
@@ -25 +25 @@
      * Apply the filters to the primitives of the data set.
      *
+     * @param <T> The primitive type
      * @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 SearchParseError if the search expression in a filter cannot be parsed
-     * @since 12383
+     * @since 12383, xxx (generics)
      */
-    public static boolean executeFilters(Collection<OsmPrimitive> all, Filter... filters) throws SearchParseError {
+    public static <T extends IPrimitive & IFilterablePrimitive> boolean executeFilters(Collection<T> all, Filter... filters)
+            throws SearchParseError {
         return executeFilters(all, FilterMatcher.of(filters));
     }
@@ -38 +40 @@
      * Apply the filters to the primitives of the data set.
      *
+     * @param <T> The primitive type
      * @param all the collection of primitives for that the filter state should be updated
      * @param filterMatcher the FilterMatcher
      * @return true, if the filter state (normal / disabled / hidden) of any primitive has changed in the process
+     * @since xxx (generics)
      */
-    public static boolean executeFilters(Collection<OsmPrimitive> all, FilterMatcher filterMatcher) {
+    public static <T extends IPrimitive & IFilterablePrimitive> boolean executeFilters(Collection<T> all, FilterMatcher filterMatcher) {
         boolean changed;
         // first relations, then ways and nodes last; this is required to resolve dependencies
-        changed = doExecuteFilters(SubclassFilteredCollection.filter(all, Relation.class::isInstance), filterMatcher);
-        changed |= doExecuteFilters(SubclassFilteredCollection.filter(all, Way.class::isInstance), filterMatcher);
-        changed |= doExecuteFilters(SubclassFilteredCollection.filter(all, Node.class::isInstance), filterMatcher);
+        changed = doExecuteFilters(SubclassFilteredCollection.filter(all, IRelation.class::isInstance), filterMatcher);
+        changed |= doExecuteFilters(SubclassFilteredCollection.filter(all, IWay.class::isInstance), filterMatcher);
+        changed |= doExecuteFilters(SubclassFilteredCollection.filter(all, INode.class::isInstance), filterMatcher);
         return changed;
     }
 
-    private static boolean doExecuteFilters(Collection<OsmPrimitive> all, FilterMatcher filterMatcher) {
+    private static <T extends IPrimitive & IFilterablePrimitive> boolean doExecuteFilters(Collection<T> all, FilterMatcher filterMatcher) {
 
         boolean changed = false;
 
-        for (OsmPrimitive primitive: all) {
+        for (T primitive : all) {
             FilterType hiddenType = filterMatcher.isHidden(primitive);
             if (hiddenType != FilterType.NOT_FILTERED) {
@@ -76 +80 @@
      * Apply the filters to a single primitive.
      *
+     * @param <T> the primitive type
      * @param primitive the primitive
      * @param filterMatcher the FilterMatcher
      * @return true, if the filter state (normal / disabled / hidden)
      * of the primitive has changed in the process
+     * @since xxx (generics)
      */
-    public static boolean executeFilters(OsmPrimitive primitive, FilterMatcher filterMatcher) {
+    public static <T extends IPrimitive & IFilterablePrimitive> boolean executeFilters(T primitive, FilterMatcher filterMatcher) {
         return doExecuteFilters(Collections.singleton(primitive), filterMatcher);
     }
@@ -87 +93 @@
     /**
      * Clear all filter flags, i.e.&nbsp;turn off filters.
+     * @param <T> the primitive type
      * @param prims the primitives
      * @return true, if the filter state (normal / disabled / hidden) of any primitive has changed in the process
      * @since 12388 (signature)
      */
-    public static boolean clearFilterFlags(Collection<OsmPrimitive> prims) {
+    public static <T extends IPrimitive & IFilterablePrimitive> boolean clearFilterFlags(Collection<T> prims) {
         boolean changed = false;
-        for (OsmPrimitive osm : prims) {
+        for (T osm : prims) {
             changed |= osm.unsetDisabledState();
         }