Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609...
authorBen Soares <b.soares@dundee.ac.uk>
Tue, 8 Dec 2020 20:42:31 +0000 (20:42 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Tue, 8 Dec 2020 20:42:31 +0000 (20:42 +0000)
1  2 
build.gradle
src/jalview/bin/Jalview.java
src/jalview/bin/Launcher.java
src/jalview/gui/Desktop.java

diff --cc build.gradle
Simple merge
@@@ -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;
@@@ -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);
      }
Simple merge