public class DiffResolver
extends java.lang.Object
Modifier and Type | Field and Description |
---|---|
static int |
CONFLICT_INS_ELEM_DEL_BY_ANOTHER |
static int |
CONFLICT_INS_ELEM_INS_BY_ANOTHER |
static int |
CONFLICT_UPD_ELEM_DEL_BY_ANOTHER |
static int |
CONFLICT_UPD_ELEM_UPD_BY_ANOTHER |
static int |
RESOLVE_EDIT_WINS |
static int |
RESOLVE_NONE |
static int |
RESOLVE_TIP_WINS |
Constructor and Description |
---|
DiffResolver() |
Modifier and Type | Method and Description |
---|---|
void |
applyDiffChildren(DifferDetails editDif) |
void |
applyDiffContents(DifferDetails editDif) |
void |
insertChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id, java.lang.Object value) |
boolean |
mergeDiffs(DifferBase editDif, DifferBase resolveResult) |
void |
removeChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id) |
int |
resolveMergeConflict(int conflict, DifferBase resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object tipValue, java.lang.Object oldValue) |
void |
updateChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id, java.lang.Object value, java.lang.Object oldValue) |
public static final int CONFLICT_INS_ELEM_DEL_BY_ANOTHER
public static final int CONFLICT_UPD_ELEM_DEL_BY_ANOTHER
public static final int CONFLICT_INS_ELEM_INS_BY_ANOTHER
public static final int CONFLICT_UPD_ELEM_UPD_BY_ANOTHER
public static final int RESOLVE_NONE
public static final int RESOLVE_EDIT_WINS
public static final int RESOLVE_TIP_WINS
public boolean mergeDiffs(DifferBase editDif, DifferBase resolveResult)
public int resolveMergeConflict(int conflict, DifferBase resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object tipValue, java.lang.Object oldValue)
public void applyDiffContents(DifferDetails editDif)
public void applyDiffChildren(DifferDetails editDif)
public void insertChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id, java.lang.Object value)
public void updateChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id, java.lang.Object value, java.lang.Object oldValue)
public void removeChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id)