in progress

[jalview.git] / forester / java / src / org / forester / archaeopteryx / UrlTreeReader.java

diff --git a/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java b/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java
index 184e35e..f5babe7 100644 (file)
--- a/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java
+++ b/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java
@@ -29,7 +29,6 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Date;
 
 import javax.swing.JOptionPane;
 
@@ -65,7 +64,6 @@ public class UrlTreeReader implements Runnable {
     }
 
     synchronized void readPhylogeniesFromWebservice() {
-        final long start_time = new Date().getTime();
         URL url = null;
         Phylogeny[] trees = null;
         final WebservicesManager webservices_manager = WebservicesManager.getInstance();
@@ -93,6 +91,7 @@ public class UrlTreeReader implements Runnable {
                 }
                 identifier = id + "";
             }
+            boolean exception = false;
             try {
                 String url_str = client.getUrl();
                 url_str = url_str.replaceFirst( PhylogeniesWebserviceClient.QUERY_PLACEHOLDER, identifier );
@@ -106,6 +105,16 @@ public class UrlTreeReader implements Runnable {
                         parser = new NexusPhylogeniesParser();
                         ( ( NexusPhylogeniesParser ) parser ).setReplaceUnderscores( true );
                         break;
+                    case TREEBASE_TREE:
+                        parser = new NexusPhylogeniesParser();
+                        ( ( NexusPhylogeniesParser ) parser ).setReplaceUnderscores( true );
+                        ( ( NexusPhylogeniesParser ) parser ).setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.NO );
+                        break;
+                    case TREEBASE_STUDY:
+                        parser = new NexusPhylogeniesParser();
+                        ( ( NexusPhylogeniesParser ) parser ).setReplaceUnderscores( true );
+                        ( ( NexusPhylogeniesParser ) parser ).setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.NO );
+                        break;
                     case NH:
                         parser = new NHXParser();
                         ( ( NHXParser ) parser ).setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.NO );
@@ -147,24 +156,28 @@ public class UrlTreeReader implements Runnable {
                 trees = factory.create( url.openStream(), parser );
             }
             catch ( final MalformedURLException e ) {
+                exception = true;
                 JOptionPane.showMessageDialog( _main_frame,
                                                "Malformed URL: " + url + "\n" + e.getLocalizedMessage(),
                                                "Malformed URL",
                                                JOptionPane.ERROR_MESSAGE );
             }
             catch ( final IOException e ) {
+                exception = true;
                 JOptionPane.showMessageDialog( _main_frame,
                                                "Could not read from " + url + "\n" + e.getLocalizedMessage(),
                                                "Failed to read tree from " + client.getName() + " for " + identifier,
                                                JOptionPane.ERROR_MESSAGE );
             }
             catch ( final NumberFormatException e ) {
+                exception = true;
                 JOptionPane.showMessageDialog( _main_frame,
                                                "Could not read from " + url + "\n" + e.getLocalizedMessage(),
                                                "Failed to read tree from " + client.getName() + " for " + identifier,
                                                JOptionPane.ERROR_MESSAGE );
             }
             catch ( final Exception e ) {
+                exception = true;
                 e.printStackTrace();
                 JOptionPane.showMessageDialog( _main_frame,
                                                e.getLocalizedMessage(),
@@ -186,11 +199,6 @@ public class UrlTreeReader implements Runnable {
                             phylogeny.setRerootable( false );
                             phylogeny.setRooted( true );
                         }
-                        if ( client.getName().equals( WebserviceUtil.PFAM_NAME ) ) {
-                            phylogeny.setRerootable( false );
-                            phylogeny.setRooted( true );
-                            PhylogenyMethods.transferInternalNodeNamesToConfidence( phylogeny );
-                        }
                         if ( client.getProcessingInstructions() != null ) {
                             try {
                                 WebserviceUtil.processInstructions( client, phylogeny );
@@ -240,12 +248,16 @@ public class UrlTreeReader implements Runnable {
                     }
                 }
             }
+            else if ( !exception ) {
+                JOptionPane.showMessageDialog( null, ForesterUtil.wordWrap( "Failed to read in tree(s) from [" + url
+                        + "]", 80 ), "Error", JOptionPane.ERROR_MESSAGE );
+            }
             _main_frame.getContentPane().repaint();
-            if ( ( ( trees != null ) && ( trees.length > 0 ) ) && ( ( new Date().getTime() - start_time ) > 20000 ) ) {
+            if ( ( trees != null ) && ( trees.length > 0 ) ) {
                 try {
                     JOptionPane.showMessageDialog( null,
                                                    ForesterUtil.wordWrap( "Successfully read in " + trees.length
-                                                           + " evolutionry tree(s) from [" + url + "]", 80 ),
+                                                           + " tree(s) from [" + url + "]", 80 ),
                                                    "Success",
                                                    JOptionPane.INFORMATION_MESSAGE );
                 }