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
Merge commit 'ab43013b7e357b84b4abade0dba949668dfb2a0e' into develop
[jalview.git]
/
src
/
jalview
/
analysis
/
AlignSeq.java
diff --git
a/src/jalview/analysis/AlignSeq.java
b/src/jalview/analysis/AlignSeq.java
index
eacceb0
..
4c1c7c5
100755
(executable)
--- a/
src/jalview/analysis/AlignSeq.java
+++ b/
src/jalview/analysis/AlignSeq.java
@@
-1155,7
+1155,8
@@
public class AlignSeq
}
if (sq.getAnnotation() != null && sq.getAnnotation().length > 0)
{
- annotations.addAll(inspos, Arrays.asList(sq.getAnnotation()));
+ annotations.addAll(inspos == -1 ? annotations.size() : inspos,
+ Arrays.asList(sq.getAnnotation()));
}
}
}