aaIndex replaces aaHash

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

diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java
index bd70c5d..007d358 100755 (executable)
--- a/src/jalview/schemes/UserColourScheme.java
+++ b/src/jalview/schemes/UserColourScheme.java
@@ -147,12 +147,10 @@ public class UserColourScheme
         {\r
           token = st2.nextToken();\r
 \r
-          if (ResidueProperties.aaHash.get(token) == null)\r
+          if (ResidueProperties.aaIndex[token.charAt(0)]==-1)\r
             continue;\r
 \r
-          int colIndex =\r
-              ( (Integer) ResidueProperties.aaHash.\r
-               get(token)).intValue();\r
+          int colIndex = ResidueProperties.aaIndex[token.charAt(0)];\r
 \r
            //AW - LOWER CASE DISABLED IN 2.1.01 bug fix release\r
 \r
@@ -192,7 +190,7 @@ public class UserColourScheme
 \r
   public Color findColour(String s, int j)\r
   {\r
-      int index = ((Integer) (ResidueProperties.aaHash.get(s))).intValue();\r
+      int index = ResidueProperties.aaIndex[s.charAt(0)];\r
 \r
       if ((threshold == 0) || aboveThreshold(ResidueProperties.aa[index], j))\r
       {\r