From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 30 Mar 2017 14:19:38 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2435splitScreenFont
X-Git-Tag: Release_2_10_2~3^2~91^2~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=521b4513449cabf0e64b9c70c70c304d6bf2f7e3;p=jalview.git

Merge branch 'develop' into features/JAL-2435splitScreenFont
---

521b4513449cabf0e64b9c70c70c304d6bf2f7e3
diff --cc src/jalview/api/AlignViewportI.java
index 2401593,8b07340..0239762
--- a/src/jalview/api/AlignViewportI.java
+++ b/src/jalview/api/AlignViewportI.java
@@@ -33,9 -33,9 +33,10 @@@ import jalview.datamodel.SequenceGroup
  import jalview.datamodel.SequenceI;
  import jalview.renderer.ResidueShaderI;
  import jalview.schemes.ColourSchemeI;
+ import jalview.viewmodel.ViewportRanges;
  
  import java.awt.Color;
 +import java.awt.Font;
  import java.util.Hashtable;
  import java.util.List;
  import java.util.Map;
diff --cc src/jalview/appletgui/AlignViewport.java
index b7dc5c4,065c503..cb0b197
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@@ -40,12 -39,12 +39,13 @@@ import jalview.structure.SelectionSourc
  import jalview.structure.StructureSelectionManager;
  import jalview.structure.VamsasSource;
  import jalview.viewmodel.AlignmentViewport;
+ import jalview.viewmodel.ViewportRanges;
  
  import java.awt.Font;
 +import java.awt.FontMetrics;
  
  public class AlignViewport extends AlignmentViewport implements
-         SelectionSource, VamsasSource, CommandListener
+         SelectionSource
  {
    boolean cursorMode = false;