X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FColorUtils.java;h=24128eae2b884c5395c28f69ba11915a90e0db96;hb=8b5ae15a094b5a90238bfe39ce10310ed92184d1;hp=b728c9de4031d06760b970bdd764f6cad062a103;hpb=fa48c836ad6e85a9e8146177cc865f4a061dc1a4;p=jalview.git

diff --git a/src/jalview/util/ColorUtils.java b/src/jalview/util/ColorUtils.java
index b728c9d..24128ea 100644
--- a/src/jalview/util/ColorUtils.java
+++ b/src/jalview/util/ColorUtils.java
@@ -24,10 +24,9 @@
 
 package jalview.util;
 
-import java.util.Locale;
-
 import java.awt.Color;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 
@@ -68,7 +67,7 @@ public class ColorUtils
     return color;
 
   }
-  
+
   /**
    * 
    * @return random color
@@ -80,6 +79,7 @@ public class ColorUtils
             (int) (Math.random() * 255), (int) (Math.random() * 255));
     return col;
   }
+
   /**
    * Convert to Tk colour code format
    * 
@@ -233,6 +233,12 @@ public class ColorUtils
     colour = colour.trim();
 
     Color col = null;
+
+    if ("random".equals(colour))
+    {
+      return generateRandomColor(null);
+    }
+
     try
     {
       int value = Integer.parseInt(colour, 16);
@@ -258,7 +264,8 @@ public class ColorUtils
           int b = Integer.parseInt(tokens[2].trim());
           col = new Color(r, g, b);
         }
-      } catch (Exception ex)
+      } catch (IllegalArgumentException ex) // IllegalArgumentException includes
+                                            // NumberFormatException
       {
         // non-numeric token or out of 0-255 range
       }