Package org.apache.subversion.javahl
Class ConflictDescriptor
- java.lang.Object
-
- org.apache.subversion.javahl.ConflictDescriptor
-
public class ConflictDescriptor extends java.lang.Object
The description of a merge conflict, encountered during merge/update/switch operations.
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description static class
ConflictDescriptor.Action
Rich man's enum forsvn_wc_conflict_action_t
.static class
ConflictDescriptor.Kind
Rich man's enum forsvn_wc_conflict_kind_t
.static class
ConflictDescriptor.Operation
static class
ConflictDescriptor.Reason
Rich man's enum forsvn_wc_conflict_reason_t
.
-
Field Summary
Fields Modifier and Type Field Description private ConflictDescriptor.Action
action
private java.lang.String
basePath
private ConflictDescriptor.Kind
conflictKind
private boolean
isBinary
private java.lang.String
mergedPath
private java.lang.String
mimeType
private java.lang.String
myPath
private NodeKind
nodeKind
private ConflictDescriptor.Operation
operation
private java.lang.String
path
private java.lang.String
propertyName
private ConflictDescriptor.Reason
reason
private ConflictVersion
srcLeftVersion
private ConflictVersion
srcRightVersion
private java.lang.String
theirPath
-
Constructor Summary
Constructors Constructor Description ConflictDescriptor(java.lang.String path, ConflictDescriptor.Kind conflictKind, NodeKind nodeKind, java.lang.String propertyName, boolean isBinary, java.lang.String mimeType, ConflictDescriptor.Action action, ConflictDescriptor.Reason reason, ConflictDescriptor.Operation operation, java.lang.String basePath, java.lang.String theirPath, java.lang.String myPath, java.lang.String mergedPath, ConflictVersion srcLeft, ConflictVersion srcRight)
This constructor should only be called from JNI code.
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description ConflictDescriptor.Action
getAction()
java.lang.String
getBasePath()
ConflictDescriptor.Kind
getKind()
java.lang.String
getMergedPath()
java.lang.String
getMIMEType()
java.lang.String
getMyPath()
NodeKind
getNodeKind()
ConflictDescriptor.Operation
getOperation()
java.lang.String
getPath()
java.lang.String
getPropertyName()
ConflictDescriptor.Reason
getReason()
ConflictVersion
getSrcLeftVersion()
ConflictVersion
getSrcRightVersion()
java.lang.String
getTheirPath()
boolean
isBinary()
-
-
-
Field Detail
-
path
private java.lang.String path
-
conflictKind
private ConflictDescriptor.Kind conflictKind
-
nodeKind
private NodeKind nodeKind
-
propertyName
private java.lang.String propertyName
-
isBinary
private boolean isBinary
-
mimeType
private java.lang.String mimeType
-
action
private ConflictDescriptor.Action action
-
reason
private ConflictDescriptor.Reason reason
-
basePath
private java.lang.String basePath
-
theirPath
private java.lang.String theirPath
-
myPath
private java.lang.String myPath
-
mergedPath
private java.lang.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 Detail
-
ConflictDescriptor
public ConflictDescriptor(java.lang.String path, ConflictDescriptor.Kind conflictKind, NodeKind nodeKind, java.lang.String propertyName, boolean isBinary, java.lang.String mimeType, ConflictDescriptor.Action action, ConflictDescriptor.Reason reason, ConflictDescriptor.Operation operation, java.lang.String basePath, java.lang.String theirPath, java.lang.String myPath, java.lang.String mergedPath, ConflictVersion srcLeft, ConflictVersion srcRight)
This constructor should only be called from JNI code.
-
-
Method Detail
-
getPath
public java.lang.String getPath()
-
getKind
public ConflictDescriptor.Kind getKind()
-
getNodeKind
public NodeKind getNodeKind()
-
getPropertyName
public java.lang.String getPropertyName()
-
isBinary
public boolean isBinary()
-
getMIMEType
public java.lang.String getMIMEType()
-
getAction
public ConflictDescriptor.Action getAction()
-
getReason
public ConflictDescriptor.Reason getReason()
-
getBasePath
public java.lang.String getBasePath()
-
getTheirPath
public java.lang.String getTheirPath()
-
getMyPath
public java.lang.String getMyPath()
-
getMergedPath
public java.lang.String getMergedPath()
-
getOperation
public ConflictDescriptor.Operation getOperation()
-
getSrcLeftVersion
public ConflictVersion getSrcLeftVersion()
-
getSrcRightVersion
public ConflictVersion getSrcRightVersion()
-
-