X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FTCoffeeColourScheme.java;h=bc56281cd2d62604f7d5956286589a58b08331e8;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=38d1200f9e68304b5fe12b0bcedc035da2de1696;hpb=50eb1f492f5c64b56594ee49be8183fab8a2f73b;p=jalview.git
diff --git a/src/jalview/schemes/TCoffeeColourScheme.java b/src/jalview/schemes/TCoffeeColourScheme.java
index 38d1200..bc56281 100644
--- a/src/jalview/schemes/TCoffeeColourScheme.java
+++ b/src/jalview/schemes/TCoffeeColourScheme.java
@@ -1,24 +1,25 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.schemes;
-import jalview.analysis.SequenceIdMatcher;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AnnotatedCollectionI;
@@ -31,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
@@ -45,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
@@ -85,8 +84,10 @@ public class TCoffeeColourScheme extends ResidueColourScheme
// Search alignment to get all tcoffee annotation and pick one set of
// annotation to use to colour seqs.
seqMap = new IdentityHashMap();
+ AnnotatedCollectionI alcontext = alignment instanceof AlignmentI ? alignment
+ : alignment.getContext();
int w = 0;
- for (AlignmentAnnotation al : alignment
+ for (AlignmentAnnotation al : alcontext
.findAnnotation(TCoffeeScoreFile.TCOFFEE_SCORE))
{
if (al.sequenceRef != null && !al.belowAlignment)
@@ -129,7 +130,7 @@ public class TCoffeeColourScheme extends ResidueColourScheme
}
return cols[j];
}
-
+
@Override
public ColourSchemeI applyTo(AnnotatedCollectionI sg,
Map hiddenRepSequences)