R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Mikolaj Widla
2023-12-29 13:09:45 +01:00
parent c3eef96354
commit 48ff86d837
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Backend/tools-services/src/main/java/com/r11/tools/xml/Saxon.java
View File

@@ -1,9 +1,6 @@
package com.r11.tools.xml; package com.r11.tools.xml;
<<<<<<< HEAD
=======
import com.r11.tools.model.XMLMultipleFilesData; import com.r11.tools.model.XMLMultipleFilesData;
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
import com.r11.tools.model.XPathQueryResult; import com.r11.tools.model.XPathQueryResult;
import net.sf.saxon.s9api.*; import net.sf.saxon.s9api.*;
@@ -106,11 +103,7 @@ public class Saxon implements XmlEngine{
} }
/** /**
<<<<<<< HEAD
* This method evaluates XQuery exporession on given xml
=======
* This method evaluates XQuery expression on given xml * This method evaluates XQuery expression on given xml
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
* @param data xml * @param data xml
* @param xquery expression * @param xquery expression
* @return * @return

3
Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java
View File

@@ -1,9 +1,6 @@
package com.r11.tools.xml; package com.r11.tools.xml;
<<<<<<< HEAD
=======
import com.r11.tools.model.XMLMultipleFilesData; import com.r11.tools.model.XMLMultipleFilesData;
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
import com.r11.tools.model.XPathQueryResult; import com.r11.tools.model.XPathQueryResult;
import org.apache.xpath.XPathAPI; import org.apache.xpath.XPathAPI;
import org.w3c.dom.Document; import org.w3c.dom.Document;

3
Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java
View File

@@ -1,9 +1,6 @@
package com.r11.tools.xml; package com.r11.tools.xml;
<<<<<<< HEAD
=======
import com.r11.tools.model.XMLMultipleFilesData; import com.r11.tools.model.XMLMultipleFilesData;
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
import com.r11.tools.model.XPathQueryResult; import com.r11.tools.model.XPathQueryResult;
public interface XmlEngine { public interface XmlEngine {