X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FTCoffeeColourScheme.java;h=2be51c2b94a6f38e77960b912a3c247e1d047a68;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=48c52f1c2c6a664d6727cd10a574c1f3e29cdf20;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/schemes/TCoffeeColourScheme.java b/src/jalview/schemes/TCoffeeColourScheme.java index 48c52f1..2be51c2 100644 --- a/src/jalview/schemes/TCoffeeColourScheme.java +++ b/src/jalview/schemes/TCoffeeColourScheme.java @@ -20,7 +20,6 @@ */ package jalview.schemes; -import jalview.analysis.SequenceIdMatcher; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.AnnotatedCollectionI; @@ -33,7 +32,6 @@ import java.awt.Color; import java.util.ArrayList; import java.util.IdentityHashMap; import java.util.Map; -import java.util.TreeMap; /** * Defines the color score for T-Coffee MSA @@ -47,8 +45,7 @@ import java.util.TreeMap; public class TCoffeeColourScheme extends ResidueColourScheme { - static final Color[] colors = - { new Color(102, 102, 255), // #6666FF + static final Color[] colors = { new Color(102, 102, 255), // #6666FF new Color(0, 255, 0), // #00FF00 new Color(102, 255, 0), // #66FF00 new Color(204, 255, 0), // #CCFF00 @@ -89,6 +86,10 @@ public class TCoffeeColourScheme extends ResidueColourScheme seqMap = new IdentityHashMap(); AnnotatedCollectionI alcontext = alignment instanceof AlignmentI ? alignment : alignment.getContext(); + if (alcontext == null) + { + return; + } int w = 0; for (AlignmentAnnotation al : alcontext .findAnnotation(TCoffeeScoreFile.TCOFFEE_SCORE))