value only annotation

[jalview.git] / src / jalview / util / BrowserLauncher.java

diff --git a/src/jalview/util/BrowserLauncher.java b/src/jalview/util/BrowserLauncher.java
index 6bac25b..2b8a4bd 100755 (executable)
--- a/src/jalview/util/BrowserLauncher.java
+++ b/src/jalview/util/BrowserLauncher.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -508,7 +508,7 @@ public class BrowserLauncher
   }\r
 \r
   /**\r
-   * Attempts to locate the default web browser on the local system.  Caches results so it\r
+   * Attempts to locate the default web browser on the local system.    s results so it\r
    * only locates the browser once for each use of this class per JVM instance.\r
    * @return The browser for the system.  Note that this may not be what you would consider\r
    *                        to be a standard web browser; instead, it's the application that gets called to\r
@@ -645,7 +645,6 @@ public class BrowserLauncher
             }\r
             catch (IllegalArgumentException iare)\r
             {\r
-              browser = browser;\r
               errorMessage = iare.getMessage();\r
 \r
               return null;\r
@@ -689,14 +688,7 @@ public class BrowserLauncher
 \r
       case OTHER:\r
       default:\r
-        browser = jalview.bin.Cache.applicationProperties.getProperty(\r
-            "jalview.browser");\r
-\r
-        if (browser == null)\r
-        {\r
-          // hope firefox exists :-/\r
-          browser = "firefox";\r
-        }\r
+        browser = jalview.bin.Cache.getDefault("DEFAULT_BROWSER", "firefox");\r
 \r
         break;\r
     }\r
@@ -705,6 +697,15 @@ public class BrowserLauncher
   }\r
 \r
   /**\r
+   * used to ensure that browser is up-to-date after a configuration\r
+   * change (Unix DEFAULT_BROWSER property change).\r
+   */\r
+  public static void resetBrowser()\r
+  {\r
+    browser = null;\r
+  }\r
+\r
+  /**\r
    * Attempts to open the default web browser to the given URL.\r
    * @param url The URL to open\r
    * @throws IOException If the web browser could not be located or does not run\r