public class SVNPropertyConflictDescription extends SVNConflictDescription
Constructor and Description |
---|
SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
java.lang.String propertyName,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new
SVNPropertyConflictDescription object. |
Modifier and Type | Method and Description |
---|---|
java.lang.String |
getPropertyName()
Returns the name of the property, on which the conflict occurred.
|
boolean |
isPropertyConflict()
Returns
true . |
boolean |
isTextConflict()
Returns
false . |
boolean |
isTreeConflict()
Returns
false . |
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, getPath, setConflictAction
public SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, java.lang.String propertyName, SVNConflictAction conflictAction, SVNConflictReason conflictReason)
SVNPropertyConflictDescription
object.mergeFiles
- files involved in a property conflictnodeKind
- kind of the conflicted nodepropertyName
- versioned property nameconflictAction
- action lead to the conflictconflictReason
- the reason why the conflict occurredpublic boolean isTextConflict()
false
.isTextConflict
in class SVNConflictDescription
false
public boolean isPropertyConflict()
true
.isPropertyConflict
in class SVNConflictDescription
true
public boolean isTreeConflict()
false
.isTreeConflict
in class SVNConflictDescription
false
public java.lang.String getPropertyName()
getPropertyName
in class SVNConflictDescription
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.