X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FVisibleContigsIterator.java;h=9198de8086ebc42f73416554f7b83dc6874efa24;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=d7594f92420584a1856318b5be87b9d42870048d;hpb=f57d1d3437767e14c2bf711af0e06c13b9d18cd4;p=jalview.git
diff --git a/src/jalview/datamodel/VisibleContigsIterator.java b/src/jalview/datamodel/VisibleContigsIterator.java
index d7594f9..9198de8 100644
--- a/src/jalview/datamodel/VisibleContigsIterator.java
+++ b/src/jalview/datamodel/VisibleContigsIterator.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.ArrayList;
@@ -5,7 +25,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
{
@@ -13,8 +35,9 @@ public class VisibleContigsIterator implements Iterator
private int currentPosition = 0;
- VisibleContigsIterator(int start, int end,
- List hiddenColumns)
+ private boolean endsAtHidden = false;
+
+ VisibleContigsIterator(int start, int end, List hiddenColumns)
{
if (hiddenColumns != null && hiddenColumns.size() > 0)
{
@@ -24,6 +47,7 @@ public class VisibleContigsIterator implements Iterator
for (int[] region : hiddenColumns)
{
+ endsAtHidden = false;
hideStart = region[0];
hideEnd = region[1];
@@ -34,8 +58,17 @@ public class VisibleContigsIterator implements Iterator
}
if (hideStart > vstart)
{
- int[] contig = new int[] { vstart, hideStart - 1 };
- vcontigs.add(contig);
+ 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;
@@ -50,6 +83,7 @@ public class VisibleContigsIterator implements Iterator
{
int[] contig = new int[] { vstart, end - 1 };
vcontigs.add(contig);
+ endsAtHidden = false;
}
}
else
@@ -72,5 +106,9 @@ public class VisibleContigsIterator implements Iterator
currentPosition++;
return result;
}
-}
+ public boolean endsAtHidden()
+ {
+ return endsAtHidden;
+ }
+}