git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
datamodel
/
VisibleColsCollection.java
diff --git
a/src/jalview/datamodel/VisibleColsCollection.java
b/src/jalview/datamodel/VisibleColsCollection.java
index
86233ab
..
4ca51b5
100644
(file)
--- a/
src/jalview/datamodel/VisibleColsCollection.java
+++ b/
src/jalview/datamodel/VisibleColsCollection.java
@@
-27,21
+27,22
@@
import java.util.Iterator;
public class VisibleColsCollection implements AlignmentColsCollectionI
{
int start;
public class VisibleColsCollection implements AlignmentColsCollectionI
{
int start;
+
int end;
HiddenColumns hidden;
int end;
HiddenColumns hidden;
- public VisibleColsCollection(int s, int e, AlignmentI al)
+ public VisibleColsCollection(int s, int e, HiddenColumns h)
{
start = s;
end = e;
{
start = s;
end = e;
- hidden = al.getHiddenColumns();
+ hidden = h;
}
@Override
public Iterator<Integer> iterator()
{
}
@Override
public Iterator<Integer> iterator()
{
- return new VisibleColsIterator(start, end, hidden);
+ return hidden.getVisibleColsIterator(start, end);
}
@Override
}
@Override
@@
-50,4
+51,10
@@
public class VisibleColsCollection implements AlignmentColsCollectionI
return false;
}
return false;
}
+ @Override
+ public boolean hasHidden()
+ {
+ return false;
+ }
+
}
}