JAL-1807 - Bob's last(?) before leaving Dundee -- adds fast file loading

[jalviewjs.git] / site / j2s / jalview / schemes / AnnotationColourGradient.js

diff --git a/site/j2s/jalview/schemes/AnnotationColourGradient.js b/site/j2s/jalview/schemes/AnnotationColourGradient.js
index a1b8db6..adc6c46 100644 (file)
--- a/site/j2s/jalview/schemes/AnnotationColourGradient.js
+++ b/site/j2s/jalview/schemes/AnnotationColourGradient.js
@@ -121,11 +121,11 @@ Clazz.defineMethod (c$, "getMaxColour",
 function () {
 return  new java.awt.Color (Clazz.floatToInt (this.r1 + this.rr), Clazz.floatToInt (this.g1 + this.gg), Clazz.floatToInt (this.b1 + this.bb));
 });
-Clazz.defineMethod (c$, "findColour", 
+Clazz.overrideMethod (c$, "findColour", 
 function (c) {
 return java.awt.Color.red;
 }, "~S");
-Clazz.defineMethod (c$, "findColour", 
+Clazz.overrideMethod (c$, "findColourSeq", 
 function (c, j, seq) {
 var currentColour = java.awt.Color.white;
 var annotation = (this.seqAssociated && this.seqannot != null ? this.seqannot.get (seq) : this.annotation);
@@ -140,7 +140,7 @@ currentColour = aj.colour;
 } else if (annotation.hasIcons && annotation.graph == 0) {
 if (aj.secondaryStructure > ' ' && aj.secondaryStructure != '.' && aj.secondaryStructure != '-') {
 if (this.colourScheme != null) {
-currentColour = this.colourScheme.findColour (c, j, seq);
+currentColour = this.colourScheme.findColourSeq (c, j, seq);
 } else {
 if (annotation.isRNA ()) {
 currentColour = jalview.schemes.ColourSchemeProperty.rnaHelices[Clazz.floatToInt (aj.value)];
@@ -150,7 +150,7 @@ currentColour = annotation.annotations[j].secondaryStructure == 'H' ? jalview.re
 return java.awt.Color.white;
 }} else if (this.noGradient) {
 if (this.colourScheme != null) {
-currentColour = this.colourScheme.findColour (c, j, seq);
+currentColour = this.colourScheme.findColourSeq (c, j, seq);
 } else {
 if (aj.colour != null) {
 currentColour = aj.colour;