X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAllColsCollection.java;h=af3fffa55277043bbbe93ce819d14415185cb67b;hb=refs%2Fheads%2Fbug%2FJAL-3487-splash-JS;hp=f84ba957aa03c5580beae0971fb4d0f447fe6b12;hpb=460c037bef9ec113c2a46010c443d85e73347592;p=jalview.git diff --git a/src/jalview/datamodel/AllColsCollection.java b/src/jalview/datamodel/AllColsCollection.java index f84ba95..af3fffa 100644 --- a/src/jalview/datamodel/AllColsCollection.java +++ b/src/jalview/datamodel/AllColsCollection.java @@ -22,26 +22,28 @@ package jalview.datamodel; import jalview.api.AlignmentColsCollectionI; +import java.util.BitSet; import java.util.Iterator; public class AllColsCollection implements AlignmentColsCollectionI { - int start; - int end; + final int start; + + final int end; HiddenColumns hidden; - + public AllColsCollection(int s, int e, AlignmentI al) { start = s; end = e; hidden = al.getHiddenColumns(); } - + @Override public Iterator iterator() { - return new AllColsIterator(start,end,hidden); + return new AllColsIterator(start, end, hidden); } @Override @@ -49,4 +51,32 @@ public class AllColsCollection implements AlignmentColsCollectionI { return !hidden.isVisible(c); } + + @Override + public boolean hasHidden() + { + return hidden.hasHiddenColumns(); + } + + private BitSet bsVisible; + + @Override + public BitSet getHiddenBitSet() + { + return hidden.getBitset(); + } + + /** + * Returns all columns, including any hidden in the alignment + */ + @Override + public BitSet getShownBitSet() + { + if (bsVisible == null) + { + bsVisible = new BitSet(end + 1); + bsVisible.set(0, end + 1); + } + return bsVisible; + } }