From 5fb3908c06889533998ff8ec4557da8134546c9b Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Mon, 31 Oct 2005 15:56:43 +0000 Subject: [PATCH] getDisplayId changed --- src/jalview/gui/AlignmentPanel.java | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 66bc999..fc4c688 100755 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -209,14 +209,7 @@ public class AlignmentPanel extends GAlignmentPanel { SequenceI s = al.getSequenceAt(i); - if (av.getShowFullId()) - { - id = s.getDisplayId(); - } - else - { - id = s.getName(); - } + id = s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix()); if (fm.stringWidth(id) > idWidth) { @@ -683,12 +676,8 @@ public class AlignmentPanel extends GAlignmentPanel pg.setColor(currentTextColor); - String string = av.getAlignment().getSequenceAt(i).getName(); - - if (av.getShowFullId()) - { - string = av.getAlignment().getSequenceAt(i).getDisplayId(); - } + String string = av.getAlignment().getSequenceAt(i).getDisplayId + (av.getShowDBPrefix(), av.getShowJVSuffix()); pg.drawString(string, 0, (((i-startSeq) * av.charHeight) + av.getCharHeight()) - @@ -776,12 +765,7 @@ public class AlignmentPanel extends GAlignmentPanel for (int i = 0; i < av.alignment.getHeight(); i++) { SequenceI s = av.alignment.getSequenceAt(i); - String string = s.getName(); - - if (av.getShowFullId()) - { - string = s.getDisplayId(); - } + String string = s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix()); pg.drawString(string, 0, ( (i * av.charHeight) + ypos + av.charHeight) - -- 1.7.10.2