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-4245 Return null from getRootDataset if no dataset
[jalview.git]
/
src
/
jalview
/
datamodel
/
SequenceI.java
diff --git
a/src/jalview/datamodel/SequenceI.java
b/src/jalview/datamodel/SequenceI.java
index
d8a5462
..
11aa4e6
100755
(executable)
--- a/
src/jalview/datamodel/SequenceI.java
+++ b/
src/jalview/datamodel/SequenceI.java
@@
-396,11
+396,16
@@
public interface SequenceI extends ASequenceI
public SequenceI getDatasetSequence();
/**
public SequenceI getDatasetSequence();
/**
- * Returns the top grandparent in the dataset sequences hierarchy.
+ * Returns the top grandparent in the dataset sequences hierarchy
+ * or null if there is no dataset associated with this sequence.
*/
public default SequenceI getRootDatasetSequence()
{
*/
public default SequenceI getRootDatasetSequence()
{
- var sequence = this;
+ if (getDatasetSequence() == null)
+ {
+ return null;
+ }
+ var sequence = getDatasetSequence();
while (sequence.getDatasetSequence() != null)
{
sequence = sequence.getDatasetSequence();
while (sequence.getDatasetSequence() != null)
{
sequence = sequence.getDatasetSequence();