From 4c6c7e560254d21741a5fa78392dcf7f310ef325 Mon Sep 17 00:00:00 2001 From: kjvdheide Date: Tue, 9 Jan 2018 15:31:44 +0000 Subject: [PATCH] JAL-2805 allow for non-xsd validating phyloxml parsing --- src/jalview/ext/forester/io/ForesterParser.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/jalview/ext/forester/io/ForesterParser.java b/src/jalview/ext/forester/io/ForesterParser.java index 4cd84b1..469463e 100644 --- a/src/jalview/ext/forester/io/ForesterParser.java +++ b/src/jalview/ext/forester/io/ForesterParser.java @@ -41,9 +41,16 @@ public class ForesterParser public static ForesterParser createPhyloXmlParser(File file) throws PhylogenyParserException, IOException { - // support non-xsd validating? + if (AptxInit.APTX_CONFIG.isValidatePhyloXmlAgainstSchema()) + { return new ForesterParser( - PhyloXmlParser.createPhyloXmlParserXsdValidating(), file); + PhyloXmlParser.createPhyloXmlParserXsdValidating(), file); + } + else + { + return new ForesterParser(PhyloXmlParser.createPhyloXmlParser(), + file); + } } // ParserBasedPhylogenyFactory.getInstance().create(foresterParser, source) -- 1.7.10.2