Changeset 14601 in josm for trunk

Timestamp:

2018-12-25T21:17:28+01:00 (5 years ago)

Author:

GerdP

Message:

see #17040 dispose PreferenceDialog and call removeWindowListener()

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -43 +43 @@
     private final PreferenceTabbedPane tpPreferences = new PreferenceTabbedPane();
     private final ContextSensitiveHelpAction helpAction = new ContextSensitiveHelpAction();
+    private final WindowEventHandler windowEventHandler = new WindowEventHandler();
     private boolean canceled;
 
@@ -84 +85 @@
         tpPreferences.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         c.add(buildActionPanel(), BorderLayout.SOUTH);
-
-        addWindowListener(new WindowEventHandler());
+        addWindowListener(windowEventHandler);
 
         InputMapUtils.addEscapeAction(getRootPane(), new CancelAction());
@@ -177 +177 @@
         public void cancel() {
             setCanceled(true);
-            setVisible(false);
-            tpPreferences.validationListeners.clear();
+            dispose();
         }
 
@@ -202 +201 @@
 
             tpPreferences.savePreferences();
-            tpPreferences.validationListeners.clear();
             setCanceled(false);
-            setVisible(false);
+            dispose();
         }
     }
@@ -214 +212 @@
         }
     }
+
+    @Override
+    public void dispose() {
+        removeWindowListener(windowEventHandler);
+        super.dispose();
+    }
 }