JAL-629 launcher shell script uses jalview.bin.Launcher so --jvmmmempc and --jvmmemma...

diff --git a/help/help/html/features/clarguments.html b/help/help/html/features/clarguments.html
index 99d4611..78fb006 100644 (file)
--- a/help/help/html/features/clarguments.html
+++ b/help/help/html/features/clarguments.html
@@ -100,8 +100,6 @@
     <tr valign="top">
     <td><code>&#8209;&#8209;jvmmempc=<em>PERCENT</em></code></td>
     <td>
-      <em>Only available with standalone executable jar or jalview.bin.Launcher.</em>
-      <br/>
       Limit maximum heap size (memory) to PERCENT% of total physical memory detected.
       This defaults to 90 if total physical memory can be detected.
       <br/>
@@ -114,8 +112,6 @@
     <tr valign="top">
     <td><code>&#8209;&#8209;jvmmemmax=<em>MAXMEMORY</em></code></td>
     <td>
-      <em>Only available with standalone executable jar or jalview.bin.Launcher.</em>
-      <br/>
       Limit maximum heap size (memory) to MAXMEMORY. MAXMEMORY can be specified in bytes, kilobytes(k), megabytes(m),
       gigabytes(g) or if you're lucky enough, terabytes(t).
       This defaults to 32g if total physical memory can be detected, or to 8g if total physical memory cannot be detected.

diff --git a/src/jalview/bin/argparser/Arg.java b/src/jalview/bin/argparser/Arg.java
index 46de01b..a18057c 100644 (file)
--- a/src/jalview/bin/argparser/Arg.java
+++ b/src/jalview/bin/argparser/Arg.java
@@ -203,13 +203,11 @@ public enum Arg
   // used by jalview.bin.Launcher to set memory settings. They are not used by
   // argparser but are here for Usage statement reasons.
   JVMMEMPC(
-          "Only available with standalone executable jar or jalview.bin.Launcher.\n"
-                  + "Limit maximum heap size (memory) to PERCENT% of total physical memory detected. This defaults to 90 if total physical memory can be detected.\n"
+          "Limit maximum heap size (memory) to PERCENT% of total physical memory detected. This defaults to 90 if total physical memory can be detected.\n"
                   + "The equals sign (\"=\") separator must be used with no spaces.",
           Opt.NOACTION, Opt.BOOTSTRAP, Opt.STRING),
   JVMMEMMAX(
-          "Only available with standalone executable jar or jalview.bin.Launcher.\n"
-                  + "Limit maximum heap size (memory) to MAXMEMORY. MAXMEMORY can be specified in bytes, kilobytes(k), megabytes(m), gigabytes(g) or if you're lucky enough, terabytes(t). This defaults to 32g if total physical memory can be detected, or to 8g if total physical memory cannot be detected.\n"
+          "Limit maximum heap size (memory) to MAXMEMORY. MAXMEMORY can be specified in bytes, kilobytes(k), megabytes(m), gigabytes(g) or if you're lucky enough, terabytes(t). This defaults to 32g if total physical memory can be detected, or to 8g if total physical memory cannot be detected.\n"
                   + "The equals sign (\"=\") separator must be used with no spaces.",
           Opt.NOACTION, Opt.BOOTSTRAP, Opt.STRING),
 

diff --git a/utils/eclipse/jalview b/utils/eclipse/jalview
index 14033a6..ccb1d75 100755 (executable)
--- a/utils/eclipse/jalview
+++ b/utils/eclipse/jalview
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-java -cp "./bin/main:./j11lib/*:./resources:./help" jalview.bin.Jalview "${@}"
+java -cp "./bin/main:./j11lib/*:./resources:./help" jalview.bin.Launcher "${@}"