Package org.apache.subversion.javahl

Class ConflictDescriptor

java.lang.Object

org.apache.subversion.javahl.ConflictDescriptor

public class ConflictDescriptor
extends Object

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

Nested Class Summary

Nested Classes

Modifier and Type	Class	Description
static enum	ConflictDescriptor.Action	Rich man's enum for svn_wc_conflict_action_t.
static enum	ConflictDescriptor.Kind	Rich man's enum for svn_wc_conflict_kind_t.
static enum	ConflictDescriptor.Operation
static enum	ConflictDescriptor.Reason	Rich man's enum for svn_wc_conflict_reason_t.

Field Summary

Fields

Modifier and Type	Field	Description
private ConflictDescriptor.Action	action
private String	basePath
private ConflictDescriptor.Kind	conflictKind
private boolean	isBinary
private String	mergedPath
private String	mimeType
private String	myPath
private NodeKind	nodeKind
private ConflictDescriptor.Operation	operation
private String	path
private String	propertyName
private ConflictDescriptor.Reason	reason
private ConflictVersion	srcLeftVersion
private ConflictVersion	srcRightVersion
private String	theirPath

Constructor Summary

Constructors

Constructor	Description
ConflictDescriptor(String path, ConflictDescriptor.Kind conflictKind, NodeKind nodeKind, String propertyName, boolean isBinary, String mimeType, ConflictDescriptor.Action action, ConflictDescriptor.Reason reason, ConflictDescriptor.Operation operation, String basePath, String theirPath, String myPath, String mergedPath, ConflictVersion srcLeft, ConflictVersion srcRight)	This constructor should only be called from JNI code.

Method Summary

Modifier and Type	Method	Description
ConflictDescriptor.Action	getAction()
String	getBasePath()
ConflictDescriptor.Kind	getKind()
String	getMergedPath()
String	getMIMEType()
String	getMyPath()
NodeKind	getNodeKind()
ConflictDescriptor.Operation	getOperation()
String	getPath()
String	getPropertyName()
ConflictDescriptor.Reason	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

Field Details

path

private String path

conflictKind

private ConflictDescriptor.Kind conflictKind

nodeKind

private NodeKind nodeKind

propertyName

private String propertyName

isBinary

private boolean isBinary

mimeType

private String mimeType

action

private ConflictDescriptor.Action action

reason

private ConflictDescriptor.Reason reason

basePath

private String basePath

theirPath

private String theirPath

myPath

private String myPath

mergedPath

private String mergedPath

operation

private ConflictDescriptor.Operation operation

See Also:

• ConflictDescriptor.Operation

srcLeftVersion

private ConflictVersion srcLeftVersion

See Also:

• ConflictVersion

srcRightVersion

private ConflictVersion srcRightVersion

See Also:

• ConflictVersion

Constructor Details

ConflictDescriptor

public ConflictDescriptor(String path,
 ConflictDescriptor.Kind conflictKind,
 NodeKind nodeKind,
 String propertyName,
 boolean isBinary,
 String mimeType,
 ConflictDescriptor.Action action,
 ConflictDescriptor.Reason reason,
 ConflictDescriptor.Operation operation,
 String basePath,
 String theirPath,
 String myPath,
 String mergedPath,
 ConflictVersion srcLeft,
 ConflictVersion srcRight)

This constructor should only be called from JNI code.

Method Details

getPath

public String getPath()

getKind

public ConflictDescriptor.Kind getKind()

getNodeKind

public NodeKind getNodeKind()

getPropertyName

public String getPropertyName()

isBinary

public boolean isBinary()

getMIMEType

public String getMIMEType()

getAction

public ConflictDescriptor.Action getAction()

getReason

public ConflictDescriptor.Reason getReason()

getBasePath

public String getBasePath()

getTheirPath

public String getTheirPath()

getMyPath

public String getMyPath()

getMergedPath

public String getMergedPath()

getOperation

public ConflictDescriptor.Operation getOperation()

getSrcLeftVersion

public ConflictVersion getSrcLeftVersion()

getSrcRightVersion

public ConflictVersion getSrcRightVersion()