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
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
datamodel
/
HiddenColumns.java
diff --git
a/src/jalview/datamodel/HiddenColumns.java
b/src/jalview/datamodel/HiddenColumns.java
index
4b647db
..
a7e93da
100644
(file)
--- a/
src/jalview/datamodel/HiddenColumns.java
+++ b/
src/jalview/datamodel/HiddenColumns.java
@@
-1045,7
+1045,7
@@
public class HiddenColumns
* @param end
* position to end at (inclusive, visible column position)
*/
* @param end
* position to end at (inclusive, visible column position)
*/
- public Iterator<Integer> getBoundedStartIterator(int start, int end)
+ public Iterator<Integer> getStartRegionIterator(int start, int end)
{
try
{
{
try
{
@@
-1062,7
+1062,7
@@
public class HiddenColumns
HiddenCursorPosition pos = cursor
.findRegionForColumn(absoluteStart - 1, false);
HiddenCursorPosition pos = cursor
.findRegionForColumn(absoluteStart - 1, false);
- return new BoundedStartRegionIterator(pos, start, end,
+ return new StartRegionIterator(pos, start, end,
hiddenColumns);
} finally
{
hiddenColumns);
} finally
{
@@
-1084,8
+1084,8
@@
public class HiddenColumns
try
{
LOCK.readLock().lock();
try
{
LOCK.readLock().lock();
- return new RangeElementsIterator(start, end,
- new RangeIterator(hiddenColumns));
+ return new RangeElementsIterator(
+ new VisibleContigsIterator(start, end + 1, hiddenColumns));
} finally
{
LOCK.readLock().unlock();
} finally
{
LOCK.readLock().unlock();