Check conensus is not null
authoramwaterhouse <Andrew Waterhouse>
Thu, 9 Nov 2006 18:11:46 +0000 (18:11 +0000)
committeramwaterhouse <Andrew Waterhouse>
Thu, 9 Nov 2006 18:11:46 +0000 (18:11 +0000)
src/jalview/schemes/ResidueColourScheme.java

index 7c36208..64fd62e 100755 (executable)
@@ -153,14 +153,16 @@ public class ResidueColourScheme implements ColourSchemeI
           s = String.valueOf(c);\r
         }\r
 \r
+        if (consensus == null || consensus[j] == null)\r
+          return false;\r
 \r
-      if ((((Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) &&\r
-                consensus[j].contains(s))\r
+        if ( ( ( (Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) &&\r
+            consensus[j].contains(s))\r
         {\r
-            if (((Float)consensus[j].get(ignoreGaps)).floatValue() >= threshold)\r
-            {\r
-                return true;\r
-            }\r
+          if ( ( (Float) consensus[j].get(ignoreGaps)).floatValue() >= threshold)\r
+          {\r
+            return true;\r
+          }\r
         }\r
 \r
         return false;\r