Package org.apache.jackrabbit.oak.spi.state

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 of AbstractRebaseDiff implements a NodeStateDiff, which performs the conflict handling as defined in NodeStore.rebase(NodeBuilder) on the Oak SPI state level by annotating conflicting items with conflict markers.

Field Summary

Fields

Modifier and Type	Field	Description
static String	BASE
static String	CONFLICT
static String	OURS

Constructor Summary

Constructors

Constructor	Description
ConflictAnnotatingRebaseDiff(NodeBuilder builder)

Method Summary

Modifier and Type	Method	Description
protected void	addExistingNode(NodeBuilder builder, String name, NodeState before, NodeState after)	Called when the node after 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 property after 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 property after was changed on the branch but was already changed to before in the trunk.
protected void	changeDeletedNode(NodeBuilder builder, String name, NodeState after, NodeState base)	Called when the node after 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 property after was changed on the branch but was deleted already in the trunk.
protected ConflictAnnotatingRebaseDiff	createDiff(NodeBuilder builder, String name)	Factory method for creating a rebase handler for the named child of the passed parent builder.
protected void	deleteChangedNode(NodeBuilder builder, String name, NodeState before)	Called when the node before 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 property before was deleted in the branch but was already changed in the trunk.
protected void	deleteDeletedNode(NodeBuilder builder, String name, NodeState before)	Called when the node before 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 property before 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

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

CONFLICT

public static final String CONFLICT

See Also:

Constant Field Values

BASE

public static final String BASE

See Also:

Constant Field Values

OURS

public static final String OURS

See Also:

Constant Field Values

Constructor Detail

ConflictAnnotatingRebaseDiff

public ConflictAnnotatingRebaseDiff(NodeBuilder builder)

Method Detail

createDiff

protected ConflictAnnotatingRebaseDiff createDiff(NodeBuilder builder,
                                                  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 class AbstractRebaseDiff

Parameters:

builder - parent builder

name - name of the child for which to return a rebase handler

Returns:

rebase handler for child name in builder

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 property after was added on the branch but the property exists already in the trunk.

Specified by:

addExistingProperty in class AbstractRebaseDiff

Parameters:

builder - parent builder

before - existing property

after - 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 property after was changed on the branch but was deleted already in the trunk.

Specified by:

changeDeletedProperty in class AbstractRebaseDiff

Parameters:

builder - parent builder

after - changed property

base - 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 property after was changed on the branch but was already changed to before in the trunk.

Specified by:

changeChangedProperty in class AbstractRebaseDiff

Parameters:

builder - parent property

before - changed property in branch

after - 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 property before was deleted in the branch but was already deleted in the trunk.

Specified by:

deleteDeletedProperty in class AbstractRebaseDiff

Parameters:

builder - parent builder

before - deleted property

deleteChangedProperty

protected void deleteChangedProperty(NodeBuilder builder,
                                     org.apache.jackrabbit.oak.api.PropertyState before)

Description copied from class: AbstractRebaseDiff

Called when the property before was deleted in the branch but was already changed in the trunk.

Specified by:

deleteChangedProperty in class AbstractRebaseDiff

Parameters:

builder - parent builder

before - deleted property

addExistingNode

protected void addExistingNode(NodeBuilder builder,
                               String name,
                               NodeState before,
                               NodeState after)

Description copied from class: AbstractRebaseDiff

Called when the node after was added on the branch but the node exists already in the trunk.

Specified by:

addExistingNode in class AbstractRebaseDiff

Parameters:

builder - parent builder

name - name of the added node

before - existing node

after - added added

changeDeletedNode

protected void changeDeletedNode(NodeBuilder builder,
                                 String name,
                                 NodeState after,
                                 NodeState base)

Description copied from class: AbstractRebaseDiff

Called when the node after was changed on the branch but was deleted already in the trunk.

Specified by:

changeDeletedNode in class AbstractRebaseDiff

Parameters:

builder - parent builder

name - name of the changed node

after - changed node

base - base node

deleteDeletedNode

protected void deleteDeletedNode(NodeBuilder builder,
                                 String name,
                                 NodeState before)

Description copied from class: AbstractRebaseDiff

Called when the node before was deleted in the branch but was already deleted in the trunk.

Specified by:

deleteDeletedNode in class AbstractRebaseDiff

Parameters:

builder - parent builder

before - deleted node

deleteChangedNode

protected void deleteChangedNode(NodeBuilder builder,
                                 String name,
                                 NodeState before)

Description copied from class: AbstractRebaseDiff

Called when the node before was deleted in the branch but was already changed in the trunk.

Specified by:

deleteChangedNode in class AbstractRebaseDiff

Parameters:

builder - parent builder

before - deleted node