X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2FdecoratorX.java;h=58a2b00e815280103713cccff30382c9d2a7e3d8;hb=f7f0102d3e7eb2fd254f7d22d75a88495133449c;hp=677d9ed8f07c8c48f628959a97c42eb4eb384770;hpb=f47b5de663d2ca59a4d53587ea8d5cd20c594db2;p=jalview.git diff --git a/forester/java/src/org/forester/application/decoratorX.java b/forester/java/src/org/forester/application/decoratorX.java index 677d9ed..58a2b00 100644 --- a/forester/java/src/org/forester/application/decoratorX.java +++ b/forester/java/src/org/forester/application/decoratorX.java @@ -2,7 +2,7 @@ // ~/SOFTWARE_DEV/ECLIPSE_WORKSPACE/forester/java/forester.jar // org.forester.application.decoratorX // RRMa_ALL_plus_RRMa_ee3_50_hmmalign_05_40_fme_with_seqs_2.phylo.xml -// nature12311-s3_cz_4.txt x +// nature12311-s3_cz_4.txt x1 x2 package org.forester.application; @@ -48,10 +48,9 @@ public class decoratorX { System.exit( -1 ); } final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance(); - final PhyloXmlParser xml_parser = new PhyloXmlParser(); + final PhyloXmlParser xml_parser = PhyloXmlParser.createPhyloXmlParserXsdValidating(); final Phylogeny phy = factory.create( intree, xml_parser )[ 0 ]; final BasicTable t = BasicTableParser.parse( intable, '\t' ); - // System.out.println( t.toString() ); final PhylogenyNodeIterator it = phy.iteratorExternalForward(); int i = 0; while ( it.hasNext() ) { @@ -102,9 +101,6 @@ public class decoratorX { System.out.println( node + "->" + annotation ); } } - // if ( !found ) { - // throw new Exception( "Sequence from node " + node + " not found: " + node_seq ); - // } } private static void processNode2( final PhylogenyNode node, final Phylogeny t ) {