public class SVNTextConflictDescription extends SVNConflictDescription
Constructor | Description |
---|---|
SVNTextConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason) |
Creates a new
SVNTextConflictDescription object. |
Modifier and Type | Method | Description |
---|---|---|
java.lang.String |
getPropertyName() |
Returns
null . |
boolean |
isPropertyConflict() |
Returns
false . |
boolean |
isTextConflict() |
Returns
true . |
boolean |
isTreeConflict() |
Returns
false . |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, getPath, setConflictAction
public SVNTextConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason)
SVNTextConflictDescription
object.mergeFiles
- files involved in the mergenodeKind
- node kind of the item which the conflict occurred on
conflict; otherwise falseconflictAction
- action which lead to the conflictconflictReason
- why the conflict ever occurredpublic boolean isTextConflict()
true
.isTextConflict
in class SVNConflictDescription
true
public boolean isPropertyConflict()
false
.isPropertyConflict
in class SVNConflictDescription
false
public boolean isTreeConflict()
false
.isTreeConflict
in class SVNConflictDescription
false
public java.lang.String getPropertyName()
null
.getPropertyName
in class SVNConflictDescription
null