X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FPIDColourScheme.java;h=3a5c066397dbc2182061da7d6529ff9551b77e02;hb=9c05fc8a07869007db06cc7efc54f2ac41e4575c;hp=f213abecf18b6bf8192d60d254a24a144dbf3249;hpb=424f6f03e8fb5e40cceca09fc8ffd72b41e3a9e4;p=jalview.git diff --git a/src/jalview/schemes/PIDColourScheme.java b/src/jalview/schemes/PIDColourScheme.java index f213abe..3a5c066 100755 --- a/src/jalview/schemes/PIDColourScheme.java +++ b/src/jalview/schemes/PIDColourScheme.java @@ -20,14 +20,13 @@ */ package jalview.schemes; +import jalview.api.AlignViewportI; import jalview.datamodel.AnnotatedCollectionI; -import jalview.datamodel.SequenceCollectionI; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.util.Comparison; import java.awt.Color; -import java.util.Map; public class PIDColourScheme extends ResidueColourScheme { @@ -47,10 +46,9 @@ public class PIDColourScheme extends ResidueColourScheme String consensusResidue, float pid) { /* - * make everything uppercase; note this does nothing - * if consensusResidue is already uppercase + * compare as upper case; note consensusResidue is + * always computed as uppercase */ - consensusResidue = consensusResidue.toUpperCase(); if ('a' <= c && c <= 'z') { c -= ('a' - 'A'); @@ -66,8 +64,7 @@ public class PIDColourScheme extends ResidueColourScheme /* * test whether this is the consensus (or joint consensus) residue */ - boolean matchesConsensus = consensusResidue.contains( - String.valueOf(c)); + boolean matchesConsensus = consensusResidue.contains(String.valueOf(c)); if (matchesConsensus) { for (int i = 0; i < thresholds.length; i++) @@ -94,8 +91,8 @@ public class PIDColourScheme extends ResidueColourScheme * be coloured */ @Override - public ColourSchemeI getInstance(AnnotatedCollectionI coll, - Map hrs) + public ColourSchemeI getInstance(AlignViewportI view, + AnnotatedCollectionI coll) { return new PIDColourScheme(); }