From: kiramt <k.mourao@dundee.ac.uk>
Date: Tue, 21 Nov 2017 10:27:55 +0000 (+0000)
Subject: Merge branch 'develop' into feature/JAL-2759
X-Git-Tag: Release_2_10_4~55^2~1^2~60
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d5702bf3268c2688e90d645ec635ad5bb5d3a76e;p=jalview.git

Merge branch 'develop' into feature/JAL-2759

Conflicts:
	benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
	src/jalview/gui/AlignViewport.java
---

d5702bf3268c2688e90d645ec635ad5bb5d3a76e
diff --cc src/jalview/gui/AlignViewport.java
index 14c4022,4d09084..0e93da9
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@@ -22,7 -22,7 +22,6 @@@ package jalview.gui
  
  import jalview.analysis.AlignmentUtils;
  import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
--import jalview.analysis.TreeModel;
  import jalview.api.AlignViewportI;
  import jalview.api.AlignmentViewPanel;
  import jalview.api.FeatureColourI;
@@@ -36,7 -36,7 +35,6 @@@ import jalview.datamodel.Alignment
  import jalview.datamodel.AlignmentI;
  import jalview.datamodel.ColumnSelection;
  import jalview.datamodel.HiddenColumns;
--import jalview.datamodel.PDBEntry;
  import jalview.datamodel.SearchResults;
  import jalview.datamodel.SearchResultsI;
  import jalview.datamodel.SequenceGroup;
@@@ -58,11 -58,10 +56,9 @@@ import java.awt.Dimension
  import java.awt.Font;
  import java.awt.FontMetrics;
  import java.awt.Rectangle;
--import java.util.ArrayList;
  import java.util.Hashtable;
 +import java.util.Iterator;
  import java.util.List;
--import java.util.Vector;
  
  import javax.swing.JInternalFrame;