X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FBrowserLauncher.java;h=d912173e6334482b38e8515b31bc1599c723fae7;hb=3cc7159787bd31859f7bc27916e7ff854b895280;hp=6bac25b308c9dcb1e97b2d9058e1c042c32c73f3;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git diff --git a/src/jalview/util/BrowserLauncher.java b/src/jalview/util/BrowserLauncher.java index 6bac25b..d912173 100755 --- a/src/jalview/util/BrowserLauncher.java +++ b/src/jalview/util/BrowserLauncher.java @@ -508,7 +508,7 @@ public class BrowserLauncher } /** - * Attempts to locate the default web browser on the local system. Caches results so it + * Attempts to locate the default web browser on the local system. s results so it * only locates the browser once for each use of this class per JVM instance. * @return The browser for the system. Note that this may not be what you would consider * to be a standard web browser; instead, it's the application that gets called to @@ -645,7 +645,6 @@ public class BrowserLauncher } catch (IllegalArgumentException iare) { - browser = browser; errorMessage = iare.getMessage(); return null; @@ -689,21 +688,20 @@ public class BrowserLauncher case OTHER: default: - browser = jalview.bin.Cache.applicationProperties.getProperty( - "jalview.browser"); - - if (browser == null) - { - // hope firefox exists :-/ - browser = "firefox"; - } + browser = jalview.bin.Cache.getDefault("DEFAULT_BROWSER", "firefox"); break; } return browser; } - + /** + * used to ensure that browser is up-to-date after a configuration + * change (Unix DEFAULT_BROWSER property change). + */ + public static void resetBrowser() { + browser = null; + } /** * Attempts to open the default web browser to the given URL. * @param url The URL to open