JAL-4353 Preserve the user given 'linkedId' with ArgValue, to help with deciding...

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

diff --git a/src/jalview/util/ColorUtils.java b/src/jalview/util/ColorUtils.java
index 16ff259..0e44f34 100644 (file)
--- a/src/jalview/util/ColorUtils.java
+++ b/src/jalview/util/ColorUtils.java
@@ -26,15 +26,14 @@ package jalview.util;
 
 import java.awt.Color;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 
 public class ColorUtils
 {
-  // constant borrowed from java.awt.Color
-  private static final float FACTOR = 0.7f;
-
   private static final int MAX_CACHE_SIZE = 1729;
+
   /*
    * a cache for colours generated from text strings
    */
@@ -70,6 +69,18 @@ public class ColorUtils
   }
 
   /**
+   * 
+   * @return random color
+   */
+  public static final Color getARandomColor()
+  {
+
+    Color col = new Color((int) (Math.random() * 255),
+            (int) (Math.random() * 255), (int) (Math.random() * 255));
+    return col;
+  }
+
+  /**
    * Convert to Tk colour code format
    * 
    * @param colour
@@ -222,6 +233,15 @@ public class ColorUtils
     colour = colour.trim();
 
     Color col = null;
+
+    if ("random".equals(colour))
+    {
+      Random rand = new Random();
+      col = new Color(rand.nextInt(256), rand.nextInt(256),
+              rand.nextInt(256));
+      return col;
+    }
+
     try
     {
       int value = Integer.parseInt(colour, 16);
@@ -247,7 +267,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
       }
@@ -327,7 +348,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)
@@ -375,63 +396,4 @@ public class ColorUtils
 
     return col;
   }
-
-  /**
-   * Generates a colour that is interpolated between
-   * <code>colour.darker()</code> and <code>colour.brighter()</code> in
-   * proportion as <code>value</code> is between <code>min</code> and
-   * <code>max</code>. Note that the 'neutral point' (unchanged colour) is
-   * closer to 'brighter' than to 'darker'as this is a geometric range.
-   * 
-   * @param value
-   * @param min
-   * @param max
-   * @param colour
-   * @return
-   */
-  public static Color getGraduatedColour(float value, float min, float max,
-          Color colour)
-  {
-    /*
-     * this computes the equivalent of
-     * getGraduatedColour(value, min, colour.darker(), max, colour.brighter())
-     * but avoiding object creation except for the return value
-     */
-    if (value < min)
-    {
-      value = min;
-    }
-    if (value > max)
-    {
-      value = max;
-    }
-
-    int r = colour.getRed();
-    int g = colour.getGreen();
-    int b = colour.getBlue();
-
-    /*
-     * rgb for colour.darker():
-     */
-    float minR = r * FACTOR;
-    float minG = g * FACTOR;
-    float minB = b * FACTOR;
-
-    /*
-     * rgb for colour.brighter():
-     */
-    float maxR = Math.min(255f, r / FACTOR);
-    float maxG = Math.min(255f, g / FACTOR);
-    float maxB = Math.min(255f, b / FACTOR);
-
-    /*
-     * interpolation
-     */
-    float p = (value - min) / (max - min);
-    int newR = (int) (minR + p * (maxR - minR));
-    int newG = (int) (minG + p * (maxG - minG));
-    int newB = (int) (minB + p * (maxB - minB));
-
-    return new Color(newR, newG, newB, colour.getAlpha());
-  }
 }