/hg/icedtea-web: 2 new changesets

[omajid at icedtea.classpath.org]

changeset 6dd50caf8e76 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6dd50caf8e76
author: Omair Majid <omajid at redhat.com>
date: Wed Nov 24 10:53:38 2010 -0500

	fix infinite recursion in determining sandbox permissions

	2010-11-24 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/SecurityDesc.java: Add
	grantAwtPermissions. (SecurityDesc): Set grantAwtPermissions.
	(getSandboxPermissions): Use grantAwtPermissions to determine
	whether to grant permissions.


changeset 476a91d02140 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=476a91d02140
author: Omair Majid <omajid at redhat.com>
date: Wed Nov 24 10:55:50 2010 -0500

	internationalize a missed string in certificate viewer

	2010-11-24 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/resources/Messages.properties: Add
	CVCertificateType.
	    * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java: Use
	CVCertificateType instead of hardcoded string.


diffstat:

4 files changed, 23 insertions(+), 3 deletions(-)
ChangeLog                                                      |   14 ++++++++++
netx/net/sourceforge/jnlp/SecurityDesc.java                    |    9 +++++-
netx/net/sourceforge/jnlp/resources/Messages.properties        |    1 
netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java |    2 -

diffs (77 lines):

diff -r 5782c25b26dc -r 476a91d02140 ChangeLog
--- a/ChangeLog	Wed Nov 24 14:15:17 2010 +0100
+++ b/ChangeLog	Wed Nov 24 10:55:50 2010 -0500
@@ -1,3 +1,17 @@ 2010-11-24  Matthias Klose  <doko at ubuntu
+2010-11-24  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: Add
+	CVCertificateType.
+	* netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java: Use
+	CVCertificateType instead of hardcoded string.
+
+2010-11-24  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/SecurityDesc.java: Add grantAwtPermissions.
+	(SecurityDesc): Set grantAwtPermissions.
+	(getSandboxPermissions): Use grantAwtPermissions to determine whether to
+	grant permissions.
+
 2010-11-24  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (javaws.desktop): Search javaws.desktop.in in $(srcdir).
diff -r 5782c25b26dc -r 476a91d02140 netx/net/sourceforge/jnlp/SecurityDesc.java
--- a/netx/net/sourceforge/jnlp/SecurityDesc.java	Wed Nov 24 14:15:17 2010 +0100
+++ b/netx/net/sourceforge/jnlp/SecurityDesc.java	Wed Nov 24 10:55:50 2010 -0500
@@ -52,6 +52,9 @@ public class SecurityDesc {
 
     /** the download host */
     private String downloadHost;
+
+    /** whether sandbox applications should get the show window without banner permission */
+    private final boolean grantAwtPermissions;
 
     /** the JNLP file */
     private JNLPFile file;
@@ -146,6 +149,9 @@ public class SecurityDesc {
         this.file = file;
         this.type = type;
         this.downloadHost = downloadHost;
+
+        String key = DeploymentConfiguration.KEY_SECURITY_ALLOW_HIDE_WINDOW_WARNING;
+        grantAwtPermissions = Boolean.valueOf(JNLPRuntime.getConfiguration().getProperty(key));
     }
 
     /**
@@ -188,8 +194,7 @@ public class SecurityDesc {
         for (int i=0; i < sandboxPermissions.length; i++)
             permissions.add(sandboxPermissions[i]);
 
-        String key = DeploymentConfiguration.KEY_SECURITY_ALLOW_HIDE_WINDOW_WARNING;
-        if (Boolean.valueOf(JNLPRuntime.getConfiguration().getProperty(key)) == Boolean.TRUE) {
+        if (grantAwtPermissions) {
             permissions.add(new AWTPermission("showWindowWithoutWarningBanner"));
         }
 
diff -r 5782c25b26dc -r 476a91d02140 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Nov 24 14:15:17 2010 +0100
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Nov 24 10:55:50 2010 -0500
@@ -214,6 +214,7 @@ SValidity=Validity
 
 # Certificate Viewer
 CVCertificateViewer=Certificates
+CVCertificateType=Certificate Type
 CVDetails=Details
 CVExport=Export
 CVImport=Import
diff -r 5782c25b26dc -r 476a91d02140 netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
--- a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java	Wed Nov 24 14:15:17 2010 +0100
+++ b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java	Wed Nov 24 10:55:50 2010 -0500
@@ -157,7 +157,7 @@ public class CertificatePane extends JPa
                 JPanel certificateTypePanel = new JPanel(new BorderLayout());
                 certificateTypePanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
 
-                JLabel certificateTypeLabel = new JLabel("Certificate Type:");
+                JLabel certificateTypeLabel = new JLabel(R("CVCertificateType"));
 
                 certificateTypeCombo = new JComboBox(certificateTypes);
                 certificateTypeCombo.addActionListener(new CertificateTypeListener());