cq-quickstart-6.4.0-apis  Overview  Package   Class  Statistics  Help 
Generated by
JDiff
 PREV CLASS   NEXT CLASS          FRAMES    NO FRAMES DETAIL:   CONSTRUCTORS |  METHODS |  FIELDS

Class org.apache.jackrabbit.oak.spi.commit.CompositeConflictHandler

Removed interface org.apache.jackrabbit.oak.spi.commit.ConflictHandler.
Added interface org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.

Changed Methods
Resolution addExistingNode(NodeBuilder, String, NodeState, NodeState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
  
Resolution addExistingProperty(NodeBuilder, PropertyState, PropertyState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
  
CompositeConflictHandler addHandler(ThreeWayConflictHandler) Change in signature from PartialConflictHandler to ThreeWayConflictHandler.
 Add a new backing conflict handler.
Resolution changeChangedProperty(NodeBuilder, PropertyState, PropertyState, PropertyState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
Change in signature from (NodeBuilder, PropertyState, PropertyState) to (NodeBuilder, PropertyState, PropertyState, PropertyState).
  
Resolution changeDeletedNode(NodeBuilder, String, NodeState, NodeState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
Change in signature from (NodeBuilder, String, NodeState) to (NodeBuilder, String, NodeState, NodeState).
  
Resolution changeDeletedProperty(NodeBuilder, PropertyState, PropertyState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
Change in signature from (NodeBuilder, PropertyState) to (NodeBuilder, PropertyState, PropertyState).
  
Resolution deleteChangedNode(NodeBuilder, String, NodeState, NodeState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
Change in signature from (NodeBuilder, String, NodeState) to (NodeBuilder, String, NodeState, NodeState).
  
Resolution deleteChangedProperty(NodeBuilder, PropertyState, PropertyState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
Change in signature from (NodeBuilder, PropertyState) to (NodeBuilder, PropertyState, PropertyState).
  
Resolution deleteDeletedNode(NodeBuilder, String, NodeState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
Change in signature from (NodeBuilder, String) to (NodeBuilder, String, NodeState).
  
Resolution deleteDeletedProperty(NodeBuilder, PropertyState) Change in return type from org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler.Resolution to org.apache.jackrabbit.oak.spi.commit.ThreeWayConflictHandler.Resolution.
  
 

cq-quickstart-6.4.0-apis  Overview  Package   Class  Statistics  Help 
 PREV CLASS   NEXT CLASS          FRAMES    NO FRAMES