diff --git a/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/DOMRDFaParser.java b/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/DOMRDFaParser.java index 889a3d5e..fa73d210 100644 --- a/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/DOMRDFaParser.java +++ b/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/DOMRDFaParser.java @@ -33,10 +33,12 @@ */ public class DOMRDFaParser extends RDFaParser { + private static final XMLOutputFactory DEFAULT_XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance(); + private static final XMLEventFactory DEFAULT_XML_EVENT_FACTORY = XMLEventFactory.newInstance(); + public static DOMRDFaParser createInstance(JenaSink sink) { sink.getExtractor().setForSAX(false); - return new DOMRDFaParser(sink, XMLOutputFactory.newInstance(), - XMLEventFactory.newInstance(), sink.getExtractor()); + return new DOMRDFaParser(sink, sink.getExtractor()); } public DOMRDFaParser(JenaSink sink, XMLOutputFactory outputFactory, @@ -45,6 +47,10 @@ public DOMRDFaParser(JenaSink sink, XMLOutputFactory outputFactory, } + public DOMRDFaParser(JenaSink sink, URIExtractor extractor) { + this(sink, DEFAULT_XML_OUTPUT_FACTORY, DEFAULT_XML_EVENT_FACTORY, extractor); + } + /** * Parse the RDFa in-content metadata of the node. * diff --git a/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/RDFaParser.java b/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/RDFaParser.java index d280a1a5..488cc791 100644 --- a/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/RDFaParser.java +++ b/odfdom/src/main/java/org/odftoolkit/odfdom/pkg/rdfa/RDFaParser.java @@ -36,9 +36,12 @@ import javax.xml.stream.events.XMLEvent; import net.rootdev.javardfa.Constants; +import net.rootdev.javardfa.ProfileCollector; import net.rootdev.javardfa.Setting; import net.rootdev.javardfa.literal.LiteralCollector; +import net.rootdev.javardfa.uri.IRIResolver; +import net.rootdev.javardfa.uri.URIExtractor10; import org.xml.sax.Attributes; import org.xml.sax.Locator; @@ -60,7 +63,7 @@ class RDFaParser extends net.rootdev.javardfa.Parser { protected RDFaParser(JenaSink sink, XMLOutputFactory outputFactory, XMLEventFactory eventFactory, URIExtractor extractor) { - super(sink); + super(sink, outputFactory, eventFactory, new URIExtractor10(new IRIResolver()), ProfileCollector.EMPTY_COLLECTOR); this.sink = sink; this.eventFactory = eventFactory; this.settings = EnumSet.noneOf(Setting.class);