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

Timestamp:

2010-06-28T08:03:42+02:00 (14 years ago)

Author:

jttt

Message:

Fixed #5173 memory leak in search dialog - almost every ExtendedDialog wasn't disposed after close - changed to dispose dialogs automatically

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ExtendedDialog.java (modified) (4 diffs)
• dialogs/relation/RelationEditor.java (modified) (1 diff)
• widgets/ComboBoxHistory.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -30 +30 @@
 
 public class ExtendedDialog extends JDialog {
+    private final boolean disposeOnClose;
     private int result = 0;
     public static final int DialogClosedOtherwise = 0;
@@ -85 +86 @@
      */
     public ExtendedDialog(Component parent, String title, String[] buttonTexts) {
-        super(JOptionPane.getFrameForComponent(parent), title, true);
-        this.parent = parent;
-        bTexts = buttonTexts;
+        this(parent, title, buttonTexts, true, true);
     }
 
@@ -95 +94 @@
     public ExtendedDialog(Component parent, String title, String[] buttonTexts,
             boolean modal) {
+        this(parent, title, buttonTexts, modal, true);
+    }
+
+    public ExtendedDialog(Component parent, String title, String[] buttonTexts,
+            boolean modal, boolean disposeOnClose) {
         super(JOptionPane.getFrameForComponent(parent), title, modal);
         this.parent = parent;
         bTexts = buttonTexts;
+        if (disposeOnClose) {
+            setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+        }
+        this.disposeOnClose = disposeOnClose;
     }
 
@@ -342 +350 @@
         }
         super.setVisible(visible);
+
+        if (!visible && disposeOnClose) {
+            dispose();
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

@@ -119 +119 @@
                 "",
                 new String[] { tr("Apply Changes"), tr("Cancel")},
+                false,
                 false
         );

trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java

@@ -29 +29 @@
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -35 +34 @@
 import javax.swing.DefaultComboBoxModel;
 
-import org.openstreetmap.josm.gui.tagging.ac.*;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 
 public class ComboBoxHistory extends DefaultComboBoxModel implements Iterable<AutoCompletionListItem> {