From 20c61407a18f2a5eaf730d89f4e7da58a42c77d7 Mon Sep 17 00:00:00 2001 From: Dmitry Avtonomov Date: Mon, 2 Oct 2017 15:43:33 -0700 Subject: [PATCH] Use specific MzIdentMLType version (standard/primitive) in the parser. --- .../ms/fileio/filetypes/mzidentml/MzIdentMLParser.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MSFileToolbox/src/umich/ms/fileio/filetypes/mzidentml/MzIdentMLParser.java b/MSFileToolbox/src/umich/ms/fileio/filetypes/mzidentml/MzIdentMLParser.java index c436b77..4106688 100644 --- a/MSFileToolbox/src/umich/ms/fileio/filetypes/mzidentml/MzIdentMLParser.java +++ b/MSFileToolbox/src/umich/ms/fileio/filetypes/mzidentml/MzIdentMLParser.java @@ -16,7 +16,6 @@ package umich.ms.fileio.filetypes.mzidentml; import umich.ms.fileio.exceptions.FileParsingException; -import umich.ms.fileio.filetypes.mzidentml.jaxb.standard.MzIdentMLType; import umich.ms.fileio.util.jaxb.JaxbUtils; import javax.xml.bind.JAXBException; @@ -34,14 +33,15 @@ private MzIdentMLParser() {} // no instances * @param path path to the file to parse * @return auto-generated representation of the file, read the MzIdentML schema for details. */ - public static MzIdentMLType parse(Path path) throws FileParsingException { + public static umich.ms.fileio.filetypes.mzidentml.jaxb.standard.MzIdentMLType parse(Path path) throws FileParsingException { try { XMLStreamReader xsr = JaxbUtils.createXmlStreamReader(path, false); - MzIdentMLType mzIdentMLType = JaxbUtils.unmarshall(MzIdentMLType.class, xsr); + umich.ms.fileio.filetypes.mzidentml.jaxb.standard.MzIdentMLType mzIdentMLType = JaxbUtils.unmarshall(umich.ms.fileio.filetypes.mzidentml.jaxb.standard.MzIdentMLType.class, xsr); return mzIdentMLType; } catch (JAXBException e) { throw new FileParsingException( String.format("JAXB parsing of MzIdentML file failed (%s)", path.toAbsolutePath().toString()), e); } } + }