|
SVNKit Home | |||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectorg.tmatesoft.svn.core.wc.SVNConflictDescription
org.tmatesoft.svn.core.wc.SVNPropertyConflictDescription
SVNPropertyConflictDescription brings a property conflict description.
Constructor Summary | |
SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
String propertyName,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new SVNPropertyConflictDescription object. |
Method Summary | |
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 . |
Methods inherited from class org.tmatesoft.svn.core.wc.SVNConflictDescription |
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, getPath, toString |
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait |
Constructor Detail |
public SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, 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 occurredMethod Detail |
public 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 String getPropertyName()
getPropertyName
in class SVNConflictDescription
|
SVNKit Home | |||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |