[icedtea-web] RFC: use browser path from configuration

[Deepak Bhole]

* Omair Majid <omajid at redhat.com> [2010-11-05 12:12]:
> Hi,
> 
> The attached patch integrates the browser path selection and usage
> into the netx DeploymentConfiguration.
> 
> ChangeLog:
> 2010-11-05  Omair Majid  <omajid at redhat.com>
> 
>     * netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java:
>     Add KEY_BROWSER_PATH.
>     (loadDefaultProperties): Use KEY_BROWSER_PATH.
>     * netx/net/sourceforge/jnlp/services/XBasicService.java
>     (initialize): Use the browser command from the configuration.
>     Save updates to configuration as well.
> 
> Any thoughts or comments?
> 

Looks fine to me. Ok for HEAD.

Deepak

> Thanks,
> Omair

> diff -r 8e66d9386273 netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java
> --- a/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java	Thu Nov 04 16:44:27 2010 -0700
> +++ b/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java	Fri Nov 05 08:39:44 2010 -0400
> @@ -142,6 +142,8 @@
>       */
>      public static final String KEY_USER_NETX_RUNNING_FILE = "deployment.user.runningfile";
>  
> +    public static final String KEY_BROWSER_PATH = "deployment.browser.path";
> +
>      public enum ConfigType {
>          System, User
>      }
> @@ -369,7 +371,7 @@
>              /* jre management */
>              { "deployment.javaws.autodownload", null },
>              /* browser selection */
> -            { "deployment.browser.path", null },
> +            { KEY_BROWSER_PATH, null },
>              /* check for update timeout */
>              { "deployment.javaws.update.timeout", String.valueOf(500) }
>          };
> diff -r 8e66d9386273 netx/net/sourceforge/jnlp/services/XBasicService.java
> --- a/netx/net/sourceforge/jnlp/services/XBasicService.java	Thu Nov 04 16:44:27 2010 -0700
> +++ b/netx/net/sourceforge/jnlp/services/XBasicService.java	Fri Nov 05 08:39:44 2010 -0400
> @@ -30,6 +30,7 @@
>  import net.sourceforge.jnlp.JNLPFile;
>  import net.sourceforge.jnlp.Launcher;
>  import net.sourceforge.jnlp.runtime.ApplicationInstance;
> +import net.sourceforge.jnlp.runtime.DeploymentConfiguration;
>  import net.sourceforge.jnlp.runtime.JNLPRuntime;
>  import net.sourceforge.jnlp.util.PropertiesFile;
>  
> @@ -199,15 +200,19 @@
>              command = "rundll32 url.dll,FileProtocolHandler ";
>          }
>          else {
> -            PropertiesFile props = JNLPRuntime.getProperties();
> -            command = props.getProperty("browser.command");
> +            DeploymentConfiguration config = JNLPRuntime.getConfiguration();
> +            command = config.getProperty(DeploymentConfiguration.KEY_BROWSER_PATH);
>  
>              if(command == null) { // prompt & store
>                  command = promptForCommand(null);
>  
>                  if(command != null) {
> -                    props.setProperty("browser.command", command);
> -                    props.store();
> +                    config.setProperty(DeploymentConfiguration.KEY_BROWSER_PATH, command);
> +                    try {
> +                        config.save();
> +                    } catch (IOException e) {
> +                        e.printStackTrace();
> +                    }
>                  }
>              }
>          }