X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemeProperty.java;h=6831ec20b1c7e14af2861761a78565f6b229c8ca;hb=85867b5d46751cfce6500002e098a431fec0950e;hp=169f35ef114640c7acea32dbb2e6e84b1895d453;hpb=55cbe1bc97dab5eb37c8b6261d966708a142bdce;p=jalview.git

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 169f35e..6831ec2 100755
--- 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)