X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FTCoffeeColourScheme.java;h=bc56281cd2d62604f7d5956286589a58b08331e8;hb=9ac8472a4a1db8f17916f15690483af3bf97c495;hp=cd2681b367e577c708c5d00ea1a7028b4bfa10d6;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/schemes/TCoffeeColourScheme.java b/src/jalview/schemes/TCoffeeColourScheme.java index cd2681b..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.1) - * 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,7 +84,8 @@ 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(); + AnnotatedCollectionI alcontext = alignment instanceof AlignmentI ? alignment + : alignment.getContext(); int w = 0; for (AlignmentAnnotation al : alcontext .findAnnotation(TCoffeeScoreFile.TCOFFEE_SCORE)) @@ -130,7 +130,7 @@ public class TCoffeeColourScheme extends ResidueColourScheme } return cols[j]; } - + @Override public ColourSchemeI applyTo(AnnotatedCollectionI sg, Map hiddenRepSequences)