git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a9def7 2e78324)
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Wed, 25 Oct 2017 18:26:34 +0000 (19:26 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Wed, 25 Oct 2017 18:26:34 +0000 (19:26 +0100)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/CalculationChooser.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/CalculationChooser.java
index 83445b4,e403dba..fe96eaa
--- 1/src/jalview/gui/CalculationChooser.java
--- 2/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
     *