Plugin does not make JNLP's <information> available when using jnlp_href.

3 files changed, 8 insertions, 10 deletions

diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java b/netx/net/sourceforge/jnlp/PluginBridge.java
index ac703b3..14cb6bc 100644
--- a/netx/net/sourceforge/jnlp/PluginBridge.java
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java
@@ -60,6 +60,7 @@ public class PluginBridge extends JNLPFile {
                 URL jnlp = new URL(codeBase.toExternalForm() + atts.get("jnlp_href"));
                 JNLPFile jnlpFile = new JNLPFile(jnlp, null, false, JNLPRuntime.getDefaultUpdatePolicy(), this.codeBase);
                 Map<String, String> jnlpParams = jnlpFile.getApplet().getParameters();
+                info = jnlpFile.info;
 
                 // Change the parameter name to lowercase to follow conventions.
                 for (Map.Entry<String, String> entry : jnlpParams.entrySet()) {
@@ -76,6 +77,9 @@ public class PluginBridge extends JNLPFile {
                 System.err.println("Unable to get JNLP file at: " + codeBase.toExternalForm()
                         + atts.get("jnlp_href"));
             }
+        } else {
+            // Should we populate this list with applet attribute tags?
+            info = new ArrayList<InformationDesc>();
         }
 
         // also, see if cache_archive is specified
@@ -180,15 +184,6 @@ public class PluginBridge extends JNLPFile {
         return name;
     }
 
-    public InformationDesc getInformation(final Locale locale) {
-        return new InformationDesc(this, new Locale[] { locale }) {
-            protected List<Object> getItems(Object key) {
-                // Should we populate this list with applet attribute tags?
-                return new ArrayList<Object>();
-            }
-        };
-    }
-
     public ResourcesDesc getResources(final Locale locale, final String os,
                                       final String arch) {
         return new ResourcesDesc(this, new Locale[] { locale }, new String[] { os },
diff --git a/netx/net/sourceforge/jnlp/resources/Messages.properties b/netx/net/sourceforge/jnlp/resources/Messages.properties
index 2825bb7..a08331d 100644
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties
@@ -205,6 +205,7 @@ SClipboardWriteAccess=The application has requested write-only access to the sys
 SPrinterAccess=The application has requested printer access. Do you want to allow this action?

 SNetworkAccess=The application has requested permission to establish connections to {0}. Do you want to allow this action?

 SNoAssociatedCertificate=<no associated certificate>

+SUnverified=(unverified)
 SAlwaysTrustPublisher=Always trust content from this publisher

 SHttpsUnverified=The website's certificate cannot be verified.

 SNotAllSignedSummary=Only parts of this application code are signed.

diff --git a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java
index c873758..f822a67 100644
--- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java
+++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java
@@ -104,7 +104,9 @@ public class AccessWarningPane extends SecurityDialogPanel {
         }
 
         try {
-            publisher = file.getInformation().getVendor() != null ? file.getInformation().getVendor() : R("SNoAssociatedCertificate");
+            publisher = file.getInformation().getVendor() != null ? 
+                    file.getInformation().getVendor() + " " + R("SUnverified") : 
+                    R("SNoAssociatedCertificate");
         } catch (Exception e) {
         }