Changeset 18951 in josm

Timestamp:

2024-01-23T10:55:17+01:00 (10 months ago)

Author:

GerdP

Message:

fix #23430: Resetting preference validator.selectionFilter results in broken validator

• always set filter when selection was changed
• updateSelection when preferences were changed so that a change of the preference validator.selectionFilter is applied immediately

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (modified) (3 diffs)

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

@@ -69 +69 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
@@ -588 +589 @@
      */
     public void updateSelection(Collection<? extends OsmPrimitive> newSelection) {
-        if (!Config.getPref().getBoolean(ValidatorPrefHelper.PREF_FILTER_BY_SELECTION, false))
-            return;
-        if (newSelection.isEmpty()) {
+        if (newSelection.isEmpty() || !Config.getPref().getBoolean(ValidatorPrefHelper.PREF_FILTER_BY_SELECTION, false))
             tree.setFilter(null);
-        }
-        tree.setFilter(new HashSet<>(newSelection));
+        else
+            tree.setFilter(new HashSet<>(newSelection));
     }
 
@@ -731 +730 @@
         }
     }
+
+    @Override
+    public void preferenceChanged(PreferenceChangeEvent e) {
+        super.preferenceChanged(e);
+        // see #23430: update selection so that filters are applied
+        DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+        if (ds != null) {
+            updateSelection(ds.getAllSelected());
+        }
+
+    }
+
 }