X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=458e5873fcf41473bf2af6177ac23c76c7e5987d;hb=892a62261b740199fbc664c012107ae4392b7521;hp=d5eefe2f908400f9a480ea922ce90f5bf3d06f68;hpb=ec45a7f3c872496cc282806938e2b9d6e023f935;p=jalview.git

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index d5eefe2..458e587 100755
--- 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;
@@ -481,7 +483,11 @@ public class Jalview
           desktop.checkForNews();
         }
 
-        BioJsHTMLOutput.updateBioJS();
+        if (!aparser.contains("nohtmltemplates")
+                || Cache.getProperty("NOHTMLTEMPLATES") == null)
+        {
+          BioJsHTMLOutput.updateBioJS();
+        }
       }
     }
 
@@ -504,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;
@@ -1117,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.");
               }