git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9018c06
)
JAL-3829 ensure nulls are not wildcards when retrieving annotation by calcId/label...
author
Jim Procter
<j.procter@dundee.ac.uk>
Mon, 20 Sep 2021 13:54:14 +0000
(14:54 +0100)
committer
Jim Procter
<j.procter@dundee.ac.uk>
Mon, 20 Sep 2021 13:54:14 +0000
(14:54 +0100)
src/jalview/datamodel/Sequence.java
patch
|
blob
|
history
diff --git
a/src/jalview/datamodel/Sequence.java
b/src/jalview/datamodel/Sequence.java
index
3bd7b4b
..
d52e049
100755
(executable)
--- a/
src/jalview/datamodel/Sequence.java
+++ b/
src/jalview/datamodel/Sequence.java
@@
-1810,18
+1810,16
@@
public class Sequence extends ASequence implements SequenceI
}
private List<AlignmentAnnotation> getAlignmentAnnotations(String calcId,
}
private List<AlignmentAnnotation> getAlignmentAnnotations(String calcId,
- String label, String description, boolean nullWildcard)
+ String label, String description, boolean ignoreDescription)
{
List<AlignmentAnnotation> result = new ArrayList<>();
if (this.annotation != null)
{
for (AlignmentAnnotation ann : annotation)
{
{
List<AlignmentAnnotation> result = new ArrayList<>();
if (this.annotation != null)
{
for (AlignmentAnnotation ann : annotation)
{
- if (((nullWildcard && calcId == null)
- || (ann.calcId != null && ann.calcId.equals(calcId)))
- && ((nullWildcard && label == null)
- || (ann.label != null && ann.label.equals(label)))
- && ((nullWildcard && description == null)
+ if ((ann.calcId != null && ann.calcId.equals(calcId))
+ && (ann.label != null && ann.label.equals(label))
+ && ((ignoreDescription && description == null)
|| (ann.description != null
&& ann.description.equals(description))))
|| (ann.description != null
&& ann.description.equals(description))))