X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FRangeElementsIterator.java;h=9ca6b2a0d39c549f5bb1b8b4a79b18613955c0fc;hb=afffa24481a7d3cb65ae41e0948c16a5f490f302;hp=ca6c4f7148e102fa39ea93cab7c8192530312d72;hpb=fc2e3528b130c13e655058493637eb2b624c0759;p=jalview.git
diff --git a/src/jalview/datamodel/RangeElementsIterator.java b/src/jalview/datamodel/RangeElementsIterator.java
index ca6c4f7..9ca6b2a 100644
--- a/src/jalview/datamodel/RangeElementsIterator.java
+++ b/src/jalview/datamodel/RangeElementsIterator.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.datamodel;
import java.util.Iterator;
@@ -23,29 +43,27 @@ public class RangeElementsIterator implements Iterator
private int[] nextRange = null;
- RangeElementsIterator(int from, int to, Iterator it)
+ RangeElementsIterator(Iterator it)
{
- last = to;
- current = from;
- next = from;
rangeIterator = it;
if (rangeIterator.hasNext())
{
nextRange = rangeIterator.next();
+ next = nextRange[0];
+ last = nextRange[1];
}
- checkNextRange();
}
@Override
public boolean hasNext()
{
- return next <= last;
+ return rangeIterator.hasNext() || next <= last;
}
@Override
public Integer next()
{
- if (next > last)
+ if (!hasNext())
{
throw new NoSuchElementException();
}
@@ -66,12 +84,13 @@ public class RangeElementsIterator implements Iterator
*/
private void checkNextRange()
{
- if (nextRange != null && next >= nextRange[0])
+ if (nextRange != null && next > nextRange[1])
{
- next = nextRange[1] + 1;
if (rangeIterator.hasNext())
{
nextRange = rangeIterator.next();
+ next = nextRange[0];
+ last = nextRange[1];
}
else
{