just tidying up unused imports

[jalview.git] / src / jalview / schemes / ColourSchemeProperty.java

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 169f35e..6831ec2 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -15,6 +15,34 @@ public class ColourSchemeProperty
   public static final int USER_DEFINED = 10;
   public static final int NONE = 11;
 
+  public static int getColourIndexFromName(String name)
+  {
+    int ret=11;
+    if(name.equals("Clustal"))
+      ret = CLUSTAL;
+    else if(name.equals("Blosum62"))
+      ret = BLOSUM;
+    else if(name.equals("% Identity"))
+      ret = PID;
+    else if(name.equals("Zappo"))
+      ret = ZAPPO;
+    else if(name.equals("Hydrophobic"))
+      ret = HYDROPHOBIC;
+    else if(name.equals("Helix Propensity"))
+      ret = HELIX;
+    else if(name.equals("Strand Propensity"))
+      ret = STRAND;
+    else if(name.equals("Turn Propensity"))
+      ret = TURN;
+    else if(name.equals("Buried Index"))
+      ret = BURIED;
+    else if(name.equals("Nucleotide"))
+      ret = NUCLEOTIDE;
+    else if(name.equals("User Defined"))
+      ret =  USER_DEFINED;
+
+    return ret;
+  }
 
   public static String getColourName(int index)
   {
@@ -39,12 +67,7 @@ public class ColourSchemeProperty
 
   public static ColourSchemeI getColour(jalview.datamodel.AlignmentI al, String name)
   {
-    for(int i=0; i<12; i++)
-    {
-      if(getColourName(i).equals(name))
-        return getColour(al, i);
-    }
-    return null;
+    return getColour(al, getColourIndexFromName(name));
   }
 
   public static ColourSchemeI getColour(jalview.datamodel.AlignmentI al, int index)