public class AnnotatingConflictHandler extends java.lang.Object implements ThreeWayConflictHandler
ThreeWayConflictHandler implementation resolves conflicts to
ThreeWayConflictHandler.Resolution.THEIRS and in addition marks nodes where a
conflict occurred with the mixin rep:MergeConflict:
[rep:MergeConflict] mixin primaryitem rep:ours + rep:ours (rep:Unstructured) protected IGNOREThe
rep:ours sub node contains our version of the node prior to
the conflict.ConflictValidatorThreeWayConflictHandler.Resolution| Constructor and Description |
|---|
AnnotatingConflictHandler() |
| Modifier and Type | Method and Description |
|---|---|
@NotNull ThreeWayConflictHandler.Resolution |
addExistingNode(@NotNull NodeBuilder parent,
@NotNull java.lang.String name,
@NotNull NodeState ours,
@NotNull NodeState theirs)
The node
ours has been added to parent which conflicts
with node theirs which has been added in the persistence store. |
@NotNull ThreeWayConflictHandler.Resolution |
addExistingProperty(@NotNull NodeBuilder parent,
@NotNull PropertyState ours,
@NotNull PropertyState theirs)
The property
ours has been added to parent which conflicts
with property theirs which has been added in the persistence store. |
@NotNull ThreeWayConflictHandler.Resolution |
changeChangedProperty(@NotNull NodeBuilder parent,
@NotNull PropertyState ours,
@NotNull PropertyState theirs,
@NotNull PropertyState base)
The property
ours has been changed in parent while it was
also changed to a different value (theirs) in the persistence store. |
@NotNull ThreeWayConflictHandler.Resolution |
changeDeletedNode(@NotNull NodeBuilder parent,
@NotNull java.lang.String name,
@NotNull NodeState ours,
@NotNull NodeState base)
The node
ours has been changed in parent while it was
removed in the persistence store. |
@NotNull ThreeWayConflictHandler.Resolution |
changeDeletedProperty(@NotNull NodeBuilder parent,
@NotNull PropertyState ours,
@NotNull PropertyState base)
The property
ours has been changed in parent while it was
removed in the persistence store. |
@NotNull ThreeWayConflictHandler.Resolution |
deleteChangedNode(@NotNull NodeBuilder parent,
@NotNull java.lang.String name,
@NotNull NodeState theirs,
@NotNull NodeState base)
The node
theirs changed in the persistence store while it has been
deleted locally. |
@NotNull ThreeWayConflictHandler.Resolution |
deleteChangedProperty(@NotNull NodeBuilder parent,
@NotNull PropertyState theirs,
@NotNull PropertyState base)
The property
theirs changed in the persistence store while it has been
deleted locally. |
@NotNull ThreeWayConflictHandler.Resolution |
deleteDeletedNode(@NotNull NodeBuilder parent,
@NotNull java.lang.String name,
@NotNull NodeState base)
The node
name has been removed in parent while it was
also removed in the persistence store. |
@NotNull ThreeWayConflictHandler.Resolution |
deleteDeletedProperty(@NotNull NodeBuilder parent,
@NotNull PropertyState base)
The property
ours has been removed in parent while it was
also removed in the persistence store. |
@NotNull public @NotNull ThreeWayConflictHandler.Resolution addExistingProperty(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull PropertyState ours, @NotNull @NotNull PropertyState theirs)
ThreeWayConflictHandlerours has been added to parent which conflicts
with property theirs which has been added in the persistence store.addExistingProperty in interface ThreeWayConflictHandlerparent - root of the conflictours - our version of the propertytheirs - their version of the propertyThreeWayConflictHandler.Resolution of the conflict@NotNull public @NotNull ThreeWayConflictHandler.Resolution changeDeletedProperty(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull PropertyState ours, @NotNull @NotNull PropertyState base)
ThreeWayConflictHandlerours has been changed in parent while it was
removed in the persistence store.changeDeletedProperty in interface ThreeWayConflictHandlerparent - root of the conflictours - our version of the propertybase - the base version of the propertyThreeWayConflictHandler.Resolution of the conflict@NotNull public @NotNull ThreeWayConflictHandler.Resolution changeChangedProperty(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull PropertyState ours, @NotNull @NotNull PropertyState theirs, @NotNull @NotNull PropertyState base)
ThreeWayConflictHandlerours has been changed in parent while it was
also changed to a different value (theirs) in the persistence store.changeChangedProperty in interface ThreeWayConflictHandlerparent - root of the conflictours - our version of the propertytheirs - their version of the propertybase - the base version of the propertyThreeWayConflictHandler.Resolution of the conflict@NotNull public @NotNull ThreeWayConflictHandler.Resolution deleteChangedProperty(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull PropertyState theirs, @NotNull @NotNull PropertyState base)
ThreeWayConflictHandlertheirs changed in the persistence store while it has been
deleted locally.deleteChangedProperty in interface ThreeWayConflictHandlerparent - root of the conflicttheirs - their version of the propertybase - the base version of the propertyThreeWayConflictHandler.Resolution of the conflict@NotNull public @NotNull ThreeWayConflictHandler.Resolution deleteDeletedProperty(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull PropertyState base)
ThreeWayConflictHandlerours has been removed in parent while it was
also removed in the persistence store.deleteDeletedProperty in interface ThreeWayConflictHandlerparent - root of the conflictbase - the base version of the propertyThreeWayConflictHandler.Resolution of the conflict@NotNull public @NotNull ThreeWayConflictHandler.Resolution addExistingNode(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull java.lang.String name, @NotNull @NotNull NodeState ours, @NotNull @NotNull NodeState theirs)
ThreeWayConflictHandlerours has been added to parent which conflicts
with node theirs which has been added in the persistence store.addExistingNode in interface ThreeWayConflictHandlerparent - root of the conflictname - name of the nodeours - our version of the nodetheirs - their version of the nodeThreeWayConflictHandler.Resolution of the conflict@NotNull public @NotNull ThreeWayConflictHandler.Resolution changeDeletedNode(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull java.lang.String name, @NotNull @NotNull NodeState ours, @NotNull @NotNull NodeState base)
ThreeWayConflictHandlerours has been changed in parent while it was
removed in the persistence store.changeDeletedNode in interface ThreeWayConflictHandlerparent - root of the conflictname - name of the nodeours - our version of the nodebase - the base version of the nodeThreeWayConflictHandler.Resolution of the conflict@NotNull public @NotNull ThreeWayConflictHandler.Resolution deleteChangedNode(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull java.lang.String name, @NotNull @NotNull NodeState theirs, @NotNull @NotNull NodeState base)
ThreeWayConflictHandlertheirs changed in the persistence store while it has been
deleted locally.deleteChangedNode in interface ThreeWayConflictHandlerparent - root of the conflictname - name of the nodetheirs - their version of the nodebase - the base version of the nodeThreeWayConflictHandler.Resolution of the conflict@NotNull public @NotNull ThreeWayConflictHandler.Resolution deleteDeletedNode(@NotNull @NotNull NodeBuilder parent, @NotNull @NotNull java.lang.String name, @NotNull @NotNull NodeState base)
ThreeWayConflictHandlername has been removed in parent while it was
also removed in the persistence store.deleteDeletedNode in interface ThreeWayConflictHandlerparent - root of the conflictname - name of the nodebase - the base version of the nodeThreeWayConflictHandler.Resolution of the conflictCopyright © 2012–2022 The Apache Software Foundation. All rights reserved.