Changeset 14206 in josm for trunk/src/org

Timestamp:

2018-08-31T00:57:57+02:00 (6 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

Files:

• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/FilterMatcher.java (modified) (1 diff)
• data/osm/FilterModel.java (modified) (1 diff)
• data/osm/event/AbstractDatasetChangedEvent.java (modified) (1 diff)
• data/osm/event/FilterChangedEvent.java (added)
• gui/autofilter/AutoFilterButton.java (modified) (1 diff)
• gui/autofilter/AutoFilterManager.java (modified) (1 diff)
• gui/dialogs/FilterDialog.java (modified) (3 diffs)
• gui/dialogs/FilterTableModel.java (modified) (2 diffs)

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

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java

@@ -36 +36 @@
                 if (filter.equals(afm.getCurrentAutoFilter())) {
                     afm.setCurrentAutoFilter(null);
-                    MainApplication.getMap().filterDialog.getFilterModel().executeFilters();
+                    MainApplication.getMap().filterDialog.getFilterModel().executeFilters(true);
                 } else {
                     afm.setCurrentAutoFilter(filter);

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java

@@ -394 +394 @@
         MapFrame map = MainApplication.getMap();
         if (map != null) {
-            map.filterDialog.getFilterModel().executeFilters();
+            map.filterDialog.getFilterModel().executeFilters(true);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.FilterModel;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent.DatasetEventType;
 import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataSetListener;
@@ -83 +84 @@
         DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT_CONSOLIDATED);
         MapFrame.addMapModeChangeListener(this);
-        filterModel.executeFilters();
+        filterModel.executeFilters(true);
     }
 
@@ -326 +327 @@
     @Override
     public void otherDatasetChange(AbstractDatasetChangedEvent event) {
-        filterModel.executeFilters();
+        if (!DatasetEventType.FILTERS_CHANGED.equals(event.getType())) {
+            filterModel.executeFilters();
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

@@ -63 +63 @@
     private void updateFilters() {
         AutoFilterManager.getInstance().setCurrentAutoFilter(null);
-        executeFilters();
-    }
-
-    /**
-     * Runs the filters on the current edit data set.
+        executeFilters(true);
+    }
+
+    /**
+     * Runs the filters on the current edit data set, if any. Does nothing if no filter is enabled.
      */
     public void executeFilters() {
-        if (AutoFilterManager.getInstance().getCurrentAutoFilter() == null) {
+        executeFilters(false);
+    }
+
+    /**
+     * Runs the filter on a list of primitives that are part of the edit data set, if any. Does nothing if no filter is enabled.
+     * @param primitives The primitives
+     */
+    public void executeFilters(Collection<? extends OsmPrimitive> primitives) {
+        executeFilters(primitives, false);
+    }
+
+    /**
+     * Runs the filters on the current edit data set, if any.
+     * @param force force execution of filters even if no filter is enabled. Useful to reset state after change of filters
+     * @since 14206
+     */
+    public void executeFilters(boolean force) {
+        if (AutoFilterManager.getInstance().getCurrentAutoFilter() == null && (force || model.hasFilters())) {
             model.executeFilters();
             updateMap();
@@ -77 +94 @@
 
     /**
-     * Runs the filter on a list of primitives that are part of the edit data set.
+     * Runs the filter on a list of primitives that are part of the edit data set, if any.
+     * @param force force execution of filters even if no filter is enabled. Useful to reset state after change of filters
      * @param primitives The primitives
-     */
-    public void executeFilters(Collection<? extends OsmPrimitive> primitives) {
-        if (AutoFilterManager.getInstance().getCurrentAutoFilter() == null) {
+     * @since 14206
+     */
+    public void executeFilters(Collection<? extends OsmPrimitive> primitives, boolean force) {
+        if (AutoFilterManager.getInstance().getCurrentAutoFilter() == null && (force || model.hasFilters())) {
             model.executeFilters(primitives);
             updateMap();