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
Must be 1.1 compliant
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationPanel.java
diff --git
a/src/jalview/appletgui/AnnotationPanel.java
b/src/jalview/appletgui/AnnotationPanel.java
index
71f51ea
..
614498c
100755
(executable)
--- a/
src/jalview/appletgui/AnnotationPanel.java
+++ b/
src/jalview/appletgui/AnnotationPanel.java
@@
-467,6
+467,9
@@
public class AnnotationPanel
column++;
\r
}
\r
\r
column++;
\r
}
\r
\r
+ if(column>=row.annotations.length)
\r
+ column = row.annotations.length-1;
\r
+
\r
x += av.charWidth;
\r
\r
if (row.hasIcons)
\r
x += av.charWidth;
\r
\r
if (row.hasIcons)
\r
@@
-511,8
+514,8
@@
public class AnnotationPanel
case 'E':
\r
g.setColor(SHEET_COLOUR);
\r
\r
case 'E':
\r
g.setColor(SHEET_COLOUR);
\r
\r
- if (row.annotations.length > endRes
\r
- && row.annotations[endRes].secondaryStructure != 'E')
\r
+ if (row.annotations[endRes] ==null
\r
+ || row.annotations[endRes].secondaryStructure != 'E')
\r
{
\r
g.fillRect(lastSSX, y + 4 + iconOffset,
\r
x - lastSSX - 4, 7);
\r
{
\r
g.fillRect(lastSSX, y + 4 + iconOffset,
\r
x - lastSSX - 4, 7);
\r