Changeset 14463 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

Timestamp:

2018-11-28T22:42:32+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #17040 - fix memory leaks when calling history dialog

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -126 +126 @@
     /**
      * Removes this history browser model as listener for data change and layer change events.
-     */
+     * @deprecated not needeed anymore, job is done in {@link #dispose}
+     */
+    @Deprecated
     public void unlinkAsListener() {
         getHistoryBrowser().getModel().unlinkAsListener();
@@ -160 +162 @@
 
         void run() {
-            getHistoryBrowser().getModel().unlinkAsListener();
-            HistoryDataSet.getInstance().removeHistoryDataSetListener(HistoryBrowserDialog.this);
             HistoryBrowserDialogManager.getInstance().hide(HistoryBrowserDialog.this);
         }
@@ -202 +202 @@
         return browser;
     }
+
+    @Override
+    public void dispose() {
+        HistoryDataSet.getInstance().removeHistoryDataSetListener(HistoryBrowserDialog.this);
+        GuiHelper.destroyComponents(this, false);
+        super.dispose();
+    }
 }