public class DiffResolver
extends oracle.adf.share.merge.ADFDiffResolver
Modifier and Type | Field and Description |
---|---|
static int |
CONFLICT_INS_CHILD_DIFF |
static int |
CONFLICT_INS_CHILD_DIFF_DEL |
static int |
CONFLICT_INS_CHILD_DIFF_INS |
static int |
CONFLICT_INS_CHILD_DIFF_UPD |
static int |
RESOLVE_CHILD |
CONFLICT_INS_ELEM_DEL_BY_ANOTHER, CONFLICT_INS_ELEM_INS_BY_ANOTHER, CONFLICT_UNKNOWN, CONFLICT_UPD_ELEM_DEL_BY_ANOTHER, CONFLICT_UPD_ELEM_UPD_BY_ANOTHER, MERGE_ORIGIN_PUBLISH, MERGE_ORIGIN_REFRESH, RESOLVE_EDIT_WINS, RESOLVE_NONE, RESOLVE_SCAN, RESOLVE_TO_MERGE_WINS
Constructor and Description |
---|
DiffResolver() |
Modifier and Type | Method and Description |
---|---|
void |
addSavedDiff(DifferBase childDif) |
void |
applyDiffChildren(DifferDetails editDif) |
void |
applyDiffContents(DifferDetails editDif) |
boolean |
beforeResolve(DifferChangeEntry.DifferChangeOper oper,
DifferBase resolveResult,
java.lang.String elemToAdd,
java.lang.Class type,
java.lang.Object newVal,
java.lang.Object oldVal) |
void |
beginMerge(int origin) |
void |
beginResolutionForDef(PersistableDefObject editObj,
PersistableDefObject tipObj,
PersistableDefObject origObj) |
DifferBase |
checkForRename(DifferBase resolveResult,
java.lang.Object id,
java.lang.Object editValue,
java.lang.Object toMergeValue,
DifferDetails childDif) |
void |
endMerge(boolean isOnError) |
void |
endResolutionForDef(PersistableDefObject editObj,
PersistableDefObject tipObj,
PersistableDefObject origObj) |
DifferBase |
findSavedDiff(java.lang.String fullName) |
java.lang.Object |
getPersistentObj(java.lang.String defFullName,
java.lang.String id) |
java.lang.String |
getTransMajor() |
java.lang.String |
getTransMinor() |
void |
insertChild(DifferChildren editDif,
DiffChildrenMerge dm,
java.lang.Object id,
java.lang.Object value) |
boolean |
mergeDiffs(DifferBase editDif,
DifferBase resolveResult) |
void |
registerDiffMergeManagers() |
void |
removeChild(DifferChildren editDif,
DiffChildrenMerge dm,
java.lang.Object id) |
void |
renameChildDef(DifferDetails childDif,
java.lang.Object newVal,
int resolution,
java.lang.Object editValue,
java.lang.Object toMergeValue) |
int |
resolveADFMergeConflict(int conflict,
java.lang.Object resolveResult,
java.lang.Object id,
java.lang.Object editValue,
java.lang.Object toMergeValue,
java.lang.Object oldValue,
java.lang.Object childDifDetails) |
int |
resolveMergeConflict(int conflict,
DifferBase resolveResult,
java.lang.Object id,
java.lang.Object editValue,
java.lang.Object toMergeValue,
java.lang.Object oldValue,
java.lang.Object childDifDetails) |
void |
setPersistentObj(java.lang.String defFullName,
java.lang.String id,
java.lang.Object o) |
void |
updateChild(DifferChildren editDif,
DiffChildrenMerge dm,
java.lang.Object id,
java.lang.Object value,
java.lang.Object oldValue) |
public static final int CONFLICT_INS_CHILD_DIFF
public static final int CONFLICT_INS_CHILD_DIFF_DEL
public static final int CONFLICT_INS_CHILD_DIFF_INS
public static final int CONFLICT_INS_CHILD_DIFF_UPD
public static final int RESOLVE_CHILD
public void beginMerge(int origin)
beginMerge
in class oracle.adf.share.merge.ADFDiffResolver
public void endMerge(boolean isOnError)
endMerge
in class oracle.adf.share.merge.ADFDiffResolver
public java.lang.String getTransMajor()
public java.lang.String getTransMinor()
public java.lang.Object getPersistentObj(java.lang.String defFullName, java.lang.String id)
public void setPersistentObj(java.lang.String defFullName, java.lang.String id, java.lang.Object o)
public void addSavedDiff(DifferBase childDif)
public DifferBase findSavedDiff(java.lang.String fullName)
public void beginResolutionForDef(PersistableDefObject editObj, PersistableDefObject tipObj, PersistableDefObject origObj)
public void endResolutionForDef(PersistableDefObject editObj, PersistableDefObject tipObj, PersistableDefObject origObj)
public boolean beforeResolve(DifferChangeEntry.DifferChangeOper oper, DifferBase resolveResult, java.lang.String elemToAdd, java.lang.Class type, java.lang.Object newVal, java.lang.Object oldVal)
public boolean mergeDiffs(DifferBase editDif, DifferBase resolveResult)
public DifferBase checkForRename(DifferBase resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object toMergeValue, DifferDetails childDif)
public void renameChildDef(DifferDetails childDif, java.lang.Object newVal, int resolution, java.lang.Object editValue, java.lang.Object toMergeValue)
public int resolveADFMergeConflict(int conflict, java.lang.Object resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object toMergeValue, java.lang.Object oldValue, java.lang.Object childDifDetails)
resolveADFMergeConflict
in class oracle.adf.share.merge.ADFDiffResolver
public int resolveMergeConflict(int conflict, DifferBase resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object toMergeValue, java.lang.Object oldValue, java.lang.Object childDifDetails)
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)
public void registerDiffMergeManagers()
registerDiffMergeManagers
in class oracle.adf.share.merge.ADFDiffResolver