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:
ca74dc4
)
temporary fix and note about null feature group mucking up selection of features...
author
jprocter
<Jim Procter>
Mon, 15 Dec 2008 10:34:19 +0000
(10:34 +0000)
committer
jprocter
<Jim Procter>
Mon, 15 Dec 2008 10:34:19 +0000
(10:34 +0000)
src/jalview/analysis/AlignmentSorter.java
patch
|
blob
|
history
diff --git
a/src/jalview/analysis/AlignmentSorter.java
b/src/jalview/analysis/AlignmentSorter.java
index
cf5a57a
..
ab1e62d
100755
(executable)
--- 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))
||
// 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;
{
// forget about this feature
sf[f] = null;