X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FUrlTreeReader.java;h=e3c81f9c303d92e6a4fe7344893b4f80d812e674;hb=56cc12bcb9783e1bd16f57e12534434c31901879;hp=7d88a317b13f8153935d87b7f9c698faf044928f;hpb=3d6a64e0371ffedf725bf8467211ed860f298550;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java b/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java index 7d88a31..e3c81f9 100644 --- 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 { @@ -59,14 +56,18 @@ public class UrlTreeReader implements Runnable { _webservice_client_index = webservice_client_index; } + @Override + public void run() { + readPhylogeniesFromWebservice(); + } + synchronized void readPhylogeniesFromWebservice() { - final long start_time = new Date().getTime(); URL url = null; Phylogeny[] trees = null; final WebservicesManager webservices_manager = WebservicesManager.getInstance(); final PhylogeniesWebserviceClient client = webservices_manager .getAvailablePhylogeniesWebserviceClient( _webservice_client_index ); - String identifier = JOptionPane.showInputDialog( _main_frame, client.getInstructions() + "\n(Reference: " + String identifier = JOptionPane.showInputDialog( _main_frame.getThisFrame(), client.getInstructions() + "\n(Reference: " + client.getReference() + ")", client.getDescription(), JOptionPane.QUESTION_MESSAGE ); if ( ( identifier != null ) && ( identifier.trim().length() > 0 ) ) { identifier = identifier.trim(); @@ -80,7 +81,7 @@ public class UrlTreeReader implements Runnable { id = -1; } if ( id < 1 ) { - JOptionPane.showMessageDialog( _main_frame, + JOptionPane.showMessageDialog( _main_frame.getThisFrame(), "Identifier is expected to be a number", "Can not open URL", JOptionPane.ERROR_MESSAGE ); @@ -88,6 +89,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 ); @@ -101,6 +103,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 ); @@ -109,8 +121,7 @@ public class UrlTreeReader implements Runnable { break; case NH_EXTRACT_TAXONOMY: parser = new NHXParser(); - ( ( NHXParser ) parser ) - .setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT ); + ( ( NHXParser ) parser ).setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE ); ( ( NHXParser ) parser ).setReplaceUnderscores( false ); ( ( NHXParser ) parser ).setGuessRootedness( true ); break; @@ -128,7 +139,7 @@ public class UrlTreeReader implements Runnable { ( ( NHXParser ) parser ).setGuessRootedness( true ); break; case PHYLOXML: - parser = new PhyloXmlParser(); + parser = PhyloXmlParser.createPhyloXmlParserXsdValidating(); break; default: throw new IllegalArgumentException( "unknown format: " + client.getReturnFormat() ); @@ -139,30 +150,33 @@ 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 ) { - JOptionPane.showMessageDialog( _main_frame, + exception = true; + JOptionPane.showMessageDialog( _main_frame.getThisFrame(), "Malformed URL: " + url + "\n" + e.getLocalizedMessage(), "Malformed URL", JOptionPane.ERROR_MESSAGE ); } catch ( final IOException e ) { - JOptionPane.showMessageDialog( _main_frame, + exception = true; + JOptionPane.showMessageDialog( _main_frame.getThisFrame(), "Could not read from " + url + "\n" + e.getLocalizedMessage(), "Failed to read tree from " + client.getName() + " for " + identifier, JOptionPane.ERROR_MESSAGE ); } catch ( final NumberFormatException e ) { - JOptionPane.showMessageDialog( _main_frame, + exception = true; + JOptionPane.showMessageDialog( _main_frame.getThisFrame(), "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, + JOptionPane.showMessageDialog( _main_frame.getThisFrame(), e.getLocalizedMessage(), "Unexpected Exception", JOptionPane.ERROR_MESSAGE ); @@ -182,17 +196,12 @@ 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 ); } catch ( final PhyloXmlDataFormatException e ) { - JOptionPane.showMessageDialog( _main_frame, + JOptionPane.showMessageDialog( _main_frame.getThisFrame(), "Error:\n" + e.getLocalizedMessage(), "Error", JOptionPane.ERROR_MESSAGE ); @@ -203,7 +212,7 @@ public class UrlTreeReader implements Runnable { PhylogenyMethods.transferNodeNameToField( phylogeny, client.getNodeField(), false ); } catch ( final PhyloXmlDataFormatException e ) { - JOptionPane.showMessageDialog( _main_frame, + JOptionPane.showMessageDialog( _main_frame.getThisFrame(), "Error:\n" + e.getLocalizedMessage(), "Error", JOptionPane.ERROR_MESSAGE ); @@ -236,12 +245,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 ); } @@ -254,9 +267,4 @@ public class UrlTreeReader implements Runnable { _main_frame.activateSaveAllIfNeeded(); System.gc(); } - - @Override - public void run() { - readPhylogeniesFromWebservice(); - } }