public class MergeRecord extends AbstractChangeRecord<MergeRecord>
| Modifier and Type | Class and Description |
|---|---|
static class |
MergeRecord.Result
The result of the merge process.
|
AbstractChangeRecord.ChangeTypeobjectName, objectTypesummary, values| Modifier and Type | Method and Description |
|---|---|
MergeRecord |
clone(java.lang.String newSummary)
Returns a new record which is a copy of this record.
|
static MergeRecord |
create(java.lang.String objName,
java.lang.String objType,
java.lang.String summary)
Creates a merge record.
|
MergeRecord |
elementPath(java.lang.String s)
Indicates the absolute path to the artifact that is changed, or to a
changed element of the object.
|
MergeRecord |
isConflict(boolean b)
Indicates whether this record represents a merge conflict.
|
MergeRecord |
mainlineValue(java.lang.String s)
Indicates the value from the source environment.
|
MergeRecord |
objectId(java.lang.String s)
Indicates the ID of the object involved in the merge process.
|
MergeRecord |
replacement(java.lang.String s)
Indicates the value that replaces the value in the target environment.
|
MergeRecord |
result(MergeRecord.Result r)
Indicates the result of the merge process.
|
MergeRecord |
sandboxValue(java.lang.String s)
Indicates the value in the target environment.
|
changeDate, changedBy, changeType, featureId, repositoryId, toString, urlclone, get, getSummary, initValues, loggedBy, putpublic static MergeRecord create(java.lang.String objName, java.lang.String objType, java.lang.String summary)
objName - the name of the object involved in the merge processobjType - the type of the objectsummary - a brief description of the merge processjava.lang.IllegalArgumentException - if the given object name or type is
nullpublic MergeRecord clone(java.lang.String newSummary)
SandboxLogRecordclone in class SandboxLogRecord<MergeRecord>newSummary - the new summary; null if the summary should
be kept the samepublic MergeRecord objectId(java.lang.String s)
s - the ID of the object involved in the merge processpublic MergeRecord elementPath(java.lang.String s)
s - the absolute path to a changed artifact or a changed element of
the objectpublic MergeRecord sandboxValue(java.lang.String s)
s - the value in the target environmentpublic MergeRecord replacement(java.lang.String s)
s - the replacement valuepublic MergeRecord mainlineValue(java.lang.String s)
s - the value from the source environmentpublic MergeRecord isConflict(boolean b)
b - true if this record represents a merge conflictpublic MergeRecord result(MergeRecord.Result r)
r - the result of the merge process