JAL-629 Add --nowebdiscovery. Distinguish arg=="open" as old style. Increase timeout...

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

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 44494e2..e384a0b 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -283,12 +283,14 @@ public class Jalview
    */
   void doMain(String[] args)
   {
-
     if (!Platform.isJS())
     {
       System.setSecurityManager(null);
     }
 
+    if (args == null)
+      args = new String[] {};
+
     // Move any new getdown-launcher-new.jar into place over old
     // getdown-launcher.jar
     String appdirString = System.getProperty("getdownappdir");
@@ -567,7 +569,8 @@ public class Jalview
     if (!(headless || headlessArg))
     {
       Desktop.nosplash = "false".equals(bootstrapArgs.get(Arg.SPLASH))
-              || aparser.contains("nosplash");
+              || aparser.contains("nosplash")
+              || Cache.getDefault("SPLASH", "true").equals("false");
       desktop = new Desktop();
       desktop.setInBatchMode(true); // indicate we are starting up
 
@@ -627,7 +630,12 @@ public class Jalview
           }
         }
 
-        if (!aparser.contains("nowebservicediscovery"))
+        boolean doWebServiceDiscovery = !aparser
+                .contains("nowebservicediscovery");
+        if (bootstrapArgs.contains(Arg.WEBSERVICEDISCOVERY))
+          doWebServiceDiscovery = bootstrapArgs
+                  .getBoolean(Arg.WEBSERVICEDISCOVERY);
+        if (doWebServiceDiscovery)
         {
           desktop.startServiceDiscovery();
         }