[cp-patches] FYI: JFileChooser close/cancel

[Sven de Marothy]

2006-07-12  Sven de Marothy  <[EMAIL PROTECTED]>

        * javax/swing/JFileChooser.java:
        (createDialog): Close operation should cause a cancel.



Index: javax/swing/JFileChooser.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/JFileChooser.java,v
retrieving revision 1.33
diff -U3 -r1.33 JFileChooser.java
--- javax/swing/JFileChooser.java	16 May 2006 16:51:34 -0000	1.33
+++ javax/swing/JFileChooser.java	12 Jul 2006 21:05:29 -0000
@@ -43,6 +43,8 @@
 import java.awt.HeadlessException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowAdapter;
 import java.beans.PropertyChangeEvent;
 import java.io.File;
 import java.util.ArrayList;
@@ -744,10 +746,16 @@
     JDialog dialog = new JDialog(toUse);
     setSelectedFile(null);
     dialog.getContentPane().add(this);
+    dialog.addWindowListener( new WindowAdapter()
+      {
+	public void windowClosing(WindowEvent e)
+	{
+	  cancelSelection();
+	}
+      });
     dialog.setModal(true);
     dialog.invalidate();
     dialog.repaint();
-
     return dialog;
   }