Changeset 17055 in josm

Timestamp:

2020-09-23T14:54:56+02:00 (4 years ago)

Author:

GerdP

Message:

see #19793: Memory leaks: Bad programming pattern reg. listeners
SearchDialog did not remove TaggingPresetListener

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/SearchDialog.java (modified) (3 diffs)
• tagging/presets/TaggingPresetSelector.java (modified) (3 diffs)

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

@@ -69 +69 @@
     private JRadioButton remove;
     private JRadioButton inSelection;
-
+    private TaggingPresetSelector selector;
     /**
      * Constructs a new {@code SearchDialog}.
@@ -232 +232 @@
          * if the corresponding group of the preset exists, otherwise it is simply ' presetName'.
          */
-        TaggingPresetSelector selector = new TaggingPresetSelector(false, false);
+        selector = new TaggingPresetSelector(false, false);
         selector.setBorder(BorderFactory.createTitledBorder(tr("Search by preset")));
         selector.setDblClickListener(ev -> setPresetDblClickListener(selector, editorComponent));
@@ -532 +532 @@
         }
     }
+
+    @Override
+    public void dispose() {
+        if (selector != null)
+            selector.destroy();
+        super.dispose();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.gui.widgets.SearchTextResultListPanel;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -54 +55 @@
  */
 public class TaggingPresetSelector extends SearchTextResultListPanel<TaggingPreset>
-        implements DataSelectionListener, TaggingPresetListener {
+        implements DataSelectionListener, TaggingPresetListener, Destroyable {
 
     private static final int CLASSIFICATION_IN_FAVORITES = 300;
@@ -465 +466 @@
         classifications.loadPresets(TaggingPresets.getTaggingPresets());
     }
+
+    @Override
+    public void destroy() {
+        TaggingPresets.removeListener(this);
+    }
+
 }