Merge branch 'improvement/JAL-4409_implement_extra_schemes_in_getdown' into develop

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

diff --git a/src/jalview/bin/MemorySetting.java b/src/jalview/bin/MemorySetting.java
index 738d1e7..dbef0d9 100644 (file)
--- a/src/jalview/bin/MemorySetting.java
+++ b/src/jalview/bin/MemorySetting.java
@@ -24,7 +24,7 @@ package jalview.bin;
 
 import java.util.Locale;
 
-import jalview.bin.argparser.Arg;
+import jalview.util.ErrorLog;
 
 /**
  * Methods to decide on appropriate memory setting for Jalview based on two
@@ -39,11 +39,11 @@ import jalview.bin.argparser.Arg;
  */
 public class MemorySetting
 {
-  public static final String MAX_HEAPSIZE_PERCENT_PROPERTY_NAME = Arg.JVMMEMPC
-          .getName();
+  // This must match the value of Arg.JVMMEMPC.getName()
+  public static final String MAX_HEAPSIZE_PERCENT_PROPERTY_NAME = "jvmmempc";
 
-  public static final String MAX_HEAPSIZE_PROPERTY_NAME = Arg.JVMMEMMAX
-          .getName();
+  // This must match the value of Arg.JVMMEMMAX.getName()
+  public static final String MAX_HEAPSIZE_PROPERTY_NAME = "jvmmemmax";
 
   private static final int MAX_HEAPSIZE_PERCENT_DEFAULT = 90; // 90%
 
@@ -358,7 +358,7 @@ public class MemorySetting
     else
     {
       // number too big for a Long. Limit to Long.MAX_VALUE
-      jalview.bin.Console.outPrintln("Memory parsing of '" + memString
+      ErrorLog.outPrintln("Memory parsing of '" + memString
               + "' produces number too big.  Limiting to Long.MAX_VALUE="
               + Long.MAX_VALUE);
       return Long.MAX_VALUE;
@@ -399,7 +399,7 @@ public class MemorySetting
     ADJUSTMENT_MESSAGE = reason;
     if (!quiet)
     {
-      jalview.bin.Console.outPrintln(reason);
+      ErrorLog.outPrintln(reason);
     }
   }