Merge branch 'docs/2_8_1_Release' into Release_2_8_2_Branch

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

diff --git a/test/jalview/schemes/ScoreMatrixPrinter.java b/test/jalview/schemes/ScoreMatrixPrinter.java
index e15c30b..2830918 100644 (file)
--- a/test/jalview/schemes/ScoreMatrixPrinter.java
+++ b/test/jalview/schemes/ScoreMatrixPrinter.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -14,9 +14,12 @@
  * PURPOSE.  See the GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.schemes;
 
+import jalview.api.analysis.ScoreModelI;
+
 import java.util.Map;
 
 import org.junit.Test;
@@ -27,7 +30,7 @@ public class ScoreMatrixPrinter
   @Test
   public void printAllMatrices()
   {
-    for (Map.Entry<String,ScoreMatrix> sm:((Map<String, ScoreMatrix>) ResidueProperties.scoreMatrices).entrySet())
+    for (Map.Entry<String,ScoreModelI> sm: ResidueProperties.scoreMatrices.entrySet())
     {
       System.out.println("Matrix "+sm.getKey());
       System.out.println(sm.getValue().toString());
@@ -36,10 +39,14 @@ public class ScoreMatrixPrinter
   @Test
   public void printHTMLMatrices()
   {
-    for (Map.Entry<String,ScoreMatrix> sm:((Map<String, ScoreMatrix>) ResidueProperties.scoreMatrices).entrySet())
+    for (Map.Entry<String,ScoreModelI> _sm: ResidueProperties.scoreMatrices.entrySet())
     {
-      System.out.println("Matrix "+sm.getKey());
-      System.out.println(sm.getValue().outputMatrix(true));
+      if (_sm.getValue() instanceof ScoreMatrix)
+      {
+        ScoreMatrix sm = (ScoreMatrix) _sm.getValue();
+        System.out.println("Matrix "+_sm.getKey());
+        System.out.println(sm.outputMatrix(true));
+      }
     }
   }