X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FArchaeopteryx.java;h=8cbf8cad3c36cf27d5e932b81665a5cbec312bd0;hb=f6b29c53c14e1ef16e4cd614c7f9465e0073309e;hp=c23dccabd0e8093dee030f7a03590cae6c8ce5e6;hpb=b819fa043cac2722618af63f0d4752ffa1a40890;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/Archaeopteryx.java b/forester/java/src/org/forester/archaeopteryx/Archaeopteryx.java index c23dcca..8cbf8ca 100644 --- a/forester/java/src/org/forester/archaeopteryx/Archaeopteryx.java +++ b/forester/java/src/org/forester/archaeopteryx/Archaeopteryx.java @@ -44,6 +44,12 @@ public final class Archaeopteryx { return createApplication( phylogenies, "", "" ); } + public static MainFrame createApplication( final Phylogeny phylogeny, final Configuration config, final String title ) { + final Phylogeny[] phylogenies = new Phylogeny[ 1 ]; + phylogenies[ 0 ] = phylogeny; + return MainFrameApplication.createInstance( phylogenies, config, title ); + } + public static MainFrame createApplication( final Phylogeny[] phylogenies ) { return createApplication( phylogenies, "", "" ); } @@ -78,11 +84,11 @@ public final class Archaeopteryx { f = new File( args[ filename_index ] ); final String err = ForesterUtil.isReadableFile( f ); if ( !ForesterUtil.isEmpty( err ) ) { - ForesterUtil.fatalError( Constants.PRG_NAME, err ); + ForesterUtil.fatalError( AptxConstants.PRG_NAME, err ); } boolean nhx_or_nexus = false; final PhylogenyParser p = ParserUtils.createParserDependingOnFileType( f, conf - .isValidatePhyloXmlAgainstSchema() ); + .isValidatePhyloXmlAgainstSchema() ); if ( p instanceof NHXParser ) { nhx_or_nexus = true; final NHXParser nhx = ( NHXParser ) p; @@ -102,14 +108,14 @@ public final class Archaeopteryx { phylogenies = PhylogenyMethods.readPhylogenies( p, f ); if ( nhx_or_nexus && conf.isInternalNumberAreConfidenceForNhParsing() ) { for( final Phylogeny phy : phylogenies ) { - PhylogenyMethods.transferInternalNodeNamesToConfidence( phy ); + PhylogenyMethods.transferInternalNodeNamesToConfidence( phy, "" ); } } } } } catch ( final Exception e ) { - ForesterUtil.fatalError( Constants.PRG_NAME, "failed to start: " + e.getLocalizedMessage() ); + ForesterUtil.fatalError( AptxConstants.PRG_NAME, "failed to start: " + e.getLocalizedMessage() ); } String title = ""; if ( f != null ) {