Mercurial > hg > release > icedtea-web-1.5

changeset 954:01a37b9ad8cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Extracted hardcoded strings from AttributesChecker
author Jiri Vanek <jvanek@redhat.com>
date Wed, 26 Mar 2014 18:50:35 +0100
parents 9de6713da051
children f975d5db4fbd
files ChangeLog netx/net/sourceforge/jnlp/resources/Messages.properties netx/net/sourceforge/jnlp/runtime/ManifestAttributesChecker.java
diffstat 3 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 26 18:46:13 2014 +0100
+++ b/ChangeLog	Wed Mar 26 18:50:35 2014 +0100
@@ -1,4 +1,11 @@
-2014-03-24  Jiri Vanek  <jvanek@redhat.com>
+2014-03-26  Jiri Vanek  <jvanek@redhat.com>
+
+	* netx/net/sourceforge/jnlp/resources/Messages.propertie: new keys (STOAsignedMsgFully)
+	(STOAsignedMsgAndSandbox) (STOAsignedMsgPartiall) added
+	* netx/net/sourceforge/jnlp/runtime/ManifestAttributesChecker.java: extracted
+	hardocded values of (signedMsg)
+
+2014-03-26  Jiri Vanek  <jvanek@redhat.com>
 
 	Added possibility to group permissions in PolicyEditor
 	* netx/net/sourceforge/jnlp/resources/Messages.properties: added groups names
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Mar 26 18:46:13 2014 +0100
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Mar 26 18:50:35 2014 +0100
@@ -302,6 +302,9 @@
 SJNLPFileIsNotSigned=This application contains a digital signature in which the launching JNLP file is not signed.
 SAppletTitle=Applet title: {0}
 STrustedOnlyAttributeFailure=This application specifies Trusted-only as True in its Manifest. {0} and requests permission level: {1}. This is not allowed.
+STOAsignedMsgFully = The applet is fully signed
+STOAsignedMsgAndSandbox = The applet is fully signed and sandboxed
+STOAsignedMsgPartiall = The applet is not fully signed
 
 # Security - used for the More Information dialog
 SBadKeyUsage=Resources contain entries whose signer certificate's KeyUsage extension doesn't allow code signing.
--- a/netx/net/sourceforge/jnlp/runtime/ManifestAttributesChecker.java	Wed Mar 26 18:46:13 2014 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/ManifestAttributesChecker.java	Wed Mar 26 18:50:35 2014 +0100
@@ -115,11 +115,11 @@
                 || (isSandboxed && SecurityDesc.SANDBOX_PERMISSIONS.equals(desc));
         final String signedMsg;
         if (isFullySigned && !isSandboxed) {
-            signedMsg = "The applet is fully signed";
+            signedMsg = Translator.R("STOAsignedMsgFully");
         } else if (isFullySigned && isSandboxed) {
-            signedMsg = "The applet is fully signed and sandboxed";
+            signedMsg = Translator.R("STOAsignedMsgAndSandbox");
         } else {
-            signedMsg = "The applet is not fully signed";
+            signedMsg = Translator.R("STOAsignedMsgPartiall");
         }
         OutputController.getLogger().log(OutputController.Level.MESSAGE_DEBUG,
                 "Trusted Only manifest attribute is \"true\". " + signedMsg + " and requests permission level: " + securityType);