From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 2 Nov 2004 16:11:21 +0000 (+0000)
Subject: Allow colouring of ids from tree selected groups
X-Git-Tag: Release_2_0~954
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8d93a0012a8372e61445046ae742830b59936ebb;p=jalview.git

Allow colouring of ids from tree selected groups
---

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 03b85e4..fee86cd 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -166,23 +166,17 @@ public class IdCanvas extends JPanel
           currentColor     = Color.gray;
           currentTextColor = Color.black;
         }
-      } else if (da.getSequenceAt(i).getColor() != null)
+      }
+      else if (da.getSequenceAt(i).getColor() != null)
       {
-        currentColor = Color.white;
-       /* Color newcol = da.getSequenceAt(i).getColor();
-        if (newcol != currentColor) {
-          currentColor = newcol;
-          if (newcol == Color.black) {
-            currentTextColor = Color.white;
-          } else {
-            currentTextColor = Color.black;
-          }
-        }*/
+        currentColor = da.getSequenceAt(i).getColor();
+        currentTextColor = Color.black;
       }
 
       gg.setColor(currentColor);
 
-      if (currentColor != Color.white) {
+      if (currentColor != Color.BLACK)
+      {
         gg.fillRect(0,
                     AlignmentUtil.getPixelHeight(starty,i,charHeight),
                     getWidth(),