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

Timestamp:

2018-12-22T19:42:50+01:00 (6 years ago)

Author:

GerdP

Message:

#see #17040 implement Destroyable in ToggleDialog.TitleBar and use it in ToggleDialog.destroy()

File:

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

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

@@ -470 +470 @@
         Config.getPref().removePreferenceChangeListener(this);
         GuiHelper.destroyComponents(this, false);
+        titleBar.destroy();
+        titleBar = null;
+        this.buttonActions.clear();
     }
 
@@ -501 +504 @@
      * The title bar displayed in docked mode
      */
-    protected class TitleBar extends JPanel {
+    protected class TitleBar extends JPanel implements Destroyable {
         /** the label which shows whether the toggle dialog is expanded or collapsed */
         private final JLabel lblMinimized;
@@ -511 +514 @@
         /** the contextual menu **/
         private DialogPopupMenu popupMenu;
+
+        private MouseEventHandler mouseEventHandler;
 
         @SuppressWarnings("unchecked")
@@ -633 +638 @@
         public final void registerMouseListener() {
             popupMenu = new DialogPopupMenu();
-            addMouseListener(new MouseEventHandler());
+            mouseEventHandler = new MouseEventHandler();
+            addMouseListener(mouseEventHandler);
         }
 
@@ -656 +662 @@
                 }
             }
+        }
+
+        @Override
+        public void destroy() {
+            removeMouseListener(mouseEventHandler);
+            this.mouseEventHandler = null;
+            this.popupMenu = null;
         }
     }
@@ -754 +767 @@
      */
     public void setTitle(String title) {
-        titleBar.setTitle(title);
+        if (titleBar != null) {
+            titleBar.setTitle(title);
+        }
         if (detachedDialog != null) {
             detachedDialog.setTitle(title);