X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequence.java;fp=src%2Fjalview%2Fdatamodel%2FSequence.java;h=d52e0497aa7f52b5a3c7092328c53c134cc93aa5;hb=2eaab3084d84daa55785c0c288592d2a7f603742;hp=3bd7b4b71968551aca235cc435e161269fa700d9;hpb=9018c06add8548b4921a4c21f21a1b85a0bea1de;p=jalview.git diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java index 3bd7b4b..d52e049 100755 --- 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 getAlignmentAnnotations(String calcId, - String label, String description, boolean nullWildcard) + String label, String description, boolean ignoreDescription) { List 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))))