[RFC] icedtea-web (netx): Allow applet to read jnlp file for parameters

[Deepak Bhole]

* Andrew Su <asu at redhat.com> [2010-10-20 09:51]:
> And here is the patch :)
> 
> 
> ----- "Andrew Su" <asu at redhat.com> wrote:
> 
> > From: "Andrew Su" <asu at redhat.com>
> > To: "distro-pkg-dev" <distro-pkg-dev at openjdk.java.net>
> > Sent: Wednesday, October 20, 2010 9:49:51 AM GMT -05:00 US/Canada Eastern
> > Subject: [RFC] icedtea-web (netx): Allow applet to read jnlp file for parameters
> >
> > Hi,
> > 
> > This patch lets the applet read parameters stored in a jnlp file
> > pointed to by the parameter "jnlp_href". Currently, when the applet
> > loads given the parameter jnlp_href will not read the file, jnlp_file
> > will be like any normal parameter passed in to an applet. 
> > 
> > I originally planned on placing it inside parse of PluginAppletViewer,
> > but later decided that jnlp stuff should go back into netx. Thanks to
> > Omair's patch which gave me the idea to place it inside PluginBridge
> > (in netx). 
> > 
> > Comments? Questions? Concerns?
> > 

Just a couple of minor things..

> > Cheers,
> > --Andrew

> diff -r 01c094e27afd netx/net/sourceforge/jnlp/PluginBridge.java
> --- a/netx/net/sourceforge/jnlp/PluginBridge.java	Wed Oct 13 01:31:53 2010 +0100
> +++ b/netx/net/sourceforge/jnlp/PluginBridge.java	Wed Oct 20 09:20:26 2010 -0400
> @@ -26,9 +26,11 @@
>  import java.net.MalformedURLException;
>  import java.util.Calendar;
>  import java.util.Hashtable;
> +import java.util.Iterator;
>  import java.util.Locale;
>  import java.util.List;
>  import java.util.ArrayList;
> +import java.util.Map;
>  
>  import net.sourceforge.jnlp.runtime.JNLPRuntime;
>  
> @@ -50,6 +52,29 @@
>          fileVersion = new Version("1.1");
>          this.codeBase = codebase;
>          this.sourceLocation = documentBase;
> +        
> +        if (atts.containsKey("jnlp_href")){
> +            try {
> +                URL jnlp = new URL(codeBase.toExternalForm() + (String) atts.get("jnlp_href"));
> +                JNLPFile jnlp_file = new JNLPFile(jnlp);
> +                Map jnlp_params = jnlp_file.getApplet().getParameters();
> +                
> +                // Change the parameter name to lowercase to follow conventions.
> +                Iterator it = jnlp_params.keySet().iterator();
> +                while(it.hasNext()){
> +                    String key = (String) it.next();
> +                    atts.put(key.toLowerCase(), jnlp_params.get(key));
> +                }
> +            } catch (MalformedURLException e) {
> +                // Don't fail because we cannot get the jnlp file. Parameters are optional not required.
> +                // it is the site developer who should ensure that file exist.
> +                System.out.println("Unable to get JNLP file at: " + codeBase.toExternalForm() 
> +                        + (String) atts.get("jnlp_href"));

Should be printed to err not out since it is an error message

> +            } catch (Exception e) {
> +                // Something went horribly wrong. (Or malformed file)
> +                throw new RuntimeException("Unable to read JNLP file");
> +            }
> +        }
>  

The second catch block is not needed. Infact throwing a RuntimeException
there will swallow the original cause and stack. Just the first catch
for MalformedURLException is enough.

After the above changes ok for commit to icedtea-web head.

Cheers,
Deepak

>          // also, see if cache_archive is specified
>          if (atts.get("cache_archive") != null && ((String) atts.get("cache_archive")).length() > 0) {