Merge remote-tracking branch

[jalview.git] / src / jalview / viewmodel / OverviewDimensionsAllVisible.java

diff --git a/src/jalview/viewmodel/OverviewDimensionsAllVisible.java b/src/jalview/viewmodel/OverviewDimensionsAllVisible.java
index 7e5c412..94d2899 100644 (file)
--- a/src/jalview/viewmodel/OverviewDimensionsAllVisible.java
+++ b/src/jalview/viewmodel/OverviewDimensionsAllVisible.java
@@ -3,10 +3,10 @@ package jalview.viewmodel;
 import jalview.api.AlignmentColsCollectionI;
 import jalview.api.AlignmentRowsCollectionI;
 import jalview.datamodel.AlignmentI;
-import jalview.datamodel.AllColsCollection;
-import jalview.datamodel.AllRowsCollection;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.HiddenSequences;
+import jalview.datamodel.VisibleColsCollection;
+import jalview.datamodel.VisibleRowsCollection;
 
 public class OverviewDimensionsAllVisible extends OverviewDimensions
 {
@@ -21,7 +21,7 @@ public class OverviewDimensionsAllVisible extends OverviewDimensions
 
   @Override
   public void updateViewportFromMouse(int mousex, int mousey,
-          HiddenSequences hiddenSeqs, ColumnSelection hiddenCols,
+          HiddenSequences hiddenSeqs, HiddenColumns hiddenCols,
           ViewportRanges ranges)
   {
     int x = mousex;
@@ -102,7 +102,7 @@ public class OverviewDimensionsAllVisible extends OverviewDimensions
 
   @Override
   public void setBoxPosition(HiddenSequences hiddenSeqs,
-          ColumnSelection hiddenCols, ViewportRanges ranges)
+          HiddenColumns hiddenCols, ViewportRanges ranges)
   {
     alwidth = ranges.getVisibleAlignmentWidth();
     alheight = ranges.getVisibleAlignmentHeight();
@@ -132,9 +132,9 @@ public class OverviewDimensionsAllVisible extends OverviewDimensions
 
   @Override
   public AlignmentColsCollectionI getColumns(ViewportRanges ranges,
-          ColumnSelection hiddenCols)
+          HiddenColumns hiddenCols)
   {
-    return new AllColsCollection(0,
+    return new VisibleColsCollection(0,
             ranges.getVisibleAlignmentWidth() - 1, hiddenCols);
   }
 
@@ -142,7 +142,7 @@ public class OverviewDimensionsAllVisible extends OverviewDimensions
   public AlignmentRowsCollectionI getRows(ViewportRanges ranges,
           AlignmentI al)
   {
-    return new AllRowsCollection(0,
+    return new VisibleRowsCollection(0,
             ranges.getVisibleAlignmentHeight() - 1, al);
   }
 }