Changeset 3441 in josm for trunk/src/org

Timestamp:

2010-08-15T18:36:43+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5331 Memory leak when removing data layers

File:

• trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -30 +30 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.WindowConstants;
 
 import org.openstreetmap.josm.Main;
@@ -81 +82 @@
 
         addWindowListener(new WindowClosingAdapter());
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
     }
 
@@ -274 +276 @@
     }
 
+    public void closeDialog() {
+        setVisible(false);
+        dispose();
+    }
+
     class WindowClosingAdapter extends WindowAdapter {
         @Override
@@ -290 +297 @@
         protected void cancelWhenInEditingModel() {
             setUserAction(UserAction.CANCEL);
-            setVisible(false);
+            closeDialog();
         }
 
@@ -328 +335 @@
         public void actionPerformed(ActionEvent e) {
             setUserAction(UserAction.PROCEED);
-            setVisible(false);
+            closeDialog();
         }
         public void propertyChange(PropertyChangeEvent evt) {
@@ -519 +526 @@
                 if (cancelled) {
                     setUserAction(UserAction.CANCEL);
-                    setVisible(false);
+                    closeDialog();
                 }
             } else {
                 setUserAction(UserAction.PROCEED);
-                setVisible(false);
+                closeDialog();
             }
         }