@Component @Named(value="diff") @Singleton public class DiffScriptService extends Object implements ScriptService
| Constructor and Description |
|---|
DiffScriptService() |
| 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.
|
ScriptService |
getDisplay() |
Exception |
getLastError()
Get the error generated while performing the previously called action.
|
<E> MergeResult<E> |
merge(List<E> commonAncestor,
List<E> next,
List<E> current,
MergeConfiguration<E> configuration)
Execute a 3-way merge on provided versions.
|
public ScriptService getDisplay()
public <E> DiffResult<E> diff(List<E> previous, List<E> next, DiffConfiguration<E> configuration)
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 behaviorpublic <E> MergeResult<E> merge(List<E> commonAncestor, List<E> next, List<E> current, MergeConfiguration<E> configuration)
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 behaviorpublic Exception getLastError()
null if no exception was thrownCopyright © 2004–2017 XWiki. All rights reserved.