X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FIdCanvas.java;h=44ba2e066aee34a0a7eda05c57095682d98e86f8;hb=bceadbb394604c88ac18e2dcf4b33e735377d7ac;hp=30560d784268caf25ab788903c5a6ad9ac2c7299;hpb=ee53965807b83bf93a21cbc341cee9a9e005b2cb;p=jalview.git

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index 30560d7..44ba2e0 100755
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -21,7 +21,6 @@ package jalview.appletgui;
 
 import java.awt.*;
 
-import jalview.analysis.*;
 import jalview.datamodel.*;
 
 public class IdCanvas
@@ -75,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));
 
@@ -210,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);
             }
         }
 
@@ -261,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));
       }