From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Wed, 25 Oct 2017 18:26:34 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=062ebc02980364930ceb26dd6c06448af971fe20;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
---

062ebc02980364930ceb26dd6c06448af971fe20
diff --cc src/jalview/gui/CalculationChooser.java
index 83445b4,e403dba..fe96eaa
--- a/src/jalview/gui/CalculationChooser.java
+++ b/src/jalview/gui/CalculationChooser.java
@@@ -106,8 -103,13 +106,13 @@@ public class CalculationChooser extend
  
    final ComboBoxTooltipRenderer renderer = new ComboBoxTooltipRenderer();
  
 -  List<String> tips = new ArrayList<String>();
 +  List<String> tips = new ArrayList<>();
  
+   /*
+    * the most recently opened PCA results panel
+    */
+   private PCAPanel pcaPanel;
+ 
    /**
     * Constructor
     *