X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fphylogeny%2Fiterators%2FExternalForwardIterator.java;h=35a02aae3be815df80d6988d7d6ff2ff2f6aef13;hb=2b071f72fe8a9201e07775030b77aaded0e5b4e5;hp=f75e6f77ae0e19ecf8d8839d0c8587fbd1065a21;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git diff --git a/forester/java/src/org/forester/phylogeny/iterators/ExternalForwardIterator.java b/forester/java/src/org/forester/phylogeny/iterators/ExternalForwardIterator.java index f75e6f7..35a02aa 100644 --- a/forester/java/src/org/forester/phylogeny/iterators/ExternalForwardIterator.java +++ b/forester/java/src/org/forester/phylogeny/iterators/ExternalForwardIterator.java @@ -5,7 +5,7 @@ // Copyright (C) 2008-2009 Christian M. Zmasek // Copyright (C) 2008-2009 Burnham Institute for Medical Research // 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 @@ -15,13 +15,13 @@ // 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 // // Contact: phylosoft @ gmail . com -// WWW: www.phylosoft.org/forester +// WWW: https://sites.google.com/site/cmzmasek/home/software/forester package org.forester.phylogeny.iterators; @@ -30,9 +30,6 @@ import java.util.NoSuchElementException; import org.forester.phylogeny.Phylogeny; import org.forester.phylogeny.PhylogenyNode; -/* - * @author Christian Zmasek - */ public class ExternalForwardIterator implements PhylogenyNodeIterator { private PhylogenyNode _current_node; @@ -47,7 +44,7 @@ public class ExternalForwardIterator implements PhylogenyNodeIterator { */ public ExternalForwardIterator( final Phylogeny phylogeny ) throws IllegalArgumentException { if ( phylogeny.isEmpty() ) { - throw new IllegalArgumentException( "Attempt to use ExternalForwardIterator on an empty phylogeny." ); + throw new IllegalArgumentException( "attempt to use ExternalForwardIterator on an empty phylogeny" ); } PhylogenyNode n = phylogeny.getRoot(); while ( !n.isExternal() ) { @@ -75,6 +72,7 @@ public class ExternalForwardIterator implements PhylogenyNodeIterator { * * @see java.util.Iterator#hasNext() */ + @Override public boolean hasNext() { return getCurrentNode() != null; } @@ -84,9 +82,10 @@ public class ExternalForwardIterator implements PhylogenyNodeIterator { * * @see java.util.Iterator#next() */ + @Override public PhylogenyNode next() throws NoSuchElementException { if ( !hasNext() ) { - throw new NoSuchElementException( "Attempt to call \"next()\" on iterator which has no more next elements." ); + throw new NoSuchElementException( "attempt to call \"next()\" on iterator which has no more next elements" ); } final PhylogenyNode n = getCurrentNode(); if ( n == getLastExtNode() ) { @@ -102,6 +101,7 @@ public class ExternalForwardIterator implements PhylogenyNodeIterator { * Not supported. * */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -109,6 +109,7 @@ public class ExternalForwardIterator implements PhylogenyNodeIterator { /** * DOCUMENT ME! */ + @Override public void reset() { setCurrentNode( getFirstExtNode() ); }