Merge branch 'improvement/JAL-4023_snotation_for_trees' into develop

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

diff --git a/src/jalview/datamodel/VisibleRowsIterator.java b/src/jalview/datamodel/VisibleRowsIterator.java
index 0259fd3..e2fdff6 100644 (file)
--- 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();
   }
 }
-