spike branch updated from latest features/JAL-2446

[jalview.git] / src / jalview / schemes / ResidueColourScheme.java

diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index fc8b1b1..b47b82e 100755 (executable)
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -20,9 +20,9 @@
  */
 package jalview.schemes;
 
-import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AnnotatedCollectionI;
 import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 
 import java.awt.Color;
@@ -86,10 +86,18 @@ public abstract class ResidueColourScheme implements ColourSchemeI
   /**
    * Find a colour without an index in a sequence
    */
-  @Override
   public Color findColour(char c)
   {
-    return colors == null ? Color.white : colors[symbolIndex[c]];
+    Color colour = Color.white;
+
+    if (colors != null && symbolIndex != null
+            && c < symbolIndex.length
+            && symbolIndex[c] < colors.length)
+    {
+      colour = colors[symbolIndex[c]];
+    }
+
+    return colour;
   }
 
   /**
@@ -104,18 +112,19 @@ public abstract class ResidueColourScheme implements ColourSchemeI
     return findColour(c, j, seq);
   }
 
+  /**
+   * Default implementation looks up the residue colour in a fixed scheme, or
+   * returns White if not found. Override this method for a colour scheme that
+   * depends on the column position or sequence.
+   * 
+   * @param c
+   * @param j
+   * @param seq
+   * @return
+   */
   protected Color findColour(char c, int j, SequenceI seq)
   {
-    Color colour = Color.white;
-
-    if (colors != null && symbolIndex != null && c < symbolIndex.length
-            && symbolIndex[c] < colors.length)
-    {
-      colour = colors[symbolIndex[c]];
-    }
-    // colour = adjustColour(c, j, colour);
-
-    return colour;
+    return findColour(c);
   }
 
   @Override
@@ -136,30 +145,26 @@ public abstract class ResidueColourScheme implements ColourSchemeI
     {
       return true;
     }
-
-    /*
-     * inspect the data context (alignment) for residue type
-     */
-    boolean nucleotide = false;
-    if (ac instanceof AlignmentI)
+    if (ac == null)
     {
-      nucleotide = ((AlignmentI) ac).isNucleotide();
+      return true;
     }
-    else
+    /*
+     * pop-up menu on selection group before group created
+     * (no alignment context)
+     */
+    // TODO: add nucleotide flag to SequenceGroup?
+    if (ac instanceof SequenceGroup && ac.getContext() == null)
     {
-      AnnotatedCollectionI context = ac.getContext();
-      if (context instanceof AlignmentI)
-      {
-        nucleotide = ((AlignmentI) context).isNucleotide();
-      }
-      else
-      {
-        // not sure what's going on, play safe
-        return true;
-      }
+      return true;
     }
 
     /*
+     * inspect the data context (alignment) for residue type
+     */
+    boolean nucleotide = ac.isNucleotide();
+
+    /*
      * does data type match colour scheme type?
      */
     return (nucleotide && isNucleotideSpecific())