git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2808 pre-fill numeric inequality filter with min/max range value
[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
*/
* @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();
{
al = alignment;
current = firstrow;
last = lastrow;
hidden = al.getHiddenSequences();
- while (hidden.isHidden(last) && last > current)
+ while (last > current && hidden.isHidden(last))
{
last--;
}
current = firstrow;
{
last--;
}
current = firstrow;
- while (hidden.isHidden(current) && current < last)
+ while (current < last && hidden.isHidden(current))
{
current++;
}
{
current++;
}
@@
-86,7
+87,7
@@
public class VisibleRowsIterator implements Iterator<Integer>
do
{
next++;
do
{
next++;
- } while (hidden.isHidden(next) && next <= last);
+ } while (next <= last && hidden.isHidden(next));
return current;
}
return current;
}
@@
-96,4
+97,3
@@
public class VisibleRowsIterator implements Iterator<Integer>
throw new UnsupportedOperationException();
}
}
throw new UnsupportedOperationException();
}
}
-