Package org.tmatesoft.svn.core.wc

Class SVNTreeConflictDescription

java.lang.Object

org.tmatesoft.svn.core.wc.SVNConflictDescription

org.tmatesoft.svn.core.wc.SVNTreeConflictDescription

public class SVNTreeConflictDescription
extends SVNConflictDescription

SVNTreeConflictDescription brings information on a tree conflict.

Since:

1.3

Version:

1.3

Field Summary

Fields

Modifier and Type	Field	Description
private SVNOperation	myOperation
private SVNConflictVersion	mySourceLeftVersion
private SVNConflictVersion	mySourceRightVersion

Constructor Summary

Constructors

Constructor	Description
SVNTreeConflictDescription(java.io.File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion)	Creates a new SVNTreeConflictDescription.

Method Summary

Modifier and Type	Method	Description
SVNOperation	getOperation()	Returns the user operation that exposed this tree conflict.
java.io.File	getPath()	Returns the wc file.
java.lang.String	getPropertyName()	Returns null.
SVNConflictVersion	getSourceLeftVersion()	Returns info on the "merge-left source" or "older" version of incoming change.
SVNConflictVersion	getSourceRightVersion()	Returns info on the "merge-right source" or "their" version of incoming change.
boolean	isPropertyConflict()	Returns false.
boolean	isTextConflict()	Returns false.
boolean	isTreeConflict()	Returns true.
void	setSourceLeftVersion(SVNConflictVersion sourceLeftVersion)

Methods inherited from class org.tmatesoft.svn.core.wc.SVNConflictDescription

getConflictAction, getConflictReason, getMergeFiles, getNodeKind, setConflictAction

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Details

myOperation

private SVNOperation myOperation

mySourceLeftVersion

private SVNConflictVersion mySourceLeftVersion

mySourceRightVersion

private SVNConflictVersion mySourceRightVersion

Constructor Details

SVNTreeConflictDescription

public SVNTreeConflictDescription(java.io.File path,
 SVNNodeKind nodeKind,
 SVNConflictAction conflictAction,
 SVNConflictReason conflictReason,
 SVNOperation operation,
 SVNConflictVersion sourceLeftVersion,
 SVNConflictVersion sourceRightVersion)

Creates a new SVNTreeConflictDescription.

Parameters:

path - wc path

nodeKind - kind of the node, on which the tree conflict occurred

conflictAction - action which lead to the conflict

conflictReason - reason why the conflict occurred

operation - user operation which exposed the conflict

sourceLeftVersion - info on the "merge-left source" or "older" version of incoming change

sourceRightVersion - info on the "merge-right source" or "their" version of incoming change

Since:

1.3

Method Details

isTextConflict

public boolean isTextConflict()

Returns false.

Specified by:

isTextConflict in class SVNConflictDescription

Returns:

false

Since:

1.3

isPropertyConflict

public boolean isPropertyConflict()

Returns false.

Specified by:

isPropertyConflict in class SVNConflictDescription

Returns:

false

Since:

1.3

isTreeConflict

public boolean isTreeConflict()

Returns true.

Specified by:

isTreeConflict in class SVNConflictDescription

Returns:

true

Since:

1.3

getPath

public java.io.File getPath()

Returns the wc file.

Overrides:

getPath in class SVNConflictDescription

Returns:

detranslated wc file

Since:

1.3

getOperation

public SVNOperation getOperation()

Returns the user operation that exposed this tree conflict.

Returns:

user operation

Since:

1.3

getSourceLeftVersion

public SVNConflictVersion getSourceLeftVersion()

Returns info on the "merge-left source" or "older" version of incoming change.

Returns:

left version info

Since:

1.3

setSourceLeftVersion

public void setSourceLeftVersion(SVNConflictVersion sourceLeftVersion)

getSourceRightVersion

public SVNConflictVersion getSourceRightVersion()

Returns info on the "merge-right source" or "their" version of incoming change.

Returns:

right version info

Since:

1.3

getPropertyName

public java.lang.String getPropertyName()

Returns null.

Specified by:

getPropertyName in class SVNConflictDescription

Returns:

null

Since:

1.3