JAL-2416 scoreMatrices removed from ResidueProperties

[jalview.git] / test / jalview / schemes / ScoreMatrixPrinter.java

diff --git a/test/jalview/schemes/ScoreMatrixPrinter.java b/test/jalview/schemes/ScoreMatrixPrinter.java
index 4e7755c..b58b56f 100644 (file)
--- a/test/jalview/schemes/ScoreMatrixPrinter.java
+++ b/test/jalview/schemes/ScoreMatrixPrinter.java
@@ -21,11 +21,10 @@
 package jalview.schemes;
 
 import jalview.analysis.scoremodels.ScoreMatrix;
+import jalview.analysis.scoremodels.ScoreModels;
 import jalview.api.analysis.ScoreModelI;
 import jalview.gui.JvOptionPane;
 
-import java.util.Map;
-
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -42,25 +41,22 @@ public class ScoreMatrixPrinter
   @Test(groups = { "Functional" })
   public void printAllMatrices()
   {
-    for (Map.Entry<String, ScoreModelI> sm : ResidueProperties.scoreMatrices
-            .entrySet())
+    for (ScoreModelI sm : ScoreModels.getInstance().getModels())
     {
-      System.out.println("Matrix " + sm.getKey());
-      System.out.println(sm.getValue().toString());
+      System.out.println("Matrix " + sm.getName());
+      System.out.println(sm.toString());
     }
   }
 
   @Test(groups = { "Functional" })
   public void printHTMLMatrices()
   {
-    for (Map.Entry<String, ScoreModelI> _sm : ResidueProperties.scoreMatrices
-            .entrySet())
+    for (ScoreModelI sm : ScoreModels.getInstance().getModels())
     {
-      if (_sm.getValue() instanceof ScoreMatrix)
+      if (sm instanceof ScoreMatrix)
       {
-        ScoreMatrix sm = (ScoreMatrix) _sm.getValue();
-        System.out.println("Matrix " + _sm.getKey());
-        System.out.println(sm.outputMatrix(true));
+        System.out.println("Matrix " + sm.getName());
+        System.out.println(((ScoreMatrix) sm).outputMatrix(true));
       }
     }
   }