X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsdi%2FSDIse.java;h=7efd6a75d467c3f40713854856a7db846ff1409d;hb=1312aecb21aaad33a1e3c0015afc10962195ea34;hp=45096859f37ac9873dd56a806a1a2dc2cc5c99c1;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git diff --git a/forester/java/src/org/forester/sdi/SDIse.java b/forester/java/src/org/forester/sdi/SDIse.java index 4509685..7efd6a7 100644 --- a/forester/java/src/org/forester/sdi/SDIse.java +++ b/forester/java/src/org/forester/sdi/SDIse.java @@ -7,7 +7,7 @@ // Copyright (C) 2000-2001 Washington University School of Medicine // and Howard Hughes Medical Institute // All rights reserved -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -17,7 +17,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -79,8 +79,9 @@ public class SDIse extends SDI { * reference to a rooted binary species Phylogeny which might get * stripped in the process, must have species names in the * species name fields for all external nodes + * @throws SDIException */ - public SDIse( final Phylogeny gene_tree, final Phylogeny species_tree ) { + public SDIse( final Phylogeny gene_tree, final Phylogeny species_tree ) throws SDIException { super( gene_tree, species_tree ); _duplications_sum = 0; getSpeciesTree().preOrderReId(); @@ -95,7 +96,8 @@ public class SDIse extends SDI { private void calculateMforNode( final PhylogenyNode n ) { if ( !n.isExternal() ) { final boolean was_duplication = n.isDuplication(); - PhylogenyNode a = n.getChildNode1().getLink(), b = n.getChildNode2().getLink(); + PhylogenyNode a = n.getChildNode1().getLink(); + PhylogenyNode b = n.getChildNode2().getLink(); while ( a != b ) { if ( a.getId() > b.getId() ) { a = a.getParent();