Package ro.sync.exml.workspace.api.util
Interface CompareUtilAccess
-
@API(type=NOT_EXTENDABLE, src=PUBLIC) public interface CompareUtilAccess
Compare utilities.
-
-
Method Summary
All Methods Instance Methods Abstract Methods Modifier and Type Method Description AuthorDifferencePerformer
createAuthorDiffPerformer()
Create an Author difference performer.DifferencePerformer
createDiffPerformer()
Create difference performer.MergeResult
threeWayAutoMerge(java.lang.String ancestor, java.lang.String left, java.lang.String right, MergeConflictResolutionMethods conflictResolutionMethod)
Merges two strings representing XML files using a three way merging algorithm which needs an ancestor file.
-
-
-
Method Detail
-
threeWayAutoMerge
MergeResult threeWayAutoMerge(java.lang.String ancestor, java.lang.String left, java.lang.String right, MergeConflictResolutionMethods conflictResolutionMethod)
Merges two strings representing XML files using a three way merging algorithm which needs an ancestor file.- Parameters:
ancestor
- The original file string which has been modified into left and right.left
- The left version of the file string, the one with "our" changes.right
- The right version of the file string, the one with "others" changes.conflictResolutionMethod
- The conflict resolution method to use.- Returns:
- A merged file string where conflicts are resolved by using the left version of the file or null if the merge encountered an error.
- Since:
- 17.1
-
createDiffPerformer
DifferencePerformer createDiffPerformer() throws DiffException
Create difference performer.- Returns:
- a difference performer that can be used to compare two resources using different algorithms and options.
- Throws:
DiffException
- When it fails to create the diff performer.- Since:
- 19.1
-
createAuthorDiffPerformer
AuthorDifferencePerformer createAuthorDiffPerformer() throws DiffException
Create an Author difference performer.- Returns:
- a difference performer that can be used to compare two Author documents using different algorithms and options.
- Throws:
DiffException
- When it fails to create the difference performer.- Since:
- 22
-
-