X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FResidueColourScheme.java;h=64fd62e1cb2c921ddaaf9de7519c94fd0ec31d01;hb=a2299be0ebb414d06b12d6735312a1bb1147694f;hp=7c3620807f767c6e4e121361fbc3e986999f89c2;hpb=daa3632d1e9d92c4b1ae656faae4c0206604c457;p=jalview.git diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java index 7c36208..64fd62e 100755 --- a/src/jalview/schemes/ResidueColourScheme.java +++ b/src/jalview/schemes/ResidueColourScheme.java @@ -153,14 +153,16 @@ public class ResidueColourScheme implements ColourSchemeI s = String.valueOf(c); } + if (consensus == null || consensus[j] == null) + return false; - if ((((Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) && - consensus[j].contains(s)) + if ( ( ( (Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) && + consensus[j].contains(s)) { - if (((Float)consensus[j].get(ignoreGaps)).floatValue() >= threshold) - { - return true; - } + if ( ( (Float) consensus[j].get(ignoreGaps)).floatValue() >= threshold) + { + return true; + } } return false;