Changeset 18293 in josm for trunk

Timestamp:

2021-10-27T17:07:48+02:00 (2 years ago)

Author:

Don-vip

Message:

fix #21452 - fix #21462 - fix deadlock (patch by marcello)

File:

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

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

@@ -112 +112 @@
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 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;
@@ -142 +141 @@
  */
 public class PropertiesDialog extends ToggleDialog
-implements DataSelectionListener, ActiveLayerChangeListener, DataSetListenerAdapter.Listener, PreferenceChangedListener, TaggingPresetListener {
+implements DataSelectionListener, ActiveLayerChangeListener, DataSetListenerAdapter.Listener, TaggingPresetListener {
+    private final BooleanProperty PROP_DISPLAY_DISCARDABLE_KEYS = new BooleanProperty("display.discardable-keys", false);
 
     /**
@@ -304 +304 @@
         editHelper.loadTagsIfNeeded();
 
-        Config.getPref().addKeyPreferenceChangeListener("display.discardable-keys", this);
         TaggingPresets.addListener(this);
     }
@@ -618 +617 @@
         membershipTable.removeMouseListener(popupMenuLauncher);
         super.destroy();
-        Config.getPref().removeKeyPreferenceChangeListener("display.discardable-keys", this);
         TaggingPresets.removeListener(this);
         Container parent = pluginHook.getParent();
@@ -651 +649 @@
         tagData.setRowCount(0);
 
-        final boolean displayDiscardableKeys = Config.getPref().getBoolean("display.discardable-keys", false);
+        final boolean displayDiscardableKeys = PROP_DISPLAY_DISCARDABLE_KEYS.get();
         final Map<String, Integer> keyCount = new HashMap<>();
         final Map<String, String> tags = new HashMap<>();
@@ -769 +767 @@
 
     /**
-     * Re-load data when display preference change
+     * Reloads data when the {@code display.discardable-keys} preference changes
      */
     @Override
     public void preferenceChanged(PreferenceChangeEvent e) {
-        if (MainApplication.getLayerManager().getActiveData() != null) {
-            updateSelection();
-        }
-    }
-
+        super.preferenceChanged(e);
+        if (PROP_DISPLAY_DISCARDABLE_KEYS.getKey().equals(e.getKey())) {
+            if (MainApplication.getLayerManager().getActiveData() != null) {
+                updateSelection();
+            }
+        }
+    }
 
     /* ---------------------------------------------------------------------------------- */