X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2FUrlTreeReader.java;h=f96864fb4fa9bff1c64ab8f176714fd4f8733b4f;hb=7ad84913635263ddc191fcbebd8a9bd46a9ac7e3;hp=572a24c0f9a872fb88ca578aeac566575d18b165;hpb=038c34792757a86f24296de5683e722fab3f9307;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java b/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java index 572a24c..f96864f 100644 --- a/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java +++ b/forester/java/src/org/forester/archaeopteryx/UrlTreeReader.java @@ -39,6 +39,7 @@ import org.forester.archaeopteryx.webservices.WebservicesManager; import org.forester.io.parsers.PhylogenyParser; import org.forester.io.parsers.nexus.NexusPhylogeniesParser; import org.forester.io.parsers.nhx.NHXParser; +import org.forester.io.parsers.phyloxml.PhyloXmlDataFormatException; import org.forester.io.parsers.phyloxml.PhyloXmlParser; import org.forester.io.parsers.tol.TolParser; import org.forester.phylogeny.Phylogeny; @@ -187,10 +188,26 @@ public class UrlTreeReader implements Runnable { PhylogenyMethods.transferInternalNodeNamesToConfidence( phylogeny ); } if ( client.getProcessingInstructions() != null ) { - WebserviceUtil.processInstructions( client, phylogeny ); + try { + WebserviceUtil.processInstructions( client, phylogeny ); + } + catch ( final PhyloXmlDataFormatException e ) { + JOptionPane.showMessageDialog( _main_frame, + "Error:\n" + e.getLocalizedMessage(), + "Error", + JOptionPane.ERROR_MESSAGE ); + } } if ( client.getNodeField() != null ) { - PhylogenyMethods.transferNodeNameToField( phylogeny, client.getNodeField() ); + try { + PhylogenyMethods.transferNodeNameToField( phylogeny, client.getNodeField(), false ); + } + catch ( final PhyloXmlDataFormatException e ) { + JOptionPane.showMessageDialog( _main_frame, + "Error:\n" + e.getLocalizedMessage(), + "Error", + JOptionPane.ERROR_MESSAGE ); + } } phylogeny.setIdentifier( new Identifier( identifier, client.getName() ) ); _main_frame.getJMenuBar().remove( _main_frame.getHelpMenu() ); @@ -213,7 +230,7 @@ public class UrlTreeReader implements Runnable { my_name_for_file = new String( sb.toString().replaceAll( " ", "_" ) ); } _main_frame.getMainPanel().getCurrentTreePanel().setTreeFile( new File( my_name_for_file ) ); - Util.lookAtSomeTreePropertiesForAptxControlSettings( phylogeny, _main_frame.getMainPanel() + AptxUtil.lookAtSomeTreePropertiesForAptxControlSettings( phylogeny, _main_frame.getMainPanel() .getControlPanel(), _main_frame.getConfiguration() ); _main_frame.getMainPanel().getControlPanel().showWhole(); }