aaIndex replaces aaHash

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

diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java
index ef6fbb7..ec5d4f1 100755 (executable)
--- a/src/jalview/schemes/Blosum62ColourScheme.java
+++ b/src/jalview/schemes/Blosum62ColourScheme.java
@@ -20,6 +20,7 @@ package jalview.schemes;
 \r
 \r
 import java.awt.*;\r
+import jalview.analysis.AAFrequency;\r
 \r
 public class Blosum62ColourScheme\r
     extends ResidueColourScheme\r
@@ -38,15 +39,17 @@ public class Blosum62ColourScheme
        s = String.valueOf( res -= ('a' - 'A') );\r
     }\r
 \r
-\r
-    if ( j>=consensus.length || (threshold != 0 && !aboveThreshold(s, j) ))\r
+    if (consensus == null ||\r
+        j >= consensus.length ||\r
+        consensus[j] == null ||\r
+        (threshold != 0 && !aboveThreshold(s, j)))\r
     {\r
       return Color.white;\r
     }\r
 \r
     if (!jalview.util.Comparison.isGap( res ))\r
     {\r
-      String max = (String) consensus[j].get("maxResidue");\r
+      String max = (String) consensus[j].get(AAFrequency.MAXRESIDUE);\r
 \r
       if (max.indexOf(s) > -1)\r
       {\r