X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fanalysis%2FTreeModel.java;h=0e57a58501b1ae9f51e1f4fc030b1c51422c1ad1;hb=8a7a9401835f50b64bab13489de2781e8ced6ba8;hp=dd56424b6a66262f36fbc1e821f83e00545d95cf;hpb=3ec49f04ac668312e8eb3e963c52df6797fea89f;p=jalview.git diff --git a/src/jalview/analysis/TreeModel.java b/src/jalview/analysis/TreeModel.java index dd56424..0e57a58 100644 --- a/src/jalview/analysis/TreeModel.java +++ b/src/jalview/analysis/TreeModel.java @@ -80,7 +80,7 @@ public class TreeModel public TreeModel(SequenceI[] seqs, AlignmentView odata, NewickFile treefile) { - this(seqs, treefile.getTree(), treefile.HasDistances(), + this(seqs, treefile.getTree(), treefile.HasDistances(), treefile.HasBootstrap(), treefile.HasRootDistance()); seqData = odata; @@ -94,7 +94,7 @@ public class TreeModel */ public TreeModel(TreeBuilder tree) { - this(tree.getSequences(), tree.getTopNode(), tree.hasDistances(), + this(tree.getSequences(), tree.getTopNode(), tree.hasDistances(), tree.hasBootstrap(), tree.hasRootDistance()); seqData = tree.getOriginalData(); } @@ -141,7 +141,7 @@ public class TreeModel while (i < leaves.size()) { // TODO - decide if we get rid of the polymorphism here ? - j = (SequenceNode)leaves.elementAt(i++); + j = (SequenceNode) leaves.elementAt(i++); realnam = j.getName(); nam = null; @@ -311,8 +311,7 @@ public class TreeModel * * @return Vector of leaf nodes on binary tree */ - Vector findLeaves(BinaryNode nd, - Vector leaves) + Vector findLeaves(BinaryNode nd, Vector leaves) { if (nd == null) { @@ -409,8 +408,8 @@ public class TreeModel } else { - _groupNodes(groups, (SequenceNode) nd.left(), threshold); - _groupNodes(groups, (SequenceNode) nd.right(), threshold); + _groupNodes(groups, nd.left(), threshold); + _groupNodes(groups, nd.right(), threshold); } }