JAL-2805 loads of file reorganizing, interfaces expanded

[jalview.git] / src / jalview / ext / forester / ForesterMatrix.java

diff --git a/src/jalview/ext/forester/ForesterMatrix.java b/src/jalview/ext/forester/ForesterMatrix.java
index a1381be..a12dc1d 100644 (file)
--- a/src/jalview/ext/forester/ForesterMatrix.java
+++ b/src/jalview/ext/forester/ForesterMatrix.java
@@ -31,7 +31,6 @@ public class ForesterMatrix implements DistanceMatrix
     this.identifiers = new String[matrixSequences.length];
 
     int i = 0;
-
     for (SequenceI sequence : matrixSequences)
     {
       identifiers[i] = sequence.getName();
@@ -167,13 +166,8 @@ public class ForesterMatrix implements DistanceMatrix
           final MatrixI jalviewInputMatrix,
           final SequenceI[] matrixSequences)
   {
-    if (jalviewInputMatrix.width() != jalviewInputMatrix.height())
-    {
-      // some kind of warning?
-    }
-    DistanceMatrix foresterMatrix = new ForesterMatrix(jalviewInputMatrix,
-            matrixSequences);
-    return foresterMatrix;
+    return DataConversions.createForesterDistanceMatrix(
+            jalviewInputMatrix, matrixSequences);
 
   }
 
@@ -181,14 +175,8 @@ public class ForesterMatrix implements DistanceMatrix
           final MatrixI jalviewInputMatrix,
           final String[] matrixIdentifiers)
   {
-    if (jalviewInputMatrix.width() != jalviewInputMatrix.height())
-    {
-      // some kind of warning?
-    }
-
-    DistanceMatrix foresterMatrix = new ForesterMatrix(jalviewInputMatrix,
-            matrixIdentifiers);
-    return foresterMatrix;
+    return DataConversions.createForesterDistanceMatrix(
+            jalviewInputMatrix, matrixIdentifiers);
 
   }