X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2Fvamsas%2FTree.java;h=9b76f917819607191d486c8ccdeaa92d19594429;hb=37b210ecad3c132b87c525f84e3b754a4edf12a6;hp=0545839e1deb9d39608e38901860f174f5ddfb72;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git diff --git a/src/jalview/io/vamsas/Tree.java b/src/jalview/io/vamsas/Tree.java index 0545839..9b76f91 100644 --- a/src/jalview/io/vamsas/Tree.java +++ b/src/jalview/io/vamsas/Tree.java @@ -1,5 +1,5 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * * This file is part of Jalview. @@ -155,8 +155,7 @@ public class Tree extends DatastoreItem else { // handle conflict - log - .info("TODO: Add the locally modified tree in Jalview as a new tree in document, leaving locked tree unchanged."); + log.info("TODO: Add the locally modified tree in Jalview as a new tree in document, leaving locked tree unchanged."); } } @@ -220,8 +219,8 @@ public class Tree extends DatastoreItem // or just correctly resolve the tree's seqData to the correct alignment // in // the document. - Vector alsqrefs = getjv2vObjs(findAlignmentSequences(jal, tp - .getTree().seqData.getSequences())); + Vector alsqrefs = getjv2vObjs(findAlignmentSequences(jal, + tp.getTree().seqData.getSequences())); Object[] alsqs = new Object[alsqrefs.size()]; alsqrefs.copyInto(alsqs); vInput.setObjRef(alsqs); @@ -347,9 +346,7 @@ public class Tree extends DatastoreItem else { leaf.setPlaceholder(true); - leaf - .setElement(new Sequence(leaf.getName(), - "THISISAPLACEHLDER")); + leaf.setElement(new Sequence(leaf.getName(), "THISISAPLACEHLDER")); } } }