Uses of Class
org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution

Packages that use PartialConflictHandler.Resolution

Package	Description
org.apache.jackrabbit.oak.plugins.commit
org.apache.jackrabbit.oak.spi.commit

Uses of PartialConflictHandler.Resolution in org.apache.jackrabbit.oak.plugins.commit

Methods in org.apache.jackrabbit.oak.plugins.commit that return PartialConflictHandler.Resolution

Modifier and Type	Method and Description
PartialConflictHandler.Resolution	ChildOrderConflictHandler.addExistingNode(NodeBuilder parent, String name, NodeState ours, NodeState theirs)
PartialConflictHandler.Resolution	DefaultConflictHandler.addExistingNode(NodeBuilder parent, String name, NodeState ours, NodeState theirs) Deprecated.
PartialConflictHandler.Resolution	ChildOrderConflictHandler.addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs)
PartialConflictHandler.Resolution	DefaultConflictHandler.addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs) Deprecated.
PartialConflictHandler.Resolution	ChildOrderConflictHandler.changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs)
PartialConflictHandler.Resolution	DefaultConflictHandler.changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs) Deprecated.
PartialConflictHandler.Resolution	ChildOrderConflictHandler.changeDeletedNode(NodeBuilder parent, String name, NodeState ours)
PartialConflictHandler.Resolution	DefaultConflictHandler.changeDeletedNode(NodeBuilder parent, String name, NodeState ours) Deprecated.
PartialConflictHandler.Resolution	ChildOrderConflictHandler.changeDeletedProperty(NodeBuilder parent, PropertyState ours)
PartialConflictHandler.Resolution	DefaultConflictHandler.changeDeletedProperty(NodeBuilder parent, PropertyState ours) Deprecated.
PartialConflictHandler.Resolution	ChildOrderConflictHandler.deleteChangedNode(NodeBuilder parent, String name, NodeState theirs)
PartialConflictHandler.Resolution	DefaultConflictHandler.deleteChangedNode(NodeBuilder parent, String name, NodeState theirs) Deprecated.
PartialConflictHandler.Resolution	ChildOrderConflictHandler.deleteChangedProperty(NodeBuilder parent, PropertyState theirs)
PartialConflictHandler.Resolution	DefaultConflictHandler.deleteChangedProperty(NodeBuilder parent, PropertyState theirs) Deprecated.
PartialConflictHandler.Resolution	ChildOrderConflictHandler.deleteDeletedNode(NodeBuilder parent, String name)
PartialConflictHandler.Resolution	DefaultConflictHandler.deleteDeletedNode(NodeBuilder parent, String name) Deprecated.
PartialConflictHandler.Resolution	ChildOrderConflictHandler.deleteDeletedProperty(NodeBuilder parent, PropertyState ours)
PartialConflictHandler.Resolution	DefaultConflictHandler.deleteDeletedProperty(NodeBuilder parent, PropertyState ours) Deprecated.

Constructors in org.apache.jackrabbit.oak.plugins.commit with parameters of type PartialConflictHandler.Resolution

Constructor and Description
DefaultConflictHandler(PartialConflictHandler.Resolution resolution) Deprecated. Create a new ConflictHandler which always returns resolution.

Uses of PartialConflictHandler.Resolution in org.apache.jackrabbit.oak.spi.commit

Methods in org.apache.jackrabbit.oak.spi.commit that return PartialConflictHandler.Resolution

Modifier and Type	Method and Description
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.addExistingNode(NodeBuilder parent, String name, NodeState ours, NodeState theirs) Deprecated. The node ours has been added to parent which conflicts with node theirs which has been added in the persistence store.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.addExistingNode(NodeBuilder parent, String name, NodeState ours, NodeState theirs) Deprecated. The node ours has been added to parent which conflicts with node theirs which has been added in the persistence store.
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs) Deprecated. The property ours has been added to parent which conflicts with property theirs which has been added in the persistence store.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs) Deprecated. The property ours has been added to parent which conflicts with property theirs which has been added in the persistence store.
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs) Deprecated. The property ours has been changed in parent while it was also changed to a different value (theirs) in the persistence store.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs) Deprecated. The property ours has been changed in parent while it was also changed to a different value (theirs) in the persistence store.
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.changeDeletedNode(NodeBuilder parent, String name, NodeState ours) Deprecated. The node ours has been changed in parent while it was removed in the persistence store.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.changeDeletedNode(NodeBuilder parent, String name, NodeState ours) Deprecated. The node ours has been changed in parent while it was removed in the persistence store.
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.changeDeletedProperty(NodeBuilder parent, PropertyState ours) Deprecated. The property ours has been changed in parent while it was removed in the persistence store.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.changeDeletedProperty(NodeBuilder parent, PropertyState ours) Deprecated. The property ours has been changed in parent while it was removed in the persistence store.
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.deleteChangedNode(NodeBuilder parent, String name, NodeState theirs) Deprecated. The node theirs changed in the persistence store while it has been deleted locally.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.deleteChangedNode(NodeBuilder parent, String name, NodeState theirs) Deprecated. The node theirs changed in the persistence store while it has been deleted locally.
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.deleteChangedProperty(NodeBuilder parent, PropertyState theirs) Deprecated. The property theirs changed in the persistence store while it has been deleted locally.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.deleteChangedProperty(NodeBuilder parent, PropertyState theirs) Deprecated. The property theirs changed in the persistence store while it has been deleted locally.
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.deleteDeletedNode(NodeBuilder parent, String name) Deprecated. The node name has been removed in parent while it was also removed in the persistence store.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.deleteDeletedNode(NodeBuilder parent, String name) Deprecated. The node name has been removed in parent while it was also removed in the persistence store.
@Nullable PartialConflictHandler.Resolution	PartialConflictHandler.deleteDeletedProperty(NodeBuilder parent, PropertyState ours) Deprecated. The property ours has been removed in parent while it was also removed in the persistence store.
@NotNull PartialConflictHandler.Resolution	ConflictHandler.deleteDeletedProperty(NodeBuilder parent, PropertyState ours) Deprecated. The property ours has been removed in parent while it was also removed in the persistence store.
static PartialConflictHandler.Resolution	PartialConflictHandler.Resolution.valueOf(String name) Returns the enum constant of this type with the specified name.
static PartialConflictHandler.Resolution[]	PartialConflictHandler.Resolution.values() Returns an array containing the constants of this enum type, in the order they are declared.