X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FIdColourScheme.java;h=5add4709eb5b3e24221f66b97e2ade7675913b87;hb=bc07c82cde95d498cf6919422baf7ad3994e1bf2;hp=cd26666e37aca0c8b58ed712aae88a37b0eaec65;hpb=4cb58ab40ed4521e8ac732665098a6c57ad43896;p=jalview.git

diff --git a/src/jalview/schemes/IdColourScheme.java b/src/jalview/schemes/IdColourScheme.java
index cd26666..5add470 100644
--- a/src/jalview/schemes/IdColourScheme.java
+++ b/src/jalview/schemes/IdColourScheme.java
@@ -28,12 +28,17 @@ import jalview.datamodel.SequenceI;
 import java.awt.Color;
 import java.util.Map;
 
+/**
+ * shade sequences using the colour shown in the ID panel. Useful to map
+ * sequence groupings onto residue data (eg tree subgroups visualised on
+ * structures or overview window)
+ * 
+ * @author jprocter
+ */
 public class IdColourScheme implements ColourSchemeI
 {
   AlignViewportI view = null;
 
-  AnnotatedCollectionI coll = null;
-
   public IdColourScheme()
   {
 
@@ -41,7 +46,6 @@ public class IdColourScheme implements ColourSchemeI
   public IdColourScheme(AlignViewportI view, AnnotatedCollectionI coll)
   {
     this.view = view;
-    this.coll = coll;
   }
 
 
@@ -57,8 +61,7 @@ public class IdColourScheme implements ColourSchemeI
    */
   @Override
   public ColourSchemeI getInstance(AlignViewportI view,
-          AnnotatedCollectionI coll,
-          Map<SequenceI, SequenceCollectionI> hrs)
+          AnnotatedCollectionI coll)
   {
     return new IdColourScheme(view, coll);
   }
@@ -77,8 +80,12 @@ public class IdColourScheme implements ColourSchemeI
     // ((SequenceGroup)coll).idColour
     // we always return the sequence ID colour, in case the user has customised
     // the displayed Id colour by right-clicking an internal node in the tree.
-    return (view == null) ? Color.WHITE
-            : view.getSequenceColour(seq).darker();
+    if (view == null)
+    {
+      return Color.WHITE;
+    }
+    Color col = view.getSequenceColour(seq);
+    return Color.WHITE.equals(col) ? Color.WHITE : col.darker();
   }
 
   @Override
@@ -96,7 +103,6 @@ public class IdColourScheme implements ColourSchemeI
   @Override
   public boolean isSimple()
   {
-    // this is really a sequence colour
-    return true;
+    return false;
   }
 }