git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'releases/Release_2_11_4_Branch'
[jalview.git]
/
src
/
jalview
/
schemes
/
ResidueColourScheme.java
diff --git
a/src/jalview/schemes/ResidueColourScheme.java
b/src/jalview/schemes/ResidueColourScheme.java
index
6aa798e
..
03ab536
100755
(executable)
--- a/
src/jalview/schemes/ResidueColourScheme.java
+++ b/
src/jalview/schemes/ResidueColourScheme.java
@@
-46,6
+46,12
@@
public abstract class ResidueColourScheme implements ColourSchemeI
public static final String USER_DEFINED_MENU = "*User Defined*";
/*
public static final String USER_DEFINED_MENU = "*User Defined*";
/*
+ * the canonical name of the annotation colour scheme
+ * (may be used to identify it in menu items)
+ */
+ public static final String ANNOTATION_COLOUR = "Annotation";
+
+ /*
* lookup up by character value e.g. 'G' to the colors array index
* e.g. if symbolIndex['K'] = 11 then colors[11] is the colour for K
*/
* lookup up by character value e.g. 'G' to the colors array index
* e.g. if symbolIndex['K'] = 11 then colors[11] is the colour for K
*/
@@
-62,8
+68,9
@@
public abstract class ResidueColourScheme implements ColourSchemeI
/**
* Creates a new ResidueColourScheme object.
*
/**
* Creates a new ResidueColourScheme object.
*
- * @param final int[] index table into colors (ResidueProperties.naIndex or
- * ResidueProperties.aaIndex)
+ * @param final
+ * int[] index table into colors (ResidueProperties.naIndex or
+ * ResidueProperties.aaIndex)
* @param colors
* colours for symbols in sequences
*/
* @param colors
* colours for symbols in sequences
*/
@@
-98,8
+105,7
@@
public abstract class ResidueColourScheme implements ColourSchemeI
{
Color colour = Color.white;
{
Color colour = Color.white;
- if (colors != null && symbolIndex != null
- && c < symbolIndex.length
+ if (colors != null && symbolIndex != null && c < symbolIndex.length
&& symbolIndex[c] < colors.length)
{
colour = colors[symbolIndex[c]];
&& symbolIndex[c] < colors.length)
{
colour = colors[symbolIndex[c]];
@@
-208,4
+214,14
@@
public abstract class ResidueColourScheme implements ColourSchemeI
{
return true;
}
{
return true;
}
+
+ /**
+ * Default method returns false. Override this to return true in colour
+ * schemes that have a colour associated with gap residues.
+ */
+ @Override
+ public boolean hasGapColour()
+ {
+ return false;
+ }
}
}