JAL-1632 JAL-2416 load score matrices from file, as float[][]

[jalview.git] / src / jalview / gui / TreeChooser.java

diff --git a/src/jalview/gui/TreeChooser.java b/src/jalview/gui/TreeChooser.java
index 338fbb8..40c683d 100644 (file)
--- a/src/jalview/gui/TreeChooser.java
+++ b/src/jalview/gui/TreeChooser.java
@@ -85,12 +85,10 @@ public class TreeChooser extends JPanel
 
     matrixNames = new JComboBox<String>();
     ScoreModels scoreModels = ScoreModels.getInstance();
-    for (String scoreType : scoreModels.getModelNames())
+    for (ScoreModelI sm : scoreModels.getModels())
     {
-      ScoreModelI sm = scoreModels.forName(scoreType);
-      if (sm.isDNA() == af.getViewport().getAlignment().isNucleotide()
-              || sm.isProtein() == !af.getViewport().getAlignment()
-                      .isNucleotide())
+      boolean nucleotide = af.getViewport().getAlignment().isNucleotide();
+      if (sm.isDNA() && nucleotide || sm.isProtein() && !nucleotide)
       {
         matrixNames.addItem(sm.getName());
       }