Package org.tmatesoft.svn.core.wc
Class SVNConflictDescription
java.lang.Object
org.tmatesoft.svn.core.wc.SVNConflictDescription
- Direct Known Subclasses:
SVNPropertyConflictDescription
,SVNTextConflictDescription
,SVNTreeConflictDescription
The SVNConflictDescription represents an object that describes a conflict that has occurred in the
working copy. It's passed to
ISVNConflictHandler.handleConflict(SVNConflictDescription)
.- Since:
- 1.2
- Version:
- 1.3
- Author:
- TMate Software Ltd.
-
Constructor Summary
ConstructorsConstructorDescriptionSVNConflictDescription
(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason) Creates a newSVNConflictDescription
object. -
Method Summary
Modifier and TypeMethodDescriptionReturns the action which attempted on an object and which lead to the conflict.Returns the reason why the conflict occurred.Returns information about files involved in the merge.Returns the node kind of the item which the conflict occurred on.getPath()
Returns the working copy path which resulted in a conflict.abstract String
Returns the name of the property on which the conflict occurred.abstract boolean
Tells whether it's a property merge conflict or not.abstract boolean
Says whether this object represents a text conflict.abstract boolean
Says whether this object represents a tree conflict.void
setConflictAction
(SVNConflictAction action)
-
Constructor Details
-
SVNConflictDescription
public SVNConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason) Creates a newSVNConflictDescription
object.propertyName
is relevant only for property conflicts (i.e. in caseisPropertyConflict
is true).- Parameters:
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 occurred
-
-
Method Details
-
isTextConflict
public abstract boolean isTextConflict()Says whether this object represents a text conflict.- Returns:
- true if it's a text conflict; otherwise false
- Since:
- 1.3
-
isPropertyConflict
public abstract boolean isPropertyConflict()Tells whether it's a property merge conflict or not.- Returns:
- true if the conflict occurred while modifying a property; otherwise false
- Since:
- 1.3
-
isTreeConflict
public abstract boolean isTreeConflict()Says whether this object represents a tree conflict.- Returns:
- true if it's a tree conflict; otherwise false
- Since:
- 1.3
-
getPath
Returns the working copy path which resulted in a conflict.- Returns:
- working copy path
- Since:
- 1.3
-
getMergeFiles
Returns information about files involved in the merge.- Returns:
- merge file set
-
getConflictAction
Returns the action which attempted on an object and which lead to the conflict.- Returns:
- conflicted action
-
getConflictReason
Returns the reason why the conflict occurred.- Returns:
- reason of the conflict
-
getNodeKind
Returns the node kind of the item which the conflict occurred on.- Returns:
- node kind
-
getPropertyName
Returns the name of the property on which the conflict occurred. Note: relevant only in case of aproperty conflict
.- Returns:
- conflicted property name
-
setConflictAction
-