JAL-2388 Make startRes,startSeq,endRes,endSeq private with get/setters

[jalview.git] / src / jalview / gui / AlignmentPanel.java

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 146df38..552d166 100644 (file)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -467,7 +467,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
     if (res < av.getStartRes() || res >= (av.getStartRes() + cwidth))
     {
       vscroll.setValue((res / cwidth));
-      av.startRes = vscroll.getValue() * cwidth;
+      av.setStartRes(vscroll.getValue() * cwidth);
     }
 
   }
@@ -591,7 +591,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
     fontChanged();
     setAnnotationVisible(av.isShowAnnotation());
     boolean wrap = av.getWrapAlignment();
-    av.startSeq = 0;
+    av.setStartSeq(0);
     scalePanelHolder.setVisible(!wrap);
     hscroll.setVisible(!wrap);
     idwidthAdjuster.setVisible(!wrap);
@@ -734,7 +734,6 @@ public class AlignmentPanel extends GAlignmentPanel implements
       x = 0;
     }
 
-
     // update endRes after x has (possibly) been adjusted
     av.setEndRes((x + (getSeqPanel().seqCanvas.getWidth() / av
             .getCharWidth())) - 1);
@@ -811,8 +810,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
       overviewPanel.setBoxPosition();
     }
 
-    int scrollX = av.startRes - oldX;
-    int scrollY = av.startSeq - oldY;
+    int scrollX = av.getStartRes() - oldX;
+    int scrollY = av.getStartSeq() - oldY;
 
     if (av.getWrapAlignment() || !fastPaint)
     {
@@ -822,13 +821,13 @@ public class AlignmentPanel extends GAlignmentPanel implements
     {
       // Make sure we're not trying to draw a panel
       // larger than the visible window
-      if (scrollX > av.endRes - av.startRes)
+      if (scrollX > av.getEndRes() - av.getStartRes())
       {
-        scrollX = av.endRes - av.startRes;
+        scrollX = av.getEndRes() - av.getStartRes();
       }
-      else if (scrollX < av.startRes - av.endRes)
+      else if (scrollX < av.getStartRes() - av.getEndRes())
       {
-        scrollX = av.startRes - av.endRes;
+        scrollX = av.getStartRes() - av.getEndRes();
       }
 
       if (scrollX != 0 || scrollY != 0)