X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FPIDColourScheme.java;h=8061e67c3bc0282028234031ab76fa7c97e307b3;hb=b0a90dcb797054f5e01a3b10969e782ef3aafa4a;hp=a79f0833da6dc4ffcc7d25e1b9b315cf6a10bc56;hpb=174230b4233d9ce80f94527768d2cd2f76da11ab;p=jalview.git diff --git a/src/jalview/schemes/PIDColourScheme.java b/src/jalview/schemes/PIDColourScheme.java index a79f083..8061e67 100755 --- a/src/jalview/schemes/PIDColourScheme.java +++ b/src/jalview/schemes/PIDColourScheme.java @@ -21,6 +21,7 @@ package jalview.schemes; import java.awt.*; import jalview.datamodel.*; +import jalview.analysis.AAFrequency; public class PIDColourScheme extends ResidueColourScheme @@ -43,6 +44,12 @@ public class PIDColourScheme s = String.valueOf(res -= ('a' - 'A')); } + if (consensus == null + || j >= consensus.length + || consensus[j]==null) + { + return Color.white; + } if ( (threshold != 0) && !aboveThreshold(s, j)) { @@ -56,7 +63,7 @@ public class PIDColourScheme if(consensus.length<=j) return Color.white; - if ( (Integer.parseInt(consensus[j].get("maxCount").toString()) != -1) && + if ( (Integer.parseInt(consensus[j].get(AAFrequency.MAXCOUNT).toString()) != -1) && consensus[j].contains(s)) { sc = ( (Float) consensus[j].get(ignoreGaps)).floatValue();