JAL-2403 ScoreModelI now DistanceModelI, ScoreMatrix delegate of

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

diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java
index f96d464..d053468 100644 (file)
--- a/src/jalview/gui/PCAPanel.java
+++ b/src/jalview/gui/PCAPanel.java
@@ -20,9 +20,9 @@
  */
 package jalview.gui;
 
-import jalview.analysis.scoremodels.ScoreMatrix;
+import jalview.analysis.scoremodels.PairwiseDistanceModel;
 import jalview.analysis.scoremodels.ScoreModels;
-import jalview.api.analysis.ScoreModelI;
+import jalview.api.analysis.DistanceModelI;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AlignmentView;
@@ -157,9 +157,9 @@ public class PCAPanel extends GPCAPanel implements Runnable,
   protected void scoreMatrix_menuSelected()
   {
     scoreMatrixMenu.removeAll();
-    for (ScoreModelI sm : ScoreModels.getInstance().getModels())
+    for (DistanceModelI sm : ScoreModels.getInstance().getModels())
     {
-      if (sm instanceof ScoreMatrix)
+      if (sm instanceof PairwiseDistanceModel)
       {
         final String name = sm.getName();
         // create an entry for this score matrix for use in PCA
@@ -167,8 +167,8 @@ public class PCAPanel extends GPCAPanel implements Runnable,
         jm.setText(MessageManager.getStringOrReturn("label.score_model_",
                 name));
         jm.setSelected(pcaModel.getScore_matrix().equals(name));
-        if ((!pcaModel.isNucleotide() && !sm.isDNA())
-                || (pcaModel.isNucleotide() && sm.isDNA()))
+        if ((pcaModel.isNucleotide() && sm.isDNA())
+                || (!pcaModel.isNucleotide() && sm.isProtein()))
         {
           jm.addActionListener(new ActionListener()
           {