JAL-2388 Alignment col and row collections with iterators

[jalview.git] / src / jalview / datamodel / AllColsCollection.java

diff --git a/src/jalview/datamodel/AlignmentColsCollection.java b/src/jalview/datamodel/AllColsCollection.java
similarity index 84%
rename from src/jalview/datamodel/AlignmentColsCollection.java
rename to src/jalview/datamodel/AllColsCollection.java
index 3a9f598..1b1a5dd 100644 (file)
--- a/src/jalview/datamodel/AlignmentColsCollection.java
+++ b/src/jalview/datamodel/AllColsCollection.java
@@ -20,15 +20,17 @@
  */
 package jalview.datamodel;
 
+import jalview.api.AlignmentColsCollectionI;
+
 import java.util.Iterator;
 
-public class AlignmentColsCollection implements Iterable<Integer>
+public class AllColsCollection implements AlignmentColsCollectionI
 {
   int start;
   int end;
   ColumnSelection hidden;
   
-  public AlignmentColsCollection(int s, int e, ColumnSelection colsel)
+  public AllColsCollection(int s, int e, ColumnSelection colsel)
   {
     start = s;
     end = e;
@@ -40,10 +42,8 @@ public class AlignmentColsCollection implements Iterable<Integer>
   {
     return new AllColsIterator(start,end,hidden);
   }
-  
-  /**
-   * Answers if the column at the the current position is hidden.
-   */
+
+  @Override
   public boolean isHidden(int c)
   {
     return !hidden.isVisible(c);