X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fsimple_node_processor.java;h=7420bc274ec721ed82ad3875758023cb709bc0f7;hb=d4d61f9d2969283e821f650d031c169899fb3870;hp=d1e0c118bfb3a887533e555cf6e62e36ca52d3f9;hpb=9309c84fbe86a9212029fee105c51765220f4e0c;p=jalview.git

diff --git a/forester/java/src/org/forester/application/simple_node_processor.java b/forester/java/src/org/forester/application/simple_node_processor.java
index d1e0c11..7420bc2 100644
--- a/forester/java/src/org/forester/application/simple_node_processor.java
+++ b/forester/java/src/org/forester/application/simple_node_processor.java
@@ -4,7 +4,6 @@ package org.forester.application;
 import java.io.File;
 
 import org.forester.io.parsers.phyloxml.PhyloXmlParser;
-import org.forester.io.writers.PhylogenyWriter;
 import org.forester.phylogeny.Phylogeny;
 import org.forester.phylogeny.PhylogenyNode;
 import org.forester.phylogeny.data.Taxonomy;
@@ -33,15 +32,16 @@ public class simple_node_processor {
             final PhyloXmlParser xml_parser = new PhyloXmlParser();
             final Phylogeny[] phylogenies_0 = factory.create( in, xml_parser );
             final Phylogeny phylogeny_0 = phylogenies_0[ 0 ];
-            final PhylogenyNodeIterator it = phylogeny_0.iteratorPostorder();
+            // final PhylogenyNodeIterator it = phylogeny_0.iteratorPostorder();
+            final PhylogenyNodeIterator it = phylogeny_0.iteratorExternalForward();
             int i = 0;
             while ( it.hasNext() ) {
                 final PhylogenyNode node = it.next();
-                processNode( node, i );
+                processNode( node, i, out.toString() );
                 i++;
             }
-            final PhylogenyWriter writer = new PhylogenyWriter();
-            writer.toPhyloXML( out, phylogeny_0, 0 );
+            //   final PhylogenyWriter writer = new PhylogenyWriter();
+            //   writer.toPhyloXML( out, phylogeny_0, 0 );
         }
         catch ( final Exception e ) {
             System.out.println( e.getLocalizedMessage() );
@@ -58,7 +58,7 @@ public class simple_node_processor {
     //            }
     //        }
     //    }
-    private static void processNode( final PhylogenyNode node, final int i ) {
+    private static void processNode( final PhylogenyNode node, final int i, final String label ) {
         //if ( node.isExternal() ) {
         //    final String c = "" + node.getNodeData().getBinaryCharacters().getPresentCount();
         //    final String s = node.getNodeData().getTaxonomy().getScientificName();
@@ -79,13 +79,20 @@ public class simple_node_processor {
         //        }
         if ( node.isExternal() ) {
             if ( node.getNodeData().isHasTaxonomy() ) {
-                final Taxonomy t = node.getNodeData().getTaxonomy();
-                t.setIdentifier( null );
+                //  final Taxonomy t = node.getNodeData().getTaxonomy();
+                //  t.setIdentifier( null );
                 //if ( !ForesterUtil.isEmpty( t.getTaxonomyCode() ) && t.getTaxonomyCode().length() == 5 ) {
                 //    if ( node.getName().equalsIgnoreCase( t.getTaxonomyCode() ) ) {
                 //        node.setName( "" );
                 //    }
                 //}
+                // node.setName( "" );
+                final Taxonomy t = node.getNodeData().getTaxonomy();
+                System.out.println( t.getTaxonomyCode() + "\t" + t.getScientificName() + "\t" + t.getCommonName()
+                        + "\t" + label );
+            }
+            else {
+                //System.out.println( "node " + node + " has not tax" );
             }
         }
     }