|
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
public class SVNConflictDescription
The SVNConflictDescription represents an object that describes a conflict that has occurred in the
working copy. It's passed to ISVNConflictHandler.handleConflict(SVNConflictDescription)
.
Constructor Summary | |
---|---|
SVNConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
String propertyName,
boolean isPropertyConflict,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new SVNConflictDescription object. |
Method Summary | |
---|---|
SVNConflictAction |
getConflictAction()
Returns the action which attempted on an object and which lead to the conflict. |
SVNConflictReason |
getConflictReason()
Returns the reason why the conflict occurred. |
SVNMergeFileSet |
getMergeFiles()
Returns information about files involved in the merge. |
SVNNodeKind |
getNodeKind()
Returns the node kind of the item which the conflict occurred on. |
String |
getPropertyName()
Returns the name of the property on which the conflict occurred. |
boolean |
isPropertyConflict()
Tells whether it's a property merge conflict or not. |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public SVNConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, String propertyName, boolean isPropertyConflict, SVNConflictAction conflictAction, SVNConflictReason conflictReason)
SVNConflictDescription
object.
propertyName
is relevant only for property conflicts (i.e. in case
isPropertyConflict
is true).
mergeFiles
- files involved in the mergenodeKind
- node kind of the item which the conflict occurred onpropertyName
- name of the property property which the conflict occurred onisPropertyConflict
- true if this object describes a property
conflict; otherwise falseconflictAction
- action which lead to the conflictconflictReason
- why the conflict ever occurredMethod Detail |
---|
public SVNMergeFileSet getMergeFiles()
public SVNConflictAction getConflictAction()
public SVNConflictReason getConflictReason()
public boolean isPropertyConflict()
public SVNNodeKind getNodeKind()
public String getPropertyName()
property conflict
.
|
SVNKit Home | ||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |