X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FColumnSelection.java;fp=src%2Fjalview%2Fdatamodel%2FColumnSelection.java;h=6d620b4a9cff66a9602fa900aace1809e983296d;hb=be762d8d9c71a7aa3121e845c45911c7192b7827;hp=4cdd7afb29332494f91728e96353b571f9fad5ac;hpb=d1bb7a31fc091606aedbc255a5766ac79e36fa91;p=jalview.git diff --git a/src/jalview/datamodel/ColumnSelection.java b/src/jalview/datamodel/ColumnSelection.java index 4cdd7af..6d620b4 100644 --- a/src/jalview/datamodel/ColumnSelection.java +++ b/src/jalview/datamodel/ColumnSelection.java @@ -401,7 +401,6 @@ public class ColumnSelection } - /** * Hides the specified column and any adjacent selected columns * @@ -444,10 +443,6 @@ public class ColumnSelection hidden.hideColumns(min, max); } - - - - /** * Copy constructor * @@ -468,11 +463,6 @@ public class ColumnSelection { } - - - - - /** * Invert the column selection from first to end-1. leaves hiddenColumns * untouched (and unselected) @@ -534,7 +524,6 @@ public class ColumnSelection } } - /** * * @return true if there are columns marked @@ -544,8 +533,6 @@ public class ColumnSelection return (selection != null && selection.size() > 0); } - - public boolean filterAnnotations(Annotation[] annotations, AnnotationFilterParameter filterParams) { @@ -560,13 +547,15 @@ public class ColumnSelection boolean itemMatched = false; - if (filterParams.getThresholdType() == AnnotationFilterParameter.ThresholdType.ABOVE_THRESHOLD + if (filterParams + .getThresholdType() == AnnotationFilterParameter.ThresholdType.ABOVE_THRESHOLD && annotations[count].value >= filterParams .getThresholdValue()) { itemMatched = true; } - if (filterParams.getThresholdType() == AnnotationFilterParameter.ThresholdType.BELOW_THRESHOLD + if (filterParams + .getThresholdType() == AnnotationFilterParameter.ThresholdType.BELOW_THRESHOLD && annotations[count].value <= filterParams .getThresholdValue()) { @@ -691,8 +680,8 @@ public class ColumnSelection * * @return */ - public boolean markColumns(BitSet markedColumns, int startCol, - int endCol, boolean invert, boolean extendCurrent, boolean toggle) + public boolean markColumns(BitSet markedColumns, int startCol, int endCol, + boolean invert, boolean extendCurrent, boolean toggle) { boolean changed = false; if (!extendCurrent && !toggle)