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 ClassesModifier and TypeClassDescriptionstatic enum
Rich man's enum forsvn_wc_conflict_action_t
.static enum
Rich man's enum forsvn_wc_conflict_kind_t
.static enum
static enum
Rich man's enum forsvn_wc_conflict_reason_t
. -
Field Summary
FieldsModifier and TypeFieldDescriptionprivate ConflictDescriptor.Action
private java.lang.String
private ConflictDescriptor.Kind
private boolean
private java.lang.String
private java.lang.String
private java.lang.String
private NodeKind
private ConflictDescriptor.Operation
private java.lang.String
private java.lang.String
private ConflictDescriptor.Reason
private ConflictVersion
private ConflictVersion
private java.lang.String
-
Constructor Summary
ConstructorsConstructorDescriptionConflictDescriptor
(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
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Field Details
-
path
private java.lang.String path -
conflictKind
-
nodeKind
-
propertyName
private java.lang.String propertyName -
isBinary
private boolean isBinary -
mimeType
private java.lang.String mimeType -
action
-
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
- See Also:
-
srcLeftVersion
- See Also:
-
srcRightVersion
- See Also:
-
-
Constructor Details
-
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 Details
-
getPath
public java.lang.String getPath() -
getKind
-
getNodeKind
-
getPropertyName
public java.lang.String getPropertyName() -
isBinary
public boolean isBinary() -
getMIMEType
public java.lang.String getMIMEType() -
getAction
-
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
-
getSrcLeftVersion
-
getSrcRightVersion
-