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
JAL-3171 register existing dataset for new view
[jalview.git]
/
src
/
jalview
/
project
/
Jalview2XML.java
diff --git
a/src/jalview/project/Jalview2XML.java
b/src/jalview/project/Jalview2XML.java
index
3a9060e
..
c461210
100644
(file)
--- a/
src/jalview/project/Jalview2XML.java
+++ b/
src/jalview/project/Jalview2XML.java
@@
-3098,8
+3098,6
@@
public class Jalview2XML
}
if (safeBoolean(jseq.isViewreference()))
}
if (safeBoolean(jseq.isViewreference()))
- // if (jseq.isViewreference() != null
- // && jseq.isViewreference().booleanValue())
{
referenceseqForView = tmpseqs.get(tmpseqs.size() - 1);
}
{
referenceseqForView = tmpseqs.get(tmpseqs.size() - 1);
}
@@
-3385,8
+3383,7
@@
public class Jalview2XML
// annotation.setAutoCalculated(true);
// }
}
// annotation.setAutoCalculated(true);
// }
}
- if (autoForView || // (annotation.hasAutoCalculated() &&
- annotation.isAutoCalculated())
+ if (autoForView || annotation.isAutoCalculated())
{
// remove ID - we don't recover annotation from other views for
// view-specific annotation
{
// remove ID - we don't recover annotation from other views for
// view-specific annotation
@@
-5566,6
+5563,10
@@
public class Jalview2XML
initSeqRefs();
JalviewModel jm = saveState(ap, null, null, null);
initSeqRefs();
JalviewModel jm = saveState(ap, null, null, null);
+ addDatasetRef(
+ jm.getVamsasModel().getSequenceSet().get(0).getDatasetId(),
+ ap.getAlignment().getDataset());
+
uniqueSetSuffix = "";
// jm.getJalviewModelSequence().getViewport(0).setId(null);
jm.getViewport().get(0).setId(null);
uniqueSetSuffix = "";
// jm.getJalviewModelSequence().getViewport(0).setId(null);
jm.getViewport().get(0).setId(null);