@Role public interface DiffManager
Modifier and Type | Method and Description |
---|---|
<E> DiffResult<E> |
diff(List<E> previous,
List<E> next,
DiffConfiguration<E> configuration)
Produce a diff between the two provided versions.
|
<E> MergeResult<E> |
merge(List<E> commonAncestor,
List<E> next,
List<E> current,
MergeConfiguration<E> configuration)
Execute a 3-way merge on provided versions.
|
<E> DiffResult<E> diff(List<E> previous, List<E> next, DiffConfiguration<E> configuration) throws DiffException
E
- the type of compared elementsprevious
- the previous version of the content to comparenext
- the next version of the content to compareconfiguration
- the configuration of the diff behaviorDiffException
- error when executing the diff<E> MergeResult<E> merge(List<E> commonAncestor, List<E> next, List<E> current, MergeConfiguration<E> configuration) throws MergeException
E
- the type of compared elementscommonAncestor
- the common ancestor of the two versions of the content to comparenext
- the next version of the content to comparecurrent
- the current version of the content to compareconfiguration
- the configuration of the merge behaviorMergeException
- error when executing the mergeCopyright © 2004–2017 XWiki. All rights reserved.