X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fphylogeny%2Ffactories%2FParserBasedPhylogenyFactory.java;h=66ec2e0041d1d92e52c2b11c7ff8531c8488464a;hb=b59302eba1039cb46f634ffe77cebc1b5c9bbcbf;hp=eab4efa4772a874f64f1ff922363e0a0dbbd2294;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git diff --git a/forester/java/src/org/forester/phylogeny/factories/ParserBasedPhylogenyFactory.java b/forester/java/src/org/forester/phylogeny/factories/ParserBasedPhylogenyFactory.java index eab4efa..66ec2e0 100644 --- a/forester/java/src/org/forester/phylogeny/factories/ParserBasedPhylogenyFactory.java +++ b/forester/java/src/org/forester/phylogeny/factories/ParserBasedPhylogenyFactory.java @@ -6,7 +6,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 @@ -16,25 +16,24 @@ // 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.factories; import java.io.IOException; -import java.util.List; import org.forester.io.parsers.PhylogenyParser; import org.forester.io.parsers.phyloxml.PhyloXmlParser; import org.forester.phylogeny.Phylogeny; import org.forester.util.ForesterUtil; -public class ParserBasedPhylogenyFactory extends BasicPhylogenyFactory { +public class ParserBasedPhylogenyFactory implements PhylogenyFactory { private final static PhylogenyFactory _instance; static { @@ -55,8 +54,8 @@ public class ParserBasedPhylogenyFactory extends BasicPhylogenyFactory { throw new CloneNotSupportedException(); } - public synchronized Phylogeny[] create( final Object source, final Object parser, final List parameters ) - throws IOException { + @Override + public synchronized Phylogeny[] create( final Object source, final Object parser ) throws IOException { if ( !( parser instanceof PhylogenyParser ) ) { throw new IllegalArgumentException( "attempt to use object of type other than PhylogenyParser as creator for ParserBasedPhylogenyFactory" ); } @@ -65,10 +64,8 @@ public class ParserBasedPhylogenyFactory extends BasicPhylogenyFactory { return my_parser.parse(); } - public synchronized Phylogeny[] create( final Object source, - final Object parser, - final String schema_location, - final List parameters ) throws IOException { + public synchronized Phylogeny[] create( final Object source, final Object parser, final String schema_location ) + throws IOException { if ( !( parser instanceof PhylogenyParser ) ) { throw new IllegalArgumentException( "attempt to use object of type other than PhylogenyParser as creator for ParserBasedPhylogenyFactory." ); }