X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FVisibleRowsIterator.java;h=e2fdff6efbf020032d6bca00eae29970f2adc6fc;hb=ca8504cf9d10874dce9f07cf7a9d933853fe0dd0;hp=0259fd308aa2b999d8fcab7e161695ad61d2e64c;hpb=2ca081eebf90c6731cd79bde140ca2fecc9c9644;p=jalview.git

diff --git a/src/jalview/datamodel/VisibleRowsIterator.java b/src/jalview/datamodel/VisibleRowsIterator.java
index 0259fd3..e2fdff6 100644
--- a/src/jalview/datamodel/VisibleRowsIterator.java
+++ b/src/jalview/datamodel/VisibleRowsIterator.java
@@ -51,18 +51,19 @@ public class VisibleRowsIterator implements Iterator<Integer>
    * @param alignment
    *          alignment to work with
    */
-  public VisibleRowsIterator(int firstrow, int lastrow, AlignmentI alignment)
+  public VisibleRowsIterator(int firstrow, int lastrow,
+          AlignmentI alignment)
   {
     al = alignment;
     current = firstrow;
     last = lastrow;
     hidden = al.getHiddenSequences();
-    while (hidden.isHidden(last) && last > current)
+    while (last > current && hidden.isHidden(last))
     {
       last--;
     }
     current = firstrow;
-    while (hidden.isHidden(current) && current < last)
+    while (current < last && hidden.isHidden(current))
     {
       current++;
     }
@@ -86,7 +87,7 @@ public class VisibleRowsIterator implements Iterator<Integer>
     do
     {
       next++;
-    } while (hidden.isHidden(next) && next <= last);
+    } while (next <= last && hidden.isHidden(next));
     return current;
   }
 
@@ -96,4 +97,3 @@ public class VisibleRowsIterator implements Iterator<Integer>
     throw new UnsupportedOperationException();
   }
 }
-