Class ConflictAnnotatingRebaseDiff
- java.lang.Object
-
- org.apache.jackrabbit.oak.spi.state.AbstractRebaseDiff
-
- org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff
-
- All Implemented Interfaces:
NodeStateDiff
public class ConflictAnnotatingRebaseDiff extends AbstractRebaseDiff
This implementation ofAbstractRebaseDiff
implements aNodeStateDiff
, which performs the conflict handling as defined inNodeStore.rebase(NodeBuilder)
on the Oak SPI state level by annotating conflicting items with conflict markers.
-
-
Constructor Summary
Constructors Constructor Description ConflictAnnotatingRebaseDiff(NodeBuilder builder)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description protected void
addExistingNode(NodeBuilder builder, java.lang.String name, NodeState before, NodeState after)
Called when the nodeafter
was added on the branch but the node exists already in the trunk.protected void
addExistingProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState before, org.apache.jackrabbit.oak.api.PropertyState after)
Called when the propertyafter
was added on the branch but the property exists already in the trunk.protected void
changeChangedProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState before, org.apache.jackrabbit.oak.api.PropertyState after)
Called when the propertyafter
was changed on the branch but was already changed tobefore
in the trunk.protected void
changeDeletedNode(NodeBuilder builder, java.lang.String name, NodeState after, NodeState base)
Called when the nodeafter
was changed on the branch but was deleted already in the trunk.protected void
changeDeletedProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState after, org.apache.jackrabbit.oak.api.PropertyState base)
Called when the propertyafter
was changed on the branch but was deleted already in the trunk.protected ConflictAnnotatingRebaseDiff
createDiff(NodeBuilder builder, java.lang.String name)
Factory method for creating a rebase handler for the named child of the passed parent builder.protected void
deleteChangedNode(NodeBuilder builder, java.lang.String name, NodeState before)
Called when the nodebefore
was deleted in the branch but was already changed in the trunk.protected void
deleteChangedProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState before)
Called when the propertybefore
was deleted in the branch but was already changed in the trunk.protected void
deleteDeletedNode(NodeBuilder builder, java.lang.String name, NodeState before)
Called when the nodebefore
was deleted in the branch but was already deleted in the trunk.protected void
deleteDeletedProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState before)
Called when the propertybefore
was deleted in the branch but was already deleted in the trunk.-
Methods inherited from class org.apache.jackrabbit.oak.spi.state.AbstractRebaseDiff
childNodeAdded, childNodeChanged, childNodeDeleted, propertyAdded, propertyChanged, propertyDeleted
-
-
-
-
Field Detail
-
CONFLICT
public static final java.lang.String CONFLICT
- See Also:
- Constant Field Values
-
BASE
public static final java.lang.String BASE
- See Also:
- Constant Field Values
-
OURS
public static final java.lang.String OURS
- See Also:
- Constant Field Values
-
-
Constructor Detail
-
ConflictAnnotatingRebaseDiff
public ConflictAnnotatingRebaseDiff(NodeBuilder builder)
-
-
Method Detail
-
createDiff
protected ConflictAnnotatingRebaseDiff createDiff(NodeBuilder builder, java.lang.String name)
Description copied from class:AbstractRebaseDiff
Factory method for creating a rebase handler for the named child of the passed parent builder.- Specified by:
createDiff
in classAbstractRebaseDiff
- Parameters:
builder
- parent buildername
- name of the child for which to return a rebase handler- Returns:
- rebase handler for child
name
inbuilder
-
addExistingProperty
protected void addExistingProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState before, org.apache.jackrabbit.oak.api.PropertyState after)
Description copied from class:AbstractRebaseDiff
Called when the propertyafter
was added on the branch but the property exists already in the trunk.- Specified by:
addExistingProperty
in classAbstractRebaseDiff
- Parameters:
builder
- parent builderbefore
- existing propertyafter
- added property
-
changeDeletedProperty
protected void changeDeletedProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState after, org.apache.jackrabbit.oak.api.PropertyState base)
Description copied from class:AbstractRebaseDiff
Called when the propertyafter
was changed on the branch but was deleted already in the trunk.- Specified by:
changeDeletedProperty
in classAbstractRebaseDiff
- Parameters:
builder
- parent builderafter
- changed propertybase
- base property
-
changeChangedProperty
protected void changeChangedProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState before, org.apache.jackrabbit.oak.api.PropertyState after)
Description copied from class:AbstractRebaseDiff
Called when the propertyafter
was changed on the branch but was already changed tobefore
in the trunk.- Specified by:
changeChangedProperty
in classAbstractRebaseDiff
- Parameters:
builder
- parent propertybefore
- changed property in branchafter
- changed property in trunk
-
deleteDeletedProperty
protected void deleteDeletedProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState before)
Description copied from class:AbstractRebaseDiff
Called when the propertybefore
was deleted in the branch but was already deleted in the trunk.- Specified by:
deleteDeletedProperty
in classAbstractRebaseDiff
- Parameters:
builder
- parent builderbefore
- deleted property
-
deleteChangedProperty
protected void deleteChangedProperty(NodeBuilder builder, org.apache.jackrabbit.oak.api.PropertyState before)
Description copied from class:AbstractRebaseDiff
Called when the propertybefore
was deleted in the branch but was already changed in the trunk.- Specified by:
deleteChangedProperty
in classAbstractRebaseDiff
- Parameters:
builder
- parent builderbefore
- deleted property
-
addExistingNode
protected void addExistingNode(NodeBuilder builder, java.lang.String name, NodeState before, NodeState after)
Description copied from class:AbstractRebaseDiff
Called when the nodeafter
was added on the branch but the node exists already in the trunk.- Specified by:
addExistingNode
in classAbstractRebaseDiff
- Parameters:
builder
- parent buildername
- name of the added nodebefore
- existing nodeafter
- added added
-
changeDeletedNode
protected void changeDeletedNode(NodeBuilder builder, java.lang.String name, NodeState after, NodeState base)
Description copied from class:AbstractRebaseDiff
Called when the nodeafter
was changed on the branch but was deleted already in the trunk.- Specified by:
changeDeletedNode
in classAbstractRebaseDiff
- Parameters:
builder
- parent buildername
- name of the changed nodeafter
- changed nodebase
- base node
-
deleteDeletedNode
protected void deleteDeletedNode(NodeBuilder builder, java.lang.String name, NodeState before)
Description copied from class:AbstractRebaseDiff
Called when the nodebefore
was deleted in the branch but was already deleted in the trunk.- Specified by:
deleteDeletedNode
in classAbstractRebaseDiff
- Parameters:
builder
- parent builderbefore
- deleted node
-
deleteChangedNode
protected void deleteChangedNode(NodeBuilder builder, java.lang.String name, NodeState before)
Description copied from class:AbstractRebaseDiff
Called when the nodebefore
was deleted in the branch but was already changed in the trunk.- Specified by:
deleteChangedNode
in classAbstractRebaseDiff
- Parameters:
builder
- parent builderbefore
- deleted node
-
-