From 1f3bdce4f5d05c89f7f7a8ee53f0bbbc0098c963 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Wed, 10 Nov 2010 16:20:51 -0500
Subject: use browser path from configuration

2010-11-05  Omair Majid  <omajid@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.
---
 .../sourceforge/jnlp/runtime/DeploymentConfiguration.java   |  4 +++-
 netx/net/sourceforge/jnlp/services/XBasicService.java       | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'netx/net/sourceforge')

diff --git a/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java b/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java
index ac171ef..b91ae8f 100644
--- a/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java
+++ b/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java
@@ -156,6 +156,8 @@ public final class DeploymentConfiguration {
 
     public static final String KEY_CREATE_DESKTOP_SHORTCUT = "deployment.javaws.shortcut";
 
+    public static final String KEY_BROWSER_PATH = "deployment.browser.path";
+
     public enum ConfigType {
         System, User
     }
@@ -383,7 +385,7 @@ public final class DeploymentConfiguration {
             /* 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 --git a/netx/net/sourceforge/jnlp/services/XBasicService.java b/netx/net/sourceforge/jnlp/services/XBasicService.java
index a7ef906..a46a309 100644
--- a/netx/net/sourceforge/jnlp/services/XBasicService.java
+++ b/netx/net/sourceforge/jnlp/services/XBasicService.java
@@ -30,6 +30,7 @@ import net.sourceforge.jnlp.JARDesc;
 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 @@ class XBasicService implements BasicService {
             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();
+                    }
                 }
             }
         }
-- 
cgit v1.2.3