JAL-2094 first pass with jalview.api.ColorI interface

[jalview.git] / src / jalview / gui / IdCanvas.java

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index c89a9d5..2cb5bcd 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -21,6 +21,7 @@
 package jalview.gui;
 
 import jalview.datamodel.SequenceI;
+import jalview.util.ColorUtils;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -121,7 +122,7 @@ public class IdCanvas extends JPanel
     }
     else
     {
-      gg.setColor(av.getSequenceColour(s));
+      gg.setColor(ColorUtils.getColor(av.getSequenceColour(s)));
       gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(),
               charHeight);
       gg.setColor(Color.black);
@@ -204,6 +205,7 @@ public class IdCanvas extends JPanel
    * @param g
    *          DOCUMENT ME!
    */
+  @Override
   public void paintComponent(Graphics g)
   {
     g.setColor(Color.white);
@@ -382,7 +384,8 @@ public class IdCanvas extends JPanel
         }
         else
         {
-          currentColor = av.getSequenceColour(sequence);
+          currentColor = ColorUtils
+                  .getColor(av.getSequenceColour(sequence));
           currentTextColor = Color.black;
         }
 
@@ -479,7 +482,7 @@ public class IdCanvas extends JPanel
     Font bold = new Font(av.getFont().getName(), Font.BOLD, av.getFont()
             .getSize());
 
-    if (av.isHiddenRepSequence(seq))
+    if (av.isReferenceSeq(seq) || av.isHiddenRepSequence(seq))
     {
       gg.setFont(bold);
     }