/hg/icedtea-web: Fixed PolicyEditor bug with ignoring Cancel opt...

[aazores at icedtea.classpath.org]

changeset 88fd3fdab3f4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=88fd3fdab3f4
author: Andrew Azores <aazores at redhat.com>
date: Fri Jul 11 16:30:57 2014 -0400

	Fixed PolicyEditor bug with ignoring Cancel option on "save before exit"

	2014-07-11  Andrew Azores  <aazores at redhat.com>

		Fixed bug where the "Cancel" option on the "save changes before exiting"
		dialog would be ignored and the window close without saving
		* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java
		(preparePolicyEditorWindow): default close operation NONE rather than
		dispose
		(setupPolicyEditorWindow): do not automatically dispose on window close


diffstat:

 ChangeLog                                                         |  11 +++++++++-
 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java |   3 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 8d268909bdb6 -r 88fd3fdab3f4 ChangeLog
--- a/ChangeLog	Tue Jul 08 17:24:32 2014 +0200
+++ b/ChangeLog	Fri Jul 11 16:30:57 2014 -0400
@@ -1,6 +1,15 @@
+2014-07-11  Andrew Azores  <aazores at redhat.com>
+
+	Fixed bug where the "Cancel" option on the "save changes before exiting"
+	dialog would be ignored and the window close without saving
+	* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java
+	(preparePolicyEditorWindow): default close operation NONE rather than
+	dispose
+	(setupPolicyEditorWindow): do not automatically dispose on window close
+
 2014-07-08  Emmanuel Bourg  <ebourg at apache.org>
 
-       * netx/policyeditor.1: Escaped the minus signs in the policyeditor manpage
+	* netx/policyeditor.1: Escaped the minus signs in the policyeditor manpage
 
 2014-07-03  Jacob Wisor  <gitne at gmx.de>
 
diff -r 8d268909bdb6 -r 88fd3fdab3f4 netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java
--- a/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java	Tue Jul 08 17:24:32 2014 +0200
+++ b/netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java	Fri Jul 11 16:30:57 2014 -0400
@@ -416,7 +416,7 @@
         w.setModalityType(ModalityType.MODELESS); //at least some default
         w.setPolicyEditor(e);
         w.setTitle(R("PETitle"));
-        w.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        w.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
         w.setJMenuBar(createMenuBar(w.asWindow(), w.getPolicyEditor()));
         setupPolicyEditorWindow(w.asWindow(), w.getPolicyEditor());
     }
@@ -430,7 +430,6 @@
             @Override
             public void windowClosing(final WindowEvent e) {
                 ((PolicyEditorWindow) window).quit();
-                window.dispose();
             }
         });