X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FBlosum62ColourScheme.java;h=ec5d4f1517aa4f3e120097d4a268f8ddc7761c92;hb=27e04880edb301447f2e57b5156b8c685b853b68;hp=1aea477ea86b760920aaa888117c3b9f2a5fd339;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/schemes/Blosum62ColourScheme.java b/src/jalview/schemes/Blosum62ColourScheme.java
index 1aea477..ec5d4f1 100755
--- a/src/jalview/schemes/Blosum62ColourScheme.java
+++ b/src/jalview/schemes/Blosum62ColourScheme.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,9 +18,9 @@
  */
 package jalview.schemes;
 
-import java.util.*;
 
 import java.awt.*;
+import jalview.analysis.AAFrequency;
 
 public class Blosum62ColourScheme
     extends ResidueColourScheme
@@ -32,20 +32,28 @@ public class Blosum62ColourScheme
 
   public Color findColour(String s, int j)
   {
-    if ( (threshold != 0) && !aboveThreshold(s, j))
+    char res = s.charAt(0);
+    if ('a' <= res && res <= 'z' )
     {
-      return Color.white;
+       // TO UPPERCASE !!!
+       s = String.valueOf( res -= ('a' - 'A') );
     }
 
-    Hashtable hash = (Hashtable) consensus.elementAt(j);
+    if (consensus == null ||
+        j >= consensus.length ||
+        consensus[j] == null ||
+        (threshold != 0 && !aboveThreshold(s, j)))
+    {
+      return Color.white;
+    }
 
-    if (!jalview.util.Comparison.isGap( (s.charAt(0))))
+    if (!jalview.util.Comparison.isGap( res ))
     {
-      String max = (String) hash.get("maxResidue");
+      String max = (String) consensus[j].get(AAFrequency.MAXRESIDUE);
 
       if (max.indexOf(s) > -1)
       {
-        return new Color(154, 154, 255);
+        currentColour = new Color(154, 154, 255);
       }
       else
       {
@@ -62,17 +70,22 @@ public class Blosum62ColourScheme
 
         if (c > 0)
         {
-          return new Color(204, 204, 255);
+          currentColour = new Color(204, 204, 255);
         }
         else
         {
-          return Color.white;
+          currentColour = Color.white;
         }
       }
+
+      if(conservationColouring)
+         applyConservation(j);
     }
     else
     {
       return Color.white;
     }
+
+    return currentColour;
   }
 }