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
safer copy constructor
[jalview.git]
/
src
/
jalview
/
datamodel
/
Sequence.java
diff --git
a/src/jalview/datamodel/Sequence.java
b/src/jalview/datamodel/Sequence.java
index
3240f84
..
56a829c
100755
(executable)
--- a/
src/jalview/datamodel/Sequence.java
+++ b/
src/jalview/datamodel/Sequence.java
@@
-185,15
+185,16
@@
public class Sequence implements SequenceI
addSequenceFeature(new SequenceFeature(sf[i]));
}
}
addSequenceFeature(new SequenceFeature(sf[i]));
}
}
- if (seq.getDBRef() != null)
+ setDatasetSequence(seq.getDatasetSequence());
+ if (datasetSequence==null && seq.getDBRef() != null)
{
{
+ // only copy DBRefs if we really are a dataset sequence
DBRefEntry[] dbr = seq.getDBRef();
for (int i = 0; i < dbr.length; i++)
{
addDBRef(new DBRefEntry(dbr[i]));
}
}
DBRefEntry[] dbr = seq.getDBRef();
for (int i = 0; i < dbr.length; i++)
{
addDBRef(new DBRefEntry(dbr[i]));
}
}
- setDatasetSequence(seq.getDatasetSequence());
if (seq.getAnnotation() != null)
{
AlignmentAnnotation[] sqann = seq.getAnnotation();
if (seq.getAnnotation() != null)
{
AlignmentAnnotation[] sqann = seq.getAnnotation();
@@
-819,6
+820,10
@@
public class Sequence implements SequenceI
public DBRefEntry[] getDBRef()
{
public DBRefEntry[] getDBRef()
{
+ if (dbrefs==null && datasetSequence!=null && this!=datasetSequence)
+ {
+ return datasetSequence.getDBRef();
+ }
return dbrefs;
}
return dbrefs;
}