Changeset 14206 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2018-08-31T00:57:57+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16698, see #15670 - make sure filters are executed (costly operation) only when necessary:

• data changes imply execution of filters only when at least a filter is enabled
• filter changes imply execution of filters even is no filter is enabled
• filter dataset change events should not trigger a new filter execution!

Location:

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

Files:

• DataSet.java (modified) (2 diffs)
• FilterMatcher.java (modified) (1 diff)
• FilterModel.java (modified) (1 diff)
• event/AbstractDatasetChangedEvent.java (modified) (1 diff)
• event/FilterChangedEvent.java (added)

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

@@ -42 +42 @@
 import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.FilterChangedEvent;
 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitiveFlagsChangedEvent;
@@ -1030 +1031 @@
 
     void fireFilterChanged() {
-        fireEvent(new DataChangedEvent(this));
+        fireEvent(new FilterChangedEvent(this));
     }
 

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

@@ -114 +114 @@
 
     /**
+     * Determines if at least one filter is enabled.
+     * @return {@code true} if at least one filter is enabled
+     * @since 14206
+     */
+    public boolean hasFilters() {
+        return !hiddenFilters.isEmpty() || !disabledFilters.isEmpty();
+    }
+
+    /**
      * Adds a filter to the currently used filters
      * @param filter the filter to add

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

@@ -373 +373 @@
 
     /**
+     * Determines if at least one filter is enabled.
+     * @return {@code true} if at least one filter is enabled
+     * @since 14206
+     */
+    public boolean hasFilters() {
+        return filterMatcher.hasFilters();
+    }
+
+    /**
      * Returns the list of primitives whose filtering can be affected by change in primitive
      * @param primitives list of primitives to check

trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java

@@ -49 +49 @@
          */
         CHANGESET_ID_CHANGED,
+        /**
+         * The filtered state changed for a list of primitives
+         */
+        FILTERS_CHANGED,
         /**
          * The flags changed for a primitive and have not been covered in an other event