Fix regression in showing certificate info dialogs

2010-10-28  Omair Majid  <[email protected]>

    * netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java
    (showMoreInfoDialog): Make dialog modal.
    (showCertInfoDialog): Likewise.
    (showSingleCertInfoDialog): Likewise.
    (initDialog): Use setModality instead of setModal.

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d5e7e27..7a347c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-28  Omair Majid  <[email protected]>
+
+	* netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java
+	(showMoreInfoDialog): Make dialog modal.
+	(showCertInfoDialog): Likewise.
+	(showSingleCertInfoDialog): Likewise.
+	(initDialog): Use setModality instead of setModal.
+
 2010-10-27  Deepak Bhole <[email protected]>
 
 	* plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_create_applet_tag): Escape
diff --git a/netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java b/netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java
index 1937f1c..dc17174 100644
--- a/netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java
+++ b/netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java
@@ -167,6 +167,7 @@ public class SecurityWarningDialog extends JDialog {
                 SecurityWarningDialog dialog =
                         new SecurityWarningDialog(DialogType.MORE_INFO, null, null,
                         jarSigner);
+                dialog.setModalityType(ModalityType.APPLICATION_MODAL);
                 dialog.setVisible(true);
                 dialog.dispose();
         }
@@ -181,6 +182,7 @@ public class SecurityWarningDialog extends JDialog {
                 SecurityWarningDialog dialog = new SecurityWarningDialog(DialogType.CERT_INFO,
                         null, null, jarSigner);
                 dialog.setLocationRelativeTo(parent);
+                dialog.setModalityType(ModalityType.APPLICATION_MODAL);
                 dialog.setVisible(true);
                 dialog.dispose();
         }
@@ -195,6 +197,7 @@ public class SecurityWarningDialog extends JDialog {
                         JDialog parent) {
                 SecurityWarningDialog dialog = new SecurityWarningDialog(DialogType.SINGLE_CERT_INFO, c);
                         dialog.setLocationRelativeTo(parent);
+                        dialog.setModalityType(ModalityType.APPLICATION_MODAL);
                         dialog.setVisible(true);
                         dialog.dispose();
         }
@@ -219,7 +222,7 @@ public class SecurityWarningDialog extends JDialog {
                         dialogTitle = "Security Warning";
 
                 setTitle(dialogTitle);
-                setModal(false);
+                setModalityType(ModalityType.MODELESS);
 
                 setDefaultCloseOperation(DISPOSE_ON_CLOSE);