X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FBlosum62ColourScheme.java;h=9d092599860175227545083e840dbf595350b41a;hb=be1666f6c9be6b18051b233abdde85962ac0c89a;hp=57b16643c6066072e1aa449ceee2ea5916bf566e;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git
diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java
index 57b1664..9d09259 100755
--- a/src/jalview/schemes/Blosum62ColourScheme.java
+++ b/src/jalview/schemes/Blosum62ColourScheme.java
@@ -1,26 +1,32 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program 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.
+ * 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.
+ *
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.schemes;
-import java.awt.*;
+import jalview.analysis.AAFrequency;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceI;
-import jalview.analysis.*;
+import java.awt.Color;
+import java.util.Map;
public class Blosum62ColourScheme extends ResidueColourScheme
{
@@ -29,7 +35,8 @@ public class Blosum62ColourScheme extends ResidueColourScheme
super();
}
- public Color findColour(char res, int j)
+ @Override
+ public Color findColour(char res, int j, SequenceI seq)
{
if ('a' <= res && res <= 'z')
{
@@ -51,6 +58,7 @@ public class Blosum62ColourScheme extends ResidueColourScheme
if (max.indexOf(res) > -1)
{
+ // TODO use a constant here?
currentColour = new Color(154, 154, 255);
}
else
@@ -66,6 +74,7 @@ public class Blosum62ColourScheme extends ResidueColourScheme
if (c > 0)
{
+ // TODO use a constant here?
currentColour = new Color(204, 204, 255);
}
else
@@ -86,4 +95,12 @@ public class Blosum62ColourScheme extends ResidueColourScheme
return currentColour;
}
+
+ @Override
+ public ColourSchemeI applyTo(AnnotatedCollectionI sg,
+ Map hiddenRepSequences)
+ {
+ ColourSchemeI newcs = super.applyTo(sg, hiddenRepSequences);
+ return newcs;
+ }
}