X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fgene_tree_preprocess.java;h=bcb93f4074d1c530759735dd134364b5d4ff0c0f;hb=e8c7440196e8fe798bd5dc2b83cc1e194c77f0d0;hp=d1fd58e70c7b556b11ba72185667bac5eef16222;hpb=e174d62534f7fc6f3de133d523a402a87735b27f;p=jalview.git

diff --git a/forester/java/src/org/forester/application/gene_tree_preprocess.java b/forester/java/src/org/forester/application/gene_tree_preprocess.java
index d1fd58e..bcb93f4 100644
--- a/forester/java/src/org/forester/application/gene_tree_preprocess.java
+++ b/forester/java/src/org/forester/application/gene_tree_preprocess.java
@@ -32,7 +32,6 @@ import java.io.IOException;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.forester.archaeopteryx.tools.SequenceDataRetriver;
 import org.forester.io.parsers.util.ParserUtils;
 import org.forester.io.writers.PhylogenyWriter;
 import org.forester.phylogeny.Phylogeny;
@@ -42,17 +41,19 @@ import org.forester.phylogeny.factories.PhylogenyFactory;
 import org.forester.phylogeny.iterators.PhylogenyNodeIterator;
 import org.forester.util.CommandLineArguments;
 import org.forester.util.ForesterUtil;
+import org.forester.ws.seqdb.SequenceDbWsTools;
 
 public class gene_tree_preprocess {
 
-    final static private String HELP_OPTION_1 = "help";
-    final static private String HELP_OPTION_2 = "h";
-    final static private String PRG_NAME      = "gene_tree_preprocess";
-    final static private String PRG_DESC      = "gene tree preprocessing for SDI analysis";
-    final static private String PRG_VERSION   = "1.01";
-    final static private String PRG_DATE      = "2012.06.07";
-    final static private String E_MAIL        = "phylosoft@gmail.com";
-    final static private String WWW           = "www.phylosoft.org/forester";
+    final static private String HELP_OPTION_1           = "help";
+    final static private String HELP_OPTION_2           = "h";
+    final static private String PRG_NAME                = "gene_tree_preprocess";
+    final static private String PRG_DESC                = "gene tree preprocessing for SDI analysis";
+    final static private String PRG_VERSION             = "1.01";
+    final static private String PRG_DATE                = "2012.06.07";
+    final static private String E_MAIL                  = "phylosoft@gmail.com";
+    final static private String WWW                     = "www.phylosoft.org/forester";
+    private final static int    DEFAULT_LINES_TO_RETURN = 50;
 
     public static void main( final String[] args ) {
         try {
@@ -82,10 +83,15 @@ public class gene_tree_preprocess {
                 ForesterUtil.fatalError( PRG_NAME, "phylogeny has " + phy.getNumberOfExternalNodes()
                         + " external node(s), aborting" );
             }
-            final SortedSet<String> not_found = SequenceDataRetriver.obtainSeqInformation( phy, true, false );
+            final SortedSet<String> not_found = SequenceDbWsTools.obtainSeqInformation( phy,
+                                                                                        true,
+                                                                                        false,
+                                                                                        DEFAULT_LINES_TO_RETURN );
             for( final String remove_me : not_found ) {
                 phy.deleteSubtree( phy.getNode( remove_me ), true );
             }
+            phy.clearHashIdToNodeMap();
+            phy.externalNodesHaveChanged();
             if ( phy.getNumberOfExternalNodes() < 2 ) {
                 ForesterUtil.fatalError( PRG_NAME,
                                          "after removal of unresolvable external nodes, phylogeny has "
@@ -142,7 +148,7 @@ public class gene_tree_preprocess {
         }
     }
 
-    public static void checkForOutputFileWriteability( final File outfile ) {
+    private static void checkForOutputFileWriteability( final File outfile ) {
         final String error = ForesterUtil.isWritableFile( outfile );
         if ( !ForesterUtil.isEmpty( error ) ) {
             ForesterUtil.fatalError( PRG_NAME, error );