Transition to central XMLHelper in MMLQueryGenerator

mathmlquerygenerator.iml

@@ -11,6 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: net.sf.saxon:Saxon-HE:9.5.1-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:17.0" level="project" />

pom.xml

@@ -46,6 +46,11 @@
     </distributionManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>net.sf.saxon</groupId>
+            <artifactId>Saxon-HE</artifactId>
+            <version>9.5.1-6</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/com/formulasearchengine/mathmlquerygenerator/NtcirTopicReader.java

@@ -1,7 +1,7 @@
 package com.formulasearchengine.mathmlquerygenerator;
 
-import com.formulasearchengine.xmlhelper.DomDocumentHelper;
-import com.formulasearchengine.xmlhelper.NonWhitespaceNodeList;
+import com.formulasearchengine.mathmlquerygenerator.xmlhelper.XMLHelper;
+import com.formulasearchengine.mathmlquerygenerator.xmlhelper.NonWhitespaceNodeList;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -15,7 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.formulasearchengine.xmlhelper.NonWhitespaceNodeList.getFirstChild;
+import static com.formulasearchengine.mathmlquerygenerator.xmlhelper.NonWhitespaceNodeList.getFirstChild;
 
 /**
  * Created by Moritz on 08.11.2014.
@@ -35,7 +35,7 @@ public NtcirTopicReader( Document topics ) {
 	}
 
 	public NtcirTopicReader( File topicFile ) throws ParserConfigurationException, IOException, SAXException {
-		DocumentBuilder documentBuilder = DomDocumentHelper.getDocumentBuilderFactory().newDocumentBuilder();
+		DocumentBuilder documentBuilder = XMLHelper.getDocumentBuilder( true );
 		topics = documentBuilder.parse( topicFile );
 
 		//TODO: Find out how this code duplication can be avoided in Java.
@@ -75,7 +75,7 @@ public final NtcirTopicReader setAddQvarMap( boolean addQvarMap ) {
 	 * @throws XPathExpressionException Thrown if xpaths fail to compile or fail to evaluate
 	 +	 */
 	public final List<NtcirPattern> extractPatterns() throws XPathExpressionException {
-		final XPath xpath = DomDocumentHelper.namespaceAwareXpath( "t", NS_NII );
+		final XPath xpath = XMLHelper.namespaceAwareXpath( "t", NS_NII );
 		final XPathExpression xNum = xpath.compile( "./t:num" );
 		final XPathExpression xFormula = xpath.compile( "./t:query/t:formula" );
 		final NonWhitespaceNodeList topicList = new NonWhitespaceNodeList(

src/main/java/com/formulasearchengine/mathmlquerygenerator/XQueryGenerator.java

@@ -1,8 +1,8 @@
 package com.formulasearchengine.mathmlquerygenerator;
 
 
-import com.formulasearchengine.xmlhelper.DomDocumentHelper;
-import com.formulasearchengine.xmlhelper.NonWhitespaceNodeList;
+import com.formulasearchengine.mathmlquerygenerator.xmlhelper.XMLHelper;
+import com.formulasearchengine.mathmlquerygenerator.xmlhelper.NonWhitespaceNodeList;
 import com.google.common.collect.Lists;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -14,7 +14,7 @@
 import java.util.*;
 import java.util.regex.Pattern;
 
-import static com.formulasearchengine.xmlhelper.NonWhitespaceNodeList.getFirstChild;
+import static com.formulasearchengine.mathmlquerygenerator.xmlhelper.NonWhitespaceNodeList.getFirstChild;
 
 /**
  * Converts MathML queries into XQueries.
@@ -48,7 +48,7 @@ public class XQueryGenerator {
 	 */
 	public XQueryGenerator( String input )
 			throws IOException, SAXException, ParserConfigurationException {
-		final Document xml = DomDocumentHelper.String2Doc( input );
+		final Document xml = XMLHelper.String2Doc( input, true );
 		this.mainElement = getMainElement( xml );
 	}
 

src/main/java/com/formulasearchengine/xmlhelper/NonWhitespaceNodeList.java → src/main/java/com/formulasearchengine/mathmlquerygenerator/xmlhelper/NonWhitespaceNodeList.java

@@ -1,4 +1,4 @@
-package com.formulasearchengine.xmlhelper;
+package com.formulasearchengine.mathmlquerygenerator.xmlhelper;
 
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;