JAL-2388 Tidies

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

diff --git a/src/jalview/viewmodel/OverviewDimensionsAllVisible.java b/src/jalview/viewmodel/OverviewDimensionsAllVisible.java
index 02f3e17..b30cc78 100644 (file)
--- a/src/jalview/viewmodel/OverviewDimensionsAllVisible.java
+++ b/src/jalview/viewmodel/OverviewDimensionsAllVisible.java
@@ -3,27 +3,20 @@ 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.HiddenSequences;
+import jalview.datamodel.VisibleColsCollection;
+import jalview.datamodel.VisibleRowsCollection;
 
 public class OverviewDimensionsAllVisible extends OverviewDimensions
 {
-  private float pixelsPerCol;
-
-  private float pixelsPerSeq;
-
   public OverviewDimensionsAllVisible(ViewportRanges ranges,
           boolean showAnnotationPanel)
   {
     super(ranges, showAnnotationPanel);
 
-    int alwidth = ranges.getVisibleAlignmentWidth();
-    int alheight = ranges.getVisibleAlignmentHeight();
-
-    pixelsPerCol = (float) width / alwidth;
-    pixelsPerSeq = (float) sequencesHeight / alheight;
+    alwidth = ranges.getVisibleAlignmentWidth();
+    alheight = ranges.getVisibleAlignmentHeight();
   }
 
   @Override
@@ -34,8 +27,8 @@ public class OverviewDimensionsAllVisible extends OverviewDimensions
     int x = mousex;
     int y = mousey;
 
-    int alwidth = ranges.getVisibleAlignmentWidth();
-    int alheight = ranges.getVisibleAlignmentHeight();
+    alwidth = ranges.getVisibleAlignmentWidth();
+    alheight = ranges.getVisibleAlignmentHeight();
 
     if (x < 0)
     {
@@ -111,8 +104,8 @@ public class OverviewDimensionsAllVisible extends OverviewDimensions
   public void setBoxPosition(HiddenSequences hiddenSeqs,
           ColumnSelection hiddenCols, ViewportRanges ranges)
   {
-    int alwidth = ranges.getVisibleAlignmentWidth();
-    int alheight = ranges.getVisibleAlignmentHeight();
+    alwidth = ranges.getVisibleAlignmentWidth();
+    alheight = ranges.getVisibleAlignmentHeight();
 
     // work with visible values of startRes and endRes
     int startRes = ranges.getStartRes();
@@ -141,7 +134,7 @@ public class OverviewDimensionsAllVisible extends OverviewDimensions
   public AlignmentColsCollectionI getColumns(ViewportRanges ranges,
           ColumnSelection hiddenCols)
   {
-    return new AllColsCollection(0,
+    return new VisibleColsCollection(0,
             ranges.getVisibleAlignmentWidth() - 1, hiddenCols);
   }
 
@@ -149,19 +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);
   }
-
-  @Override
-  public float getPixelsPerCol()
-  {
-    return pixelsPerCol;
-  }
-
-  @Override
-  public float getPixelsPerSeq()
-  {
-    return pixelsPerSeq;
-  }
 }