JAL-3725 restrict mapped virtual feature location to mapped region

[jalview.git] / src / jalview / datamodel / AllColsIterator.java

diff --git a/src/jalview/datamodel/AllColsIterator.java b/src/jalview/datamodel/AllColsIterator.java
index 4e1ff2e..1ff6a66 100644 (file)
--- a/src/jalview/datamodel/AllColsIterator.java
+++ b/src/jalview/datamodel/AllColsIterator.java
@@ -38,27 +38,24 @@ public class AllColsIterator implements Iterator<Integer>
 
   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<Integer>
     throw new UnsupportedOperationException();
   }
 }
-