Package org.tigris.subversion.javahl

Class ConflictDescriptor

java.lang.Object

org.tigris.subversion.javahl.ConflictDescriptor

public class ConflictDescriptor
extends Object

The description of a merge conflict, encountered during merge/update/switch operations.

Since:

1.5

Nested Class Summary

Nested Classes

Modifier and Type	Class	Description
class	ConflictDescriptor.Action	Poor man's enum for svn_wc_conflict_action_t.
class	ConflictDescriptor.Kind	Poor man's enum for svn_wc_conflict_kind_t.
class	ConflictDescriptor.Reason	Poor man's enum for svn_wc_conflict_reason_t.

Constructor Summary

Constructors

Constructor	Description
ConflictDescriptor(ConflictDescriptor aDesc)

Method Summary

Modifier and Type	Method	Description
int	getAction()
String	getBasePath()
int	getKind()
String	getMergedPath()
String	getMIMEType()
String	getMyPath()
int	getNodeKind()
int	getOperation()
String	getPath()
String	getPropertyName()
int	getReason()
ConflictVersion	getSrcLeftVersion()
ConflictVersion	getSrcRightVersion()
String	getTheirPath()
boolean	isBinary()

Methods inherited from class java.lang.Object

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

Constructor Details

ConflictDescriptor

public ConflictDescriptor(ConflictDescriptor aDesc)

Method Details

getPath

public String getPath()

getKind

public int getKind()

getNodeKind

public int getNodeKind()

See Also:

NodeKind

getPropertyName

public String getPropertyName()

isBinary

public boolean isBinary()

getMIMEType

public String getMIMEType()

getAction

public int getAction()

getReason

public int getReason()

getBasePath

public String getBasePath()

getTheirPath

public String getTheirPath()

getMyPath

public String getMyPath()

getMergedPath

public String getMergedPath()

getOperation

public int getOperation()

getSrcLeftVersion

public ConflictVersion getSrcLeftVersion()

getSrcRightVersion

public ConflictVersion getSrcRightVersion()