Changeset 14545 in josm for trunk/src/org

Timestamp:

2018-12-10T10:23:30+01:00 (6 years ago)

Author:

GerdP

Message:

see #17040 - destroy ChangesetInfoAction and UserInfoAction

File:

• trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (modified) (5 diffs)

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

@@ -35 +35 @@
 import org.openstreetmap.josm.io.XmlWriter;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -43 +44 @@
  * @since 1709
  */
-public class VersionTable extends JTable implements ChangeListener {
+public class VersionTable extends JTable implements ChangeListener, Destroyable {
     private VersionTablePopupMenu popupMenu;
     private final transient HistoryBrowserModel model;
@@ -104 +105 @@
     }
 
+    @Override
+    public void destroy() {
+        popupMenu.destroy();
+    }
+
     // some kind of hack to prevent the table from scrolling to the
     // right when clicking on the cells
@@ -220 +226 @@
     }
 
-    static class VersionTablePopupMenu extends JPopupMenu {
+    static class VersionTablePopupMenu extends JPopupMenu implements Destroyable {
 
         private ChangesetInfoAction changesetInfoAction;
@@ -244 +250 @@
             userInfoAction.prepare(primitive);
             invalidate();
+        }
+
+        @Override
+        public void destroy() {
+            if (changesetInfoAction != null)
+                changesetInfoAction.destroy();
+            if (userInfoAction != null)
+                userInfoAction.destroy();
         }
     }