X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FHiddenColumns.java;h=2d43f025f7bc6746b216f37d9aee2feb13330bb1;hb=3edf7ac9c103688aa89a9a7f7bc56fca46403ad4;hp=4b647db7ec0856319b353c2ab7ae7e3a854f8784;hpb=fc2e3528b130c13e655058493637eb2b624c0759;p=jalview.git diff --git a/src/jalview/datamodel/HiddenColumns.java b/src/jalview/datamodel/HiddenColumns.java index 4b647db..2d43f02 100644 --- a/src/jalview/datamodel/HiddenColumns.java +++ b/src/jalview/datamodel/HiddenColumns.java @@ -469,6 +469,10 @@ public class HiddenColumns } } + /** + * Answers true if obj is an instance of HiddenColumns, and holds the same + * array of start-end column ranges as this, else answers false + */ @Override public boolean equals(Object obj) { @@ -1045,7 +1049,7 @@ public class HiddenColumns * @param end * position to end at (inclusive, visible column position) */ - public Iterator getBoundedStartIterator(int start, int end) + public Iterator getStartRegionIterator(int start, int end) { try { @@ -1062,7 +1066,7 @@ public class HiddenColumns HiddenCursorPosition pos = cursor .findRegionForColumn(absoluteStart - 1, false); - return new BoundedStartRegionIterator(pos, start, end, + return new StartRegionIterator(pos, start, end, hiddenColumns); } finally { @@ -1084,8 +1088,8 @@ public class HiddenColumns 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();