Don't parse input id, leave it as it is

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

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index 30560d7..9773019 100755 (executable)
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -21,7 +21,6 @@ package jalview.appletgui;
 \r
 import java.awt.*;\r
 \r
-import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
 \r
 public class IdCanvas\r
@@ -75,13 +74,8 @@ public class IdCanvas
       gg.setColor(Color.black);\r
     }\r
 \r
-    String string = s.getName();\r
-    if (av.getShowFullId())\r
-    {\r
-      string = s.getDisplayId();\r
-    }\r
 \r
-    gg.drawString(string, 0,\r
+    gg.drawString( s.getDisplayId(av.getShowJVSuffix()), 0,\r
                   ((i - starty) * charHeight) + ypos +\r
                   charHeight - (charHeight / 5));\r
 \r
@@ -261,12 +255,9 @@ public class IdCanvas
                     av.charHeight);\r
 \r
         gg.setColor(currentTextColor);\r
-        String string = av.alignment.getSequenceAt(i).getName();\r
-        if (av.getShowFullId())\r
-        {\r
-          string = av.alignment.getSequenceAt(i).getDisplayId();\r
-        }\r
-        gg.drawString(string, 0,\r
+\r
+        gg.drawString(av.alignment.getSequenceAt(i)\r
+            .getDisplayId(av.getShowJVSuffix()), 0,\r
                       ((i - starty) * av.charHeight) +\r
                       av.charHeight - (av.charHeight / 5));\r
       }\r