X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdCanvas.java;h=f7f1b203b5f237c149edfcad4bb7dc4e677b2693;hb=7bc213bae5828287329a3490faba291706599b03;hp=a277adbd8d5f45f7e9f8e1da5a1eab76369cd67a;hpb=f24dacb1da56fccf05d684e2f4899facec2aecf7;p=jalview.git

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index a277adb..f7f1b20 100755
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -59,7 +59,7 @@ public class IdCanvas
       gg.setColor(Color.white);
     }
     else if (av.getSelectionGroup() != null &&
-             av.getSelectionGroup().sequences.contains(s))
+             av.getSelectionGroup().getSequences(false).contains(s))
     {
       gg.setColor(Color.lightGray);
       gg.fillRect(0, ((i - starty) * charHeight) + ypos,
@@ -74,13 +74,8 @@ public class IdCanvas
       gg.setColor(Color.black);
     }
 
-    String string = s.getName();
-    if (av.getShowFullId())
-    {
-      string = s.getDisplayId();
-    }
 
-    gg.drawString(string, 0,
+    gg.drawString( s.getDisplayId(av.getShowJVSuffix()), 0,
                   ((i - starty) * charHeight) + ypos +
                   charHeight - (charHeight / 5));
 
@@ -209,16 +204,15 @@ public class IdCanvas
             for (int i = starty; i < av.alignment.getHeight(); i++)
             {
                 SequenceI s = av.alignment.getSequenceAt(i);
+                gg.setFont(italic);
                 drawIdString(gg, s, i, 0, ypos);
             }
 
             if(labels!=null)
             {
-              gg.setFont(av.getFont());
               gg.translate(0, ypos+(av.getAlignment().getHeight() * av.charHeight));
               labels.drawComponent(gg, getSize().width);
               gg.translate(0, -ypos-(av.getAlignment().getHeight() * av.charHeight));
-              gg.setFont(italic);
             }
         }
 
@@ -240,7 +234,7 @@ public class IdCanvas
         }
         else if (av.getSelectionGroup() != null
                  &&
-                 av.getSelectionGroup().sequences.contains(av.alignment.
+                 av.getSelectionGroup().getSequences(false).contains(av.alignment.
             getSequenceAt(i)))
         {
           currentColor = Color.lightGray;
@@ -260,12 +254,9 @@ public class IdCanvas
                     av.charHeight);
 
         gg.setColor(currentTextColor);
-        String string = av.alignment.getSequenceAt(i).getName();
-        if (av.getShowFullId())
-        {
-          string = av.alignment.getSequenceAt(i).getDisplayId();
-        }
-        gg.drawString(string, 0,
+
+        gg.drawString(av.alignment.getSequenceAt(i)
+            .getDisplayId(av.getShowJVSuffix()), 0,
                       ((i - starty) * av.charHeight) +
                       av.charHeight - (av.charHeight / 5));
       }