X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FTreeModel.java;h=a50634ecf6178632561e498458857b969fe19a46;hb=24de2d6a6f3db1b9d55f367e2bf8ba112e202a8a;hp=62b05944c3c9d8bb67864d74ccf62d45303e7b8d;hpb=2ff143c5a47bd7bde7409ce1457bf84e332660a8;p=jalview.git

diff --git a/src/jalview/analysis/TreeModel.java b/src/jalview/analysis/TreeModel.java
index 62b0594..a50634e 100644
--- a/src/jalview/analysis/TreeModel.java
+++ b/src/jalview/analysis/TreeModel.java
@@ -77,10 +77,11 @@ public class TreeModel
    * @param treefile
    *          NewickFile
    */
-  public TreeModel(SequenceI[] seqs, AlignmentView odata, NewickFile treefile)
+  public TreeModel(SequenceI[] seqs, AlignmentView odata,
+          NewickFile treefile)
   {
-    this(seqs, treefile.getTree(), treefile.HasDistances(), treefile
-            .HasBootstrap(), treefile.HasRootDistance());
+    this(seqs, treefile.getTree(), treefile.HasDistances(),
+            treefile.HasBootstrap(), treefile.HasRootDistance());
     seqData = odata;
 
     associateLeavesToSequences(seqs);
@@ -93,8 +94,9 @@ public class TreeModel
    */
   public TreeModel(TreeBuilder tree)
   {
-    this(tree.getSequences(), tree.getTopNode(), tree.hasDistances(), tree
-            .hasBootstrap(), tree.hasRootDistance());
+    this(tree.getSequences(), tree.getTopNode(), tree.hasDistances(),
+            tree.hasBootstrap(), tree.hasRootDistance());
+    seqData = tree.getOriginalData();
   }
 
   /**
@@ -186,8 +188,12 @@ public class TreeModel
   {
     NewickFile fout = new NewickFile(getTopNode());
 
-    return fout.print(hasBootstrap(), hasDistances(),
-            hasRootDistance()); // output all data available for tree
+    return fout.print(hasBootstrap(), hasDistances(), hasRootDistance()); // output
+                                                                          // all
+                                                                          // data
+                                                                          // available
+                                                                          // for
+                                                                          // tree
   }
 
   /**
@@ -247,8 +253,8 @@ public class TreeModel
           if (!leaf.isPlaceholder())
           {
             // Construct a new placeholder sequence object for this leaf
-            leaf.setElement(new Sequence(leaf.getName(),
-                    "THISISAPLACEHLDER"));
+            leaf.setElement(
+                    new Sequence(leaf.getName(), "THISISAPLACEHLDER"));
           }
           leaf.setPlaceholder(true);
 
@@ -455,30 +461,6 @@ public class TreeModel
   }
 
   /**
-   * Returns original alignment data used for calculation - or null where not
-   * available.
-   * 
-   * @return null or cut'n'pasteable alignment
-   */
-  public String printOriginalSequenceData(char gapChar)
-  {
-    if (seqData == null)
-    {
-      return null;
-    }
-
-    StringBuffer sb = new StringBuffer();
-    String[] seqdatas = seqData.getSequenceStrings(gapChar);
-    for (int i = 0; i < seqdatas.length; i++)
-    {
-      sb.append(new jalview.util.Format("%-" + 15 + "s").form(sequences[i]
-              .getName()));
-      sb.append(" " + seqdatas[i] + "\n");
-    }
-    return sb.toString();
-  }
-
-  /**
    * DOCUMENT ME!
    * 
    * @param nd
@@ -501,8 +483,8 @@ public class TreeModel
       System.out.println(" name = " + ((SequenceI) nd.element()).getName());
     }
 
-    System.out.println(" dist = " + nd.dist + " " + nd.count + " "
-            + nd.height);
+    System.out.println(
+            " dist = " + nd.dist + " " + nd.count + " " + nd.height);
   }
 
   /**
@@ -531,7 +513,8 @@ public class TreeModel
   {
     // if (_lycount<_lylimit)
     // {
-    // System.err.println("Warning: depth of _recount greater than number of nodes.");
+    // System.err.println("Warning: depth of _recount greater than number of
+    // nodes.");
     // }
     if (nd == null)
     {
@@ -682,8 +665,8 @@ public class TreeModel
   public void applyToNodes(NodeTransformI nodeTransformI)
   {
     for (Enumeration<SequenceNode> nodes = node.elements(); nodes
-            .hasMoreElements(); nodeTransformI.transform(nodes
-            .nextElement()))
+            .hasMoreElements(); nodeTransformI
+                    .transform(nodes.nextElement()))
     {
       ;
     }