X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=ea61024e720d057d5979802b7c4be45fdc453a65;hb=4a3def9f59cefe629c9a33d87483283aee085928;hp=458e5873fcf41473bf2af6177ac23c76c7e5987d;hpb=892a62261b740199fbc664c012107ae4392b7521;p=jalview.git diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index 458e587..ea61024 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -49,7 +49,7 @@ import javax.swing.UIManager.LookAndFeelInfo; import com.threerings.getdown.util.LaunchUtil; -import edu.stanford.ejalbert.launching.IBrowserLaunching; +//import edu.stanford.ejalbert.launching.IBrowserLaunching; import groovy.lang.Binding; import groovy.util.GroovyScriptEngine; import jalview.ext.so.SequenceOntology; @@ -70,13 +70,15 @@ 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; import jalview.util.Platform; import jalview.ws.jws2.Jws2Discoverer; +import groovy.lang.Binding; +import groovy.util.GroovyScriptEngine; + /** * Main class for Jalview Application
*
@@ -189,7 +191,7 @@ public class Jalview running--; } } - }).start(); + }, "FeatureFetcher").start(); } public synchronized boolean allFinished() @@ -510,15 +512,6 @@ 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;