From: Ben Soares <b.soares@dundee.ac.uk>
Date: Tue, 8 Dec 2020 20:42:31 +0000 (+0000)
Subject: Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609... 
X-Git-Tag: Develop-2_11_2_0-d20201215~12^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=132fa48b35a4821ca0d8e241ba27989e573e61e5;p=jalview.git

Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609+JAL-3541+Release_2_11_1_Branch' into merge/JAL-3594_and_new_develop_issues
---

132fa48b35a4821ca0d8e241ba27989e573e61e5
diff --cc src/jalview/bin/Jalview.java
index c854a74,642efdb..4c21624
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@@ -68,7 -68,7 +68,8 @@@ import jalview.io.NewickFile
  import jalview.io.gff.SequenceOntologyFactory;
  import jalview.schemes.ColourSchemeI;
  import jalview.schemes.ColourSchemeProperty;
 +import jalview.util.ChannelProperties;
+ import jalview.util.HttpUtils;
  import jalview.util.MessageManager;
  import jalview.util.Platform;
  import jalview.ws.jws2.Jws2Discoverer;
diff --cc src/jalview/bin/Launcher.java
index 77df4c2,fecacbe..b8d31c2
--- a/src/jalview/bin/Launcher.java
+++ b/src/jalview/bin/Launcher.java
@@@ -168,15 -166,12 +170,16 @@@ public class Launche
  
      final ProcessBuilder builder = new ProcessBuilder(command);
  
 -    // System.out.println("COMMAND: " + String.join(" ", builder.command()));
 +    if (Boolean.parseBoolean(System.getProperty("launcherprint", "false")))
 +    {
 +      System.out.println(
 +              "LAUNCHER COMMAND: " + String.join(" ", builder.command()));
 +    }
      System.out.println("Running " + startClass + " with "
-             + (memSetting == null ? "no memory setting" : memSetting));
+             + (memSetting == null ? "no memory setting"
+                     : ("memory setting " + memSetting)));
  
 -    if (Boolean.parseBoolean(System.getProperty("launcherstop")))
 +    if (Boolean.parseBoolean(System.getProperty("launcherstop", "false")))
      {
        System.exit(0);
      }