Merge branch 'bug/JAL-4353_cannot_output_multiple_different_structure_images_for_one_...

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

diff --git a/src/jalview/util/ColorUtils.java b/src/jalview/util/ColorUtils.java
index 9ed98bd..24128ea 100644 (file)
--- 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;
 
@@ -234,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);
@@ -259,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
       }