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
Format changes
[jalview.git]
/
src
/
jalview
/
schemes
/
AnnotationColourGradient.java
diff --git
a/src/jalview/schemes/AnnotationColourGradient.java
b/src/jalview/schemes/AnnotationColourGradient.java
index
ac88d96
..
4a78aa1
100755
(executable)
--- a/
src/jalview/schemes/AnnotationColourGradient.java
+++ b/
src/jalview/schemes/AnnotationColourGradient.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
@@
-141,7
+141,7
@@
public class AnnotationColourGradient extends ResidueColourScheme
*/
\r
public Color findColour(String n, int j)
\r
{
\r
*/
\r
public Color findColour(String n, int j)
\r
{
\r
- currentColour = Color.white;
\r
+ Color currentColour = Color.white;
\r
\r
if ((threshold == 0) || aboveThreshold(n, j))
\r
{
\r
\r
if ((threshold == 0) || aboveThreshold(n, j))
\r
{
\r
@@
-179,7
+179,7
@@
public class AnnotationColourGradient extends ResidueColourScheme
}
\r
\r
if(conservationColouring)
\r
}
\r
\r
if(conservationColouring)
\r
- applyConservation(j);
\r
+ currentColour = applyConservation(currentColour, j);
\r
\r
return currentColour;
\r
}
\r
\r
return currentColour;
\r
}
\r