JAL-3103 Switched to (a wrapper around) BrowserLauncher2

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 357f0e4..458e587 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -49,6 +49,7 @@ import javax.swing.UIManager.LookAndFeelInfo;
 
 import com.threerings.getdown.util.LaunchUtil;
 
+import edu.stanford.ejalbert.launching.IBrowserLaunching;
 import groovy.lang.Binding;
 import groovy.util.GroovyScriptEngine;
 import jalview.ext.so.SequenceOntology;
@@ -69,6 +70,7 @@ import jalview.io.NewickFile;
 import jalview.io.gff.SequenceOntologyFactory;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.ColourSchemeProperty;
+import jalview.util.BrowserLauncher;
 import jalview.util.ChannelProperties;
 import jalview.util.HttpUtils;
 import jalview.util.MessageManager;
@@ -482,7 +484,7 @@ public class Jalview
         }
 
         if (!aparser.contains("nohtmltemplates")
-              || Cache.getProperty("NOHTMLTEMPLATES") == null)
+                || Cache.getProperty("NOHTMLTEMPLATES") == null)
         {
           BioJsHTMLOutput.updateBioJS();
         }
@@ -508,6 +510,15 @@ public class Jalview
       }.start();
     }
 
+    // set default browser
+    String defaultBrowser = Cache.getProperty("DEFAULT_BROWSER");
+    if (defaultBrowser != null)
+    {
+      System.setProperty(IBrowserLaunching.BROWSER_SYSTEM_PROPERTY,
+              defaultBrowser);
+      BrowserLauncher.resetBrowser();
+    } // don't clearProperty if DEFAULT_BROWSER is null, might be set by user
+
     String file = null, data = null;
     FileFormatI format = null;
     DataSourceType protocol = null;
@@ -1121,7 +1132,8 @@ public class Jalview
               @Override
               public void run()
               {
-                Console.debug("Initialising googletracker for usage stats.");
+                Console.debug(
+                        "Initialising googletracker for usage stats.");
                 Cache.initGoogleTracker();
                 Console.debug("Tracking enabled.");
               }