git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No new PDBViewer
[jalview.git]
/
src
/
jalview
/
gui
/
IdCanvas.java
diff --git
a/src/jalview/gui/IdCanvas.java
b/src/jalview/gui/IdCanvas.java
index
7d283ba
..
5314ade
100755
(executable)
--- a/
src/jalview/gui/IdCanvas.java
+++ b/
src/jalview/gui/IdCanvas.java
@@
-18,8
+18,6
@@
*/
\r
package jalview.gui;
\r
\r
*/
\r
package jalview.gui;
\r
\r
-import jalview.analysis.*;
\r
-
\r
import jalview.datamodel.*;
\r
\r
import java.awt.*;
\r
import jalview.datamodel.*;
\r
\r
import java.awt.*;
\r
@@
-95,15
+93,9
@@
public class IdCanvas extends JPanel
gg.setColor(Color.black);
\r
}
\r
\r
gg.setColor(Color.black);
\r
}
\r
\r
- String string = s.getName();
\r
-
\r
- if (av.getShowFullId())
\r
- {
\r
- string = s.getDisplayId();
\r
- }
\r
\r
\r
- gg.drawString(string, 0,
\r
- (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
\r
+ gg.drawString( s.getDisplayId(av.getShowDBPrefix(), av.getShowJVSuffix()),
\r
+ 0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-292,12
+284,8
@@
public class IdCanvas extends JPanel
\r
gg.setColor(currentTextColor);
\r
\r
\r
gg.setColor(currentTextColor);
\r
\r
- String string = av.alignment.getSequenceAt(i).getName();
\r
-
\r
- if (av.getShowFullId())
\r
- {
\r
- string = av.alignment.getSequenceAt(i).getDisplayId();
\r
- }
\r
+ String string = av.alignment.getSequenceAt(i).getDisplayId(
\r
+ av.getShowDBPrefix(), av.getShowJVSuffix());
\r
\r
gg.drawString(string, 0,
\r
(((i - starty) * av.charHeight) + av.charHeight) -
\r
\r
gg.drawString(string, 0,
\r
(((i - starty) * av.charHeight) + av.charHeight) -
\r