Merge branch 'improvement/JAL-4250_secondary_structure_annotation_antialias' into...

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

diff --git a/src/jalview/bin/MemorySetting.java b/src/jalview/bin/MemorySetting.java
index 56713b0..7458d55 100644 (file)
--- a/src/jalview/bin/MemorySetting.java
+++ b/src/jalview/bin/MemorySetting.java
@@ -22,6 +22,8 @@
  */
 package jalview.bin;
 
+import java.util.Locale;
+
 /**
  * Methods to decide on appropriate memory setting for Jalview based on two
  * optionally provided values: jvmmempc - the maximum percentage of total
@@ -57,10 +59,10 @@ public class MemorySetting
           + "_CUSTOMISED_SETTINGS";
 
   public static final String MEMORY_JVMMEMPC = NS + "_"
-          + MAX_HEAPSIZE_PERCENT_PROPERTY_NAME.toUpperCase();
+          + MAX_HEAPSIZE_PERCENT_PROPERTY_NAME.toUpperCase(Locale.ROOT);
 
   public static final String MEMORY_JVMMEMMAX = NS + "_"
-          + MAX_HEAPSIZE_PROPERTY_NAME.toUpperCase();
+          + MAX_HEAPSIZE_PROPERTY_NAME.toUpperCase(Locale.ROOT);
 
   protected static boolean logToClassChecked = false;
 
@@ -352,7 +354,7 @@ public class MemorySetting
     else
     {
       // number too big for a Long. Limit to Long.MAX_VALUE
-      System.out.println("Memory parsing of '" + memString
+      jalview.bin.Console.outPrintln("Memory parsing of '" + memString
               + "' produces number too big.  Limiting to Long.MAX_VALUE="
               + Long.MAX_VALUE);
       return Long.MAX_VALUE;
@@ -393,7 +395,7 @@ public class MemorySetting
     ADJUSTMENT_MESSAGE = reason;
     if (!quiet)
     {
-      System.out.println(reason);
+      jalview.bin.Console.outPrintln(reason);
     }
   }