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 branch 'develop' of https://source.jalview.org/git/jalview.git into develop
[jalview.git]
/
src
/
jalview
/
io
/
packed
/
ParsePackedSet.java
diff --git
a/src/jalview/io/packed/ParsePackedSet.java
b/src/jalview/io/packed/ParsePackedSet.java
index
df1acf1
..
a4ef77e
100644
(file)
--- a/
src/jalview/io/packed/ParsePackedSet.java
+++ b/
src/jalview/io/packed/ParsePackedSet.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-123,8
+123,9
@@
public class ParsePackedSet
{
br = new BufferedReader(src.getReader());
}
{
br = new BufferedReader(src.getReader());
}
+ // TODO: add columnSelection to context
if (new jalview.io.AnnotationFile().parseAnnotationFrom(
if (new jalview.io.AnnotationFile().parseAnnotationFrom(
- context.getLastAlignment(), br))
+ context.getLastAlignment(), null, br))
{
context.updateSetModified(true);
}
{
context.updateSetModified(true);
}