[icedtea-web] RFC: Minor fixes to ALACA dialog

[Omair Majid]

* Jiri Vanek <jvanek at redhat.com> [2014-03-31 09:53]:
> On 03/28/2014 11:23 PM, Omair Majid wrote:
> >The attached patches does some minor tweaks to the ALACA dialog.
> 
> Yes. This is ok to go. Also I'm for the compression  of  info
> attribute. I think it is more wide spread. Then jsut in alaca.

Okay, this patch includes all the 4 changes (remove 'codebase', wrap
urls in <ul>, simplify the ALACA title and fix html link names).

If you read it carefully, you will see both ALACA title/descriptions are
the same. I am still not sure if, from a user's point of view, there is
any difference.

Thoughts?

Thanks,
Omair

-- 
PGP Key: 66484681 (http://pgp.mit.edu/)
Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
-------------- next part --------------
diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties
@@ -61,23 +61,24 @@
 http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
 
 # missing Application-Library-Allowable-Codebase dialogue
-ALACAMissingMainTitle=Application <span color='red'> {0} </span> \
-form codebase <span color='red'> {1} </span> is missing the  Application-Library-Allowable-Codebase attribute. \
-This application uses resources from the following remote locations:<br/> {2} Are you sure you want to run this application?
-ALACAMissingInfo=For more information you can visit:<br/>\
+ALACAMissingMainTitle=The application <span color='red'> {0} </span> \
+from <span color='red'> {1} </span> uses resources from the following remote locations: \
+{2} \
+Are you sure you want to run this application?
+ALACAMissingInfo=For more information see:<br/>\
 <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library"> \
-http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library</a> <br/> \
+JAR File Manifest Attributes</a> <br/> \
 and<br/> <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> \
-http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
+Preventing the Repurposing of an Application</a>
 # matching Application-Library-Allowable-Codebase dialogue
-ALACAMatchingMainTitle=Application <span color='red'> {0} </span> \
-form codebase <span color='red'> {1} </span> is requiring valid resources from different locations:<br/>{2} <br/> \
-Those resources are expected to be loaded. Do you agree to run this application?
+ALACAMatchingMainTitle=The application <span color='red'> {0} </span> \
+from <span color='red'> {1} </span> uses resources from the following remote locations:<br/>{2} <br/> \
+Are you sure you want to run this application?
 ALACAMatchingInfo=For more information you can visit:<br/>\
 <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library"> \
-http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library</a> <br/> \
+JAR File Manifest Attributes</a> <br/> \
 and<br/> <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> \
-http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
+Preventing the Repurposing of an Application</a>
 
 # LS - Severity
 LSMinor=Minor
diff --git a/netx/net/sourceforge/jnlp/util/UrlUtils.java b/netx/net/sourceforge/jnlp/util/UrlUtils.java
--- a/netx/net/sourceforge/jnlp/util/UrlUtils.java
+++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java
@@ -195,9 +195,11 @@
      */
     public static String setOfUrlsToHtmlList(Iterable<URL> remoteUrls) {
         StringBuilder sb = new StringBuilder();
+        sb.append("<ul>");
         for (URL url : remoteUrls) {
             sb.append("<li>").append(url.toExternalForm()).append("</li>");
         }
+        sb.append("</ul>");
         return sb.toString();
     }