X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAllColsIterator.java;h=1ff6a66ff62f3b16e7b9960338bcd2326bd21fe2;hb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;hp=4e1ff2e08001607c5620e1ca86c34ada03ba79da;hpb=2ca081eebf90c6731cd79bde140ca2fecc9c9644;p=jalview.git diff --git a/src/jalview/datamodel/AllColsIterator.java b/src/jalview/datamodel/AllColsIterator.java index 4e1ff2e..1ff6a66 100644 --- a/src/jalview/datamodel/AllColsIterator.java +++ b/src/jalview/datamodel/AllColsIterator.java @@ -38,27 +38,24 @@ public class AllColsIterator implements Iterator private int current; - ColumnSelection hidden; - public AllColsIterator(int firstcol, int lastcol, - ColumnSelection hiddenCols) + HiddenColumns hiddenCols) { last = lastcol; next = firstcol; current = firstcol; - hidden = hiddenCols; } @Override public boolean hasNext() { - return current + 1 <= last; + return next <= last; } @Override public Integer next() { - if (current + 1 > last) + if (next > last) { throw new NoSuchElementException(); } @@ -74,4 +71,3 @@ public class AllColsIterator implements Iterator throw new UnsupportedOperationException(); } } -