@Override protected void deleteChangedProperty(NodeBuilder builder, PropertyState before) { NodeBuilder cb = conflictMarker(builder, DELETE_CHANGED_PROPERTY); cb.child(BASE).setProperty(before); }
@Override protected void deleteDeletedNode(NodeBuilder builder, String name, NodeState before) { NodeBuilder cb = conflictMarker(builder, DELETE_DELETED_NODE); cb.child(BASE).setChildNode(name, before); }
@Override protected void deleteChangedNode(NodeBuilder builder, String name, NodeState before) { NodeBuilder cb = conflictMarker(builder, DELETE_CHANGED_NODE); cb.child(BASE).setChildNode(name, before); }
@Override protected void deleteChangedProperty(NodeBuilder builder, PropertyState before) { NodeBuilder cb = conflictMarker(builder, DELETE_CHANGED_PROPERTY); cb.child(BASE).setProperty(before); }
@Override protected void deleteDeletedNode(NodeBuilder builder, String name, NodeState before) { NodeBuilder cb = conflictMarker(builder, DELETE_DELETED_NODE); cb.child(BASE).setChildNode(name, before); }
@Override protected void deleteDeletedProperty(NodeBuilder builder, PropertyState before) { NodeBuilder cb = conflictMarker(builder, DELETE_DELETED_PROPERTY); cb.child(BASE).setProperty(before); }
@Override protected void deleteChangedNode(NodeBuilder builder, String name, NodeState before) { NodeBuilder cb = conflictMarker(builder, DELETE_CHANGED_NODE); cb.child(BASE).setChildNode(name, before); }
@Override protected void deleteDeletedProperty(NodeBuilder builder, PropertyState before) { NodeBuilder cb = conflictMarker(builder, DELETE_DELETED_PROPERTY); cb.child(BASE).setProperty(before); }
@Override protected void addExistingProperty(NodeBuilder builder, PropertyState before, PropertyState after) { NodeBuilder cb = conflictMarker(builder, ADD_EXISTING_PROPERTY); cb.child(BASE).setProperty(before); cb.child(OURS).setProperty(after); }
@Override protected void changeDeletedNode(NodeBuilder builder, String name, NodeState after, NodeState base) { NodeBuilder cb = conflictMarker(builder, CHANGE_DELETED_NODE); cb.child(BASE).setChildNode(name, base); cb.child(OURS).setChildNode(name, after); }
@Override protected void changeDeletedNode(NodeBuilder builder, String name, NodeState after, NodeState base) { NodeBuilder cb = conflictMarker(builder, CHANGE_DELETED_NODE); cb.child(BASE).setChildNode(name, base); cb.child(OURS).setChildNode(name, after); }
@Override protected void addExistingNode(NodeBuilder builder, String name, NodeState before, NodeState after) { NodeBuilder cb = conflictMarker(builder, ADD_EXISTING_NODE); cb.child(BASE).setChildNode(name, before); cb.child(OURS).setChildNode(name, after); }
@Override protected void addExistingNode(NodeBuilder builder, String name, NodeState before, NodeState after) { NodeBuilder cb = conflictMarker(builder, ADD_EXISTING_NODE); cb.child(BASE).setChildNode(name, before); cb.child(OURS).setChildNode(name, after); }
@Override protected void changeDeletedProperty(NodeBuilder builder, PropertyState after, PropertyState base) { NodeBuilder cb = conflictMarker(builder, CHANGE_DELETED_PROPERTY); cb.child(BASE).setProperty(base); cb.child(OURS).setProperty(after); }
@Override protected void changeChangedProperty(NodeBuilder builder, PropertyState before, PropertyState after) { NodeBuilder cb = conflictMarker(builder, CHANGE_CHANGED_PROPERTY); cb.child(BASE).setProperty(before); cb.child(OURS).setProperty(after); }
@Override protected void addExistingProperty(NodeBuilder builder, PropertyState before, PropertyState after) { NodeBuilder cb = conflictMarker(builder, ADD_EXISTING_PROPERTY); cb.child(BASE).setProperty(before); cb.child(OURS).setProperty(after); }
@Override protected void changeDeletedProperty(NodeBuilder builder, PropertyState after, PropertyState base) { NodeBuilder cb = conflictMarker(builder, CHANGE_DELETED_PROPERTY); cb.child(BASE).setProperty(base); cb.child(OURS).setProperty(after); }
@Override protected void changeChangedProperty(NodeBuilder builder, PropertyState before, PropertyState after) { NodeBuilder cb = conflictMarker(builder, CHANGE_CHANGED_PROPERTY); cb.child(BASE).setProperty(before); cb.child(OURS).setProperty(after); }