JAL-2388 Missed commit

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

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index a621989..54d2be7 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -62,8 +62,6 @@ public class SeqCanvas extends JComponent
 
   AlignViewport av;
 
-  SearchResultsI searchResults = null;
-
   boolean fastPaint = false;
 
   int LABEL_WEST;
@@ -281,10 +279,10 @@ public class SeqCanvas extends JComponent
     gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
             imgHeight, -horizontal * charWidth, -vertical * charHeight);
 
-    int sr = av.startRes;
-    int er = av.endRes;
-    int ss = av.startSeq;
-    int es = av.endSeq;
+    int sr = av.getStartRes();
+    int er = av.getEndRes();
+    int ss = av.getStartSeq();
+    int es = av.getEndSeq();
     int transX = 0;
     int transY = 0;
 
@@ -302,9 +300,9 @@ public class SeqCanvas extends JComponent
     {
       ss = es - vertical;
 
-      if (ss < av.startSeq)
+      if (ss < av.getStartSeq())
       { // ie scrolling too fast, more than a page at a time
-        ss = av.startSeq;
+        ss = av.getStartSeq();
       }
       else
       {
@@ -315,9 +313,9 @@ public class SeqCanvas extends JComponent
     {
       es = ss - vertical;
 
-      if (es > av.endSeq)
+      if (es > av.getEndSeq())
       {
-        es = av.endSeq;
+        es = av.getEndSeq();
       }
     }
 
@@ -399,11 +397,12 @@ public class SeqCanvas extends JComponent
 
     if (av.getWrapAlignment())
     {
-      drawWrappedPanel(gg, getWidth(), getHeight(), av.startRes);
+      drawWrappedPanel(gg, getWidth(), getHeight(), av.getStartRes());
     }
     else
     {
-      drawPanel(gg, av.startRes, av.endRes, av.startSeq, av.endSeq, 0);
+      drawPanel(gg, av.getStartRes(), av.getEndRes(), av.getStartSeq(),
+              av.getEndSeq(), 0);
     }
 
     g.drawImage(lcimg, 0, 0, this);
@@ -505,7 +504,7 @@ public class SeqCanvas extends JComponent
 
     av.setWrappedWidth(cWidth);
 
-    av.endRes = av.startRes + cWidth;
+    av.setEndRes(av.getStartRes() + cWidth);
 
     int endx;
     int ypos = hgap;
@@ -740,10 +739,10 @@ public class SeqCanvas extends JComponent
 
       // / Highlight search Results once all sequences have been drawn
       // ////////////////////////////////////////////////////////
-      if (searchResults != null)
+      if (av.hasSearchResults())
       {
-        int[] visibleResults = searchResults.getResults(nextSeq, startRes,
-                endRes);
+        int[] visibleResults = av.getSearchResults().getResults(nextSeq,
+                startRes, endRes);
         if (visibleResults != null)
         {
           for (int r = 0; r < visibleResults.length; r += 2)
@@ -969,7 +968,7 @@ public class SeqCanvas extends JComponent
   {
     img = null;
 
-    searchResults = results;
+    av.setSearchResults(results);
 
     repaint();
   }