public abstract class SVNConflictDescription
extends java.lang.Object
ISVNConflictHandler.handleConflict(SVNConflictDescription)
.Constructor and Description |
---|
SVNConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new
SVNConflictDescription object. |
Modifier and Type | Method and Description |
---|---|
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.
|
java.io.File |
getPath()
Returns the working copy path which resulted in a conflict.
|
abstract java.lang.String |
getPropertyName()
Returns the name of the property on which the conflict occurred.
|
abstract boolean |
isPropertyConflict()
Tells whether it's a property merge conflict or not.
|
abstract boolean |
isTextConflict()
Says whether this object represents a text conflict.
|
abstract boolean |
isTreeConflict()
Says whether this object represents a tree conflict.
|
void |
setConflictAction(SVNConflictAction action) |
public SVNConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, 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 on
conflict; otherwise falseconflictAction
- action which lead to the conflictconflictReason
- why the conflict ever occurredpublic abstract boolean isTextConflict()
public abstract boolean isPropertyConflict()
public abstract boolean isTreeConflict()
public java.io.File getPath()
public SVNMergeFileSet getMergeFiles()
public SVNConflictAction getConflictAction()
public SVNConflictReason getConflictReason()
public SVNNodeKind getNodeKind()
public abstract java.lang.String getPropertyName()
property conflict
.public void setConflictAction(SVNConflictAction action)
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.