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
/
ResidueColourScheme.java
diff --git
a/src/jalview/schemes/ResidueColourScheme.java
b/src/jalview/schemes/ResidueColourScheme.java
index
bf83665
..
b905c45
100755
(executable)
--- a/
src/jalview/schemes/ResidueColourScheme.java
+++ b/
src/jalview/schemes/ResidueColourScheme.java
@@
-97,7
+97,7
@@
public class ResidueColourScheme implements ColourSchemeI
}
\r
\r
if(conservationColouring)
\r
}
\r
\r
if(conservationColouring)
\r
- applyConservation(currentColour, j);
\r
+ currentColour = applyConservation(currentColour, j);
\r
\r
\r
return currentColour;
\r
\r
\r
return currentColour;
\r
@@
-221,7
+221,7
@@
public class ResidueColourScheme implements ColourSchemeI
* @return DOCUMENT ME!
\r
*/
\r
\r
* @return DOCUMENT ME!
\r
*/
\r
\r
- void applyConservation(Color currentColour, int i)
\r
+ Color applyConservation(Color currentColour, int i)
\r
{
\r
\r
if ((conservation[i] != '*') && (conservation[i] != '+'))
\r
{
\r
\r
if ((conservation[i] != '*') && (conservation[i] != '+'))
\r
@@
-235,8
+235,7
@@
public class ResidueColourScheme implements ColourSchemeI
float t = 11 - (conservation[i] - '0');
\r
if(t==0)
\r
{
\r
float t = 11 - (conservation[i] - '0');
\r
if(t==0)
\r
{
\r
- currentColour = Color.white;
\r
- return;
\r
+ return Color.white;
\r
}
\r
\r
int red = currentColour.getRed();
\r
}
\r
\r
int red = currentColour.getRed();
\r
@@
-261,6
+260,7
@@
public class ResidueColourScheme implements ColourSchemeI
currentColour = new Color(red, green, blue);
\r
}
\r
}
\r
currentColour = new Color(red, green, blue);
\r
}
\r
}
\r
+ return currentColour;
\r
}
\r
\r
\r
}
\r
\r
\r