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 caf9ad8..ce6f712 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;
 
@@ -45,8 +44,6 @@ import org.forester.io.parsers.tol.TolParser;
 import org.forester.phylogeny.Phylogeny;
 import org.forester.phylogeny.PhylogenyMethods;
 import org.forester.phylogeny.data.Identifier;
-import org.forester.phylogeny.factories.ParserBasedPhylogenyFactory;
-import org.forester.phylogeny.factories.PhylogenyFactory;
 import org.forester.util.ForesterUtil;
 
 public class UrlTreeReader implements Runnable {
@@ -65,7 +62,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();
@@ -154,8 +150,7 @@ public class UrlTreeReader implements Runnable {
                 else {
                     _main_frame.getMainPanel().setWaitCursor();
                 }
-                final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
-                trees = factory.create( url.openStream(), parser );
+                trees = ForesterUtil.readPhylogeniesFromUrl( url, parser );
             }
             catch ( final MalformedURLException e ) {
                 exception = true;
@@ -255,7 +250,7 @@ public class UrlTreeReader implements Runnable {
                         + "]", 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