getDisplayId changed

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 66bc999..fc4c688 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -209,14 +209,7 @@ public class AlignmentPanel extends GAlignmentPanel
         {\r
             SequenceI s = al.getSequenceAt(i);\r
 \r
-            if (av.getShowFullId())\r
-            {\r
-                id = s.getDisplayId();\r
-            }\r
-            else\r
-            {\r
-                id = s.getName();\r
-            }\r
+            id = s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());\r
 \r
             if (fm.stringWidth(id) > idWidth)\r
             {\r
@@ -683,12 +676,8 @@ public class AlignmentPanel extends GAlignmentPanel
 \r
             pg.setColor(currentTextColor);\r
 \r
-            String string = av.getAlignment().getSequenceAt(i).getName();\r
-\r
-            if (av.getShowFullId())\r
-            {\r
-                string = av.getAlignment().getSequenceAt(i).getDisplayId();\r
-            }\r
+            String string = av.getAlignment().getSequenceAt(i).getDisplayId\r
+                (av.getShowDBPrefix(), av.getShowJVSuffix());\r
 \r
             pg.drawString(string, 0,\r
                 (((i-startSeq) * av.charHeight) + av.getCharHeight()) -\r
@@ -776,12 +765,7 @@ public class AlignmentPanel extends GAlignmentPanel
           for (int i = 0; i < av.alignment.getHeight(); i++)\r
           {\r
             SequenceI s = av.alignment.getSequenceAt(i);\r
-            String string = s.getName();\r
-\r
-            if (av.getShowFullId())\r
-            {\r
-              string = s.getDisplayId();\r
-            }\r
+            String string = s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix());\r
 \r
             pg.drawString(string, 0,\r
                           ( (i * av.charHeight) + ypos + av.charHeight) -\r