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

Timestamp:

2021-10-17T06:08:14+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21441 - Make Tags/Membership panel listen to Preset Preferences changes (patch by marcello)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -100 +100 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetListener;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.util.AbstractTag2LinkPopupListener;
 import org.openstreetmap.josm.gui.util.HighlightHelper;
@@ -111 +113 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.GBC;
@@ -139 +142 @@
  */
 public class PropertiesDialog extends ToggleDialog
-implements DataSelectionListener, ActiveLayerChangeListener, DataSetListenerAdapter.Listener {
+implements DataSelectionListener, ActiveLayerChangeListener, DataSetListenerAdapter.Listener, PreferenceChangedListener, TaggingPresetListener {
 
     /**
@@ -239 +242 @@
             + tr("Select objects for which to change tags.") + "</p></html>");
 
-    private final PreferenceChangedListener preferenceListener = e -> {
-                if (MainApplication.getLayerManager().getActiveData() != null) {
-                    // Re-load data when display preference change
-                    updateSelection();
-                }
-            };
-
     private final transient TaggingPresetHandler presetHandler = new TaggingPresetCommandHandler();
 
@@ -308 +304 @@
         editHelper.loadTagsIfNeeded();
 
-        Config.getPref().addKeyPreferenceChangeListener("display.discardable-keys", preferenceListener);
+        Config.getPref().addKeyPreferenceChangeListener("display.discardable-keys", this);
+        TaggingPresets.addListener(this);
     }
 
@@ -621 +618 @@
         membershipTable.removeMouseListener(popupMenuLauncher);
         super.destroy();
-        Config.getPref().removeKeyPreferenceChangeListener("display.discardable-keys", preferenceListener);
+        Config.getPref().removeKeyPreferenceChangeListener("display.discardable-keys", this);
+        TaggingPresets.removeListener(this);
         Container parent = pluginHook.getParent();
         if (parent != null) {
@@ -767 +765 @@
 
     /* ---------------------------------------------------------------------------------- */
+    /* PreferenceChangedListener                                                          */
+    /* ---------------------------------------------------------------------------------- */
+
+    /**
+     * Re-load data when display preference change
+     */
+    @Override
+    public void preferenceChanged(PreferenceChangeEvent e) {
+        if (MainApplication.getLayerManager().getActiveData() != null) {
+            updateSelection();
+        }
+    }
+
+
+    /* ---------------------------------------------------------------------------------- */
+    /* TaggingPresetListener                                                              */
+    /* ---------------------------------------------------------------------------------- */
+
+    /**
+     * Updates the preset list when Presets preference changes.
+     */
+    @Override
+    public void taggingPresetsModified() {
+        if (MainApplication.getLayerManager().getActiveData() != null) {
+            updateSelection();
+        }
+    }
+
+    /* ---------------------------------------------------------------------------------- */
     /* ActiveLayerChangeListener                                                          */
     /* ---------------------------------------------------------------------------------- */