From: jprocter Date: Mon, 15 Dec 2008 10:34:19 +0000 (+0000) Subject: temporary fix and note about null feature group mucking up selection of features... X-Git-Tag: Release_2_5~375 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=145c060c305b9126f1d64978686b5faca75e65b4;p=jalview.git temporary fix and note about null feature group mucking up selection of features to be sorted on --- diff --git a/src/jalview/analysis/AlignmentSorter.java b/src/jalview/analysis/AlignmentSorter.java index cf5a57a..ab1e62d 100755 --- a/src/jalview/analysis/AlignmentSorter.java +++ b/src/jalview/analysis/AlignmentSorter.java @@ -718,9 +718,10 @@ public class AlignmentSorter || // or ignore based on selection criteria (featureLabels != null && !AlignmentSorter.containsIgnoreCase(sf[f].type, featureLabels)) - || (groupLabels != null - && (sf[f].getFeatureGroup() == null - || !AlignmentSorter.containsIgnoreCase(sf[f].getFeatureGroup(), groupLabels)))) + || (groupLabels != null + // problem here: we cannot eliminate null feature group features + && (sf[f].getFeatureGroup() != null + && !AlignmentSorter.containsIgnoreCase(sf[f].getFeatureGroup(), groupLabels)))) { // forget about this feature sf[f] = null;