From: kiramt Date: Mon, 15 Jan 2018 10:28:27 +0000 (+0000) Subject: JAL-2759 Renamed BoundedHiddenColsIterator to HiddenColsIterator X-Git-Tag: Release_2_10_4~55^2~1^2~46 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ce80b67256a6d4bd3b6a52adeec279229e2fe442;p=jalview.git JAL-2759 Renamed BoundedHiddenColsIterator to HiddenColsIterator --- diff --git a/src/jalview/datamodel/BoundedHiddenColsIterator.java b/src/jalview/datamodel/HiddenColsIterator.java similarity index 93% rename from src/jalview/datamodel/BoundedHiddenColsIterator.java rename to src/jalview/datamodel/HiddenColsIterator.java index 8ec2a4d..610445c 100644 --- a/src/jalview/datamodel/BoundedHiddenColsIterator.java +++ b/src/jalview/datamodel/HiddenColsIterator.java @@ -9,7 +9,7 @@ import java.util.List; * a copy of the hidden columns collection. Intended to be used by callers * OUTSIDE of HiddenColumns. */ -public class BoundedHiddenColsIterator implements Iterator +public class HiddenColsIterator implements Iterator { // current index in hiddenColumns private int currentPosition = 0; @@ -23,7 +23,7 @@ public class BoundedHiddenColsIterator implements Iterator /** * Unbounded constructor */ - BoundedHiddenColsIterator(List hiddenColumns) + HiddenColsIterator(List hiddenColumns) { if (hiddenColumns != null) { @@ -44,7 +44,7 @@ public class BoundedHiddenColsIterator implements Iterator * @param upperBound * upper bound to iterate to */ - BoundedHiddenColsIterator(int lowerBound, int upperBound, + HiddenColsIterator(int lowerBound, int upperBound, List hiddenColumns) { init(lowerBound, upperBound, hiddenColumns); diff --git a/src/jalview/datamodel/HiddenColumns.java b/src/jalview/datamodel/HiddenColumns.java index 8716a67..ef80b32 100644 --- a/src/jalview/datamodel/HiddenColumns.java +++ b/src/jalview/datamodel/HiddenColumns.java @@ -1427,7 +1427,7 @@ public class HiddenColumns try { LOCK.readLock().lock(); - return new BoundedHiddenColsIterator(hiddenColumns); + return new HiddenColsIterator(hiddenColumns); } finally { LOCK.readLock().unlock(); @@ -1448,7 +1448,7 @@ public class HiddenColumns try { LOCK.readLock().lock(); - return new BoundedHiddenColsIterator(start, end, hiddenColumns); + return new HiddenColsIterator(start, end, hiddenColumns); } finally { LOCK.readLock().unlock();