From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Mon, 20 Nov 2017 15:32:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/releases/Release_2_10_3_Branch'
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7dbf1fca15e0828b0bcad5769892e77e03916795;p=jalview.git

Merge remote-tracking branch 'origin/releases/Release_2_10_3_Branch'
into kjvdh/features/PhylogenyViewer

Conflicts:
	.classpath
---

7dbf1fca15e0828b0bcad5769892e77e03916795
diff --cc .classpath
index 42e9500,d704f10..0d114d8
--- a/.classpath
+++ b/.classpath
@@@ -68,7 -68,6 +68,7 @@@
  	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
  	<classpathentry kind="lib" path="lib/biojava-core-4.1.0.jar"/>
  	<classpathentry kind="lib" path="lib/biojava-ontology-4.1.0.jar"/>
- 	<classpathentry kind="lib" path="lib/groovy-all-2.4.6-indy.jar"/>
+ 	<classpathentry kind="lib" path="lib/groovy-all-2.4.12-indy.jar"/>
 +	<classpathentry combineaccessrules="false" kind="src" path="/forester"/>
  	<classpathentry kind="output" path="classes"/>
  </classpath>
diff --cc src/jalview/fts/core/GFTSPanel.java
index e0bf9b2,9802d4b..da65ddf
--- a/src/jalview/fts/core/GFTSPanel.java
+++ b/src/jalview/fts/core/GFTSPanel.java
@@@ -88,9 -89,10 +89,10 @@@ public abstract class GFTSPanel extend
    protected JInternalFrame mainFrame = new JInternalFrame(
            getFTSFrameTitle());
  
+   protected JTabbedPane tabs = new JTabbedPane();
    protected IProgressIndicator progressIndicator;
  
 -  protected JComboBox<FTSDataColumnI> cmb_searchTarget = new JComboBox<FTSDataColumnI>();
 +  protected JComboBox<FTSDataColumnI> cmb_searchTarget = new JComboBox<>();
  
    protected JButton btn_ok = new JButton();