Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / src / jalview / util / ColorUtils.java

diff --git a/src/jalview/util/ColorUtils.java b/src/jalview/util/ColorUtils.java
index c1feeee..008c8b0 100644 (file)
--- a/src/jalview/util/ColorUtils.java
+++ b/src/jalview/util/ColorUtils.java
@@ -24,6 +24,8 @@
 
 package jalview.util;
 
+import java.util.Locale;
+
 import java.awt.Color;
 import java.util.HashMap;
 import java.util.Map;
@@ -32,6 +34,7 @@ import java.util.Random;
 public class ColorUtils
 {
   private static final int MAX_CACHE_SIZE = 1729;
+
   /*
    * a cache for colours generated from text strings
    */
@@ -219,7 +222,7 @@ public class ColorUtils
     colour = colour.trim();
 
     Color col = null;
-    if (colour.length() == 6 && StringUtils.isHexString(colour))
+    if (StringUtils.isHexString(colour))
     {
       try
       {
@@ -255,10 +258,6 @@ public class ColorUtils
 
     return col;
   }
-  
-  public static boolean couldBeHexColor(String n) {
-    return (n.length() > 0 && "abcdefABCDEF".indexOf(n.charAt(0)) >= 0);
-  }
 
   /**
    * Constructs a colour from a text string. The hashcode of the whole string is
@@ -331,7 +330,7 @@ public class ColorUtils
       return null;
     }
     Color col = null;
-    name = name.toLowerCase();
+    name = name.toLowerCase(Locale.ROOT);
 
     // or make a static map; or use reflection on the field name
     switch (name)