[Japi-cvs] SF.net SVN: japi:[1305] libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/ prefs/PreferencesPane.java

[<chr...@us...>]

Revision: 1305
          http://japi.svn.sourceforge.net/japi/?rev=1305&view=rev
Author:   christianhujer
Date:     2009-05-21 18:32:25 +0000 (Thu, 21 May 2009)

Log Message:
-----------
[2794982] Closing the dialog behaves strange

Modified Paths:
--------------
    libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java

Modified: libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java
===================================================================
--- libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java	2009-05-21 18:21:35 UTC (rev 1304)
+++ libs/swing-prefs/trunk/src/prj/net/sf/japi/swing/prefs/PreferencesPane.java	2009-05-21 18:32:25 UTC (rev 1305)
@@ -21,6 +21,8 @@
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.util.HashMap;
 import java.util.Map;
 import javax.swing.Action;
@@ -34,6 +36,7 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.WindowConstants;
 import javax.swing.border.Border;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -112,6 +115,14 @@
                 final JDialog dialog = pane.createDialog(parentComponent, prefs.getTitle());
                 DIALOGS.put(prefs, dialog);
                 dialog.setResizable(true);
+                dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+                dialog.addWindowListener(new WindowAdapter() {
+                    /** {@inheritDoc} */
+                    @Override
+                    public void windowClosing(final WindowEvent e) {
+                        pane.cancel();
+                    }
+                });
                 dialog.setModal(modal);
                 dialog.setVisible(true);
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.