From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 25 Oct 2017 14:53:29 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2727closeAllFreeMemory' into develop
X-Git-Tag: Release_2_10_3b1~74
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bf8275c621048462bd0275e31bf490dca443b477;p=jalview.git

Merge branch 'bug/JAL-2727closeAllFreeMemory' into develop
---

bf8275c621048462bd0275e31bf490dca443b477
diff --cc src/jalview/api/AlignViewportI.java
index 3cb06c1,248bae2..931eba6
--- a/src/jalview/api/AlignViewportI.java
+++ b/src/jalview/api/AlignViewportI.java
@@@ -483,6 -494,9 +484,10 @@@ public interface AlignViewportI extend
     * 
     * @return
     */
 +  @Override
    void setProteinFontAsCdna(boolean b);
+ 
+   public abstract TreeModel getCurrentTree();
+ 
+   public abstract void setCurrentTree(TreeModel tree);
  }
diff --cc src/jalview/gui/AlignmentPanel.java
index 07c65fe,c8a0e1a..3a1dbe8
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@@ -476,10 -482,10 +475,10 @@@ public class AlignmentPanel extends GAl
      }
      else
      {
-       scrollNeeded = vpRanges.scrollToWrappedVisible(start);
+       scrollNeeded = ranges.scrollToWrappedVisible(start);
      }
  
 -    paintAlignment(redrawOverview);
 +    paintAlignment(redrawOverview, false);
  
      return scrollNeeded;
    }
@@@ -632,12 -637,12 +632,12 @@@
        }
        else
        {
 -        int widthInRes = (canvasWidth / av.getCharWidth()) - 1;
 +        int widthInRes = (canvasWidth / av.getCharWidth());
          int heightInSeq = (getSeqPanel().seqCanvas.getHeight()
 -                / av.getCharHeight()) - 1;
 +                / av.getCharHeight());
  
-         vpRanges.setViewportWidth(widthInRes);
-         vpRanges.setViewportHeight(heightInSeq);
+         ranges.setViewportWidth(widthInRes);
+         ranges.setViewportHeight(heightInSeq);
        }
      }
  
@@@ -766,9 -773,12 +768,9 @@@
        {
          return;
        }
-       vpRanges.setViewportStartAndHeight(y, height);
+       ranges.setViewportStartAndHeight(y, height);
      }
 -    if (!fastPaint)
 -    {
 -      repaint();
 -    }
 +    repaint();
    }
  
    /**