X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fanalysis%2FTreeModel.java;fp=src%2Fjalview%2Fanalysis%2FTreeModel.java;h=a50634ecf6178632561e498458857b969fe19a46;hb=9e2b4ccd9c95ffa75130bf808b0037ea6a1054ca;hp=5a4180234ab6aedd93ca70b472271047250dbb40;hpb=4dd40d33a5becefd51c31a426f2501b21029f82c;p=jalview.git diff --git a/src/jalview/analysis/TreeModel.java b/src/jalview/analysis/TreeModel.java index 5a41802..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,8 @@ 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(); } @@ -187,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 } /** @@ -248,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); @@ -478,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); } /** @@ -508,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) { @@ -659,8 +665,8 @@ public class TreeModel public void applyToNodes(NodeTransformI nodeTransformI) { for (Enumeration nodes = node.elements(); nodes - .hasMoreElements(); nodeTransformI.transform(nodes - .nextElement())) + .hasMoreElements(); nodeTransformI + .transform(nodes.nextElement())) { ; }