Changeset 6170 in josm

Timestamp:

2013-08-21T12:56:46+02:00 (11 years ago)

Author:

Don-vip

Message:

make ToggleDialog Destroyable

File:

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

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

@@ -73 +73 @@
  *
  */
-public class ToggleDialog extends JPanel implements ShowHideButtonListener, Helpful, AWTEventListener {
+public class ToggleDialog extends JPanel implements ShowHideButtonListener, Helpful, AWTEventListener, Destroyable {
 
     public enum ButtonHiddingType {
@@ -398 +398 @@
     }
 
+    @Override
     public void destroy() {
         closeDetachedDialog();
@@ -403 +404 @@
         Main.main.menu.windowMenu.remove(windowMenuItem);
         Toolkit.getDefaultToolkit().removeAWTEventListener(this);
-        destroyComponents(this);
-    }
-
-    private void destroyComponents(Component component) {
+        destroyComponents(this, false);
+    }
+
+    private void destroyComponents(Component component, boolean destroyItself) {
         if (component instanceof Container) {
             for (Component c: ((Container)component).getComponents()) {
-                destroyComponents(c);
-            }
-        }
-        if (component instanceof Destroyable) {
+                destroyComponents(c, true);
+            }
+        }
+        if (destroyItself && component instanceof Destroyable) {
             ((Destroyable) component).destroy();
         }