X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FVisibleContigsIterator.java;h=6d3f43ddbd6ab5e49c2f9863da11e8215047a5cb;hb=650bed7f2109092a55ca924039a03628fef2126b;hp=ff060ac2aa56ee88a1261f3592eeca895b310e4a;hpb=fa20ec4effe2fb9205d844fd85befbe785bf1a2e;p=jalview.git diff --git a/src/jalview/datamodel/VisibleContigsIterator.java b/src/jalview/datamodel/VisibleContigsIterator.java index ff060ac..6d3f43d 100644 --- a/src/jalview/datamodel/VisibleContigsIterator.java +++ b/src/jalview/datamodel/VisibleContigsIterator.java @@ -5,7 +5,9 @@ import java.util.Iterator; import java.util.List; /** - * An iterator which iterates over visible regions in a range. + * An iterator which iterates over visible regions in a range. Provides a + * special "endsAtHidden" indicator to allow callers to determine if the final + * visible column is adjacent to a hidden region. */ public class VisibleContigsIterator implements Iterator { @@ -37,9 +39,17 @@ public class VisibleContigsIterator implements Iterator } if (hideStart > vstart) { - int[] contig = new int[] { vstart, hideStart - 1 }; - vcontigs.add(contig); - endsAtHidden = true; + if (end - 1 > hideStart - 1) + { + int[] contig = new int[] { vstart, hideStart - 1 }; + vcontigs.add(contig); + endsAtHidden = true; + } + else + { + int[] contig = new int[] { vstart, end - 1 }; + vcontigs.add(contig); + } } vstart = hideEnd + 1;