Package org.tigris.subversion.javahl
Class ConflictDescriptor
java.lang.Object
org.tigris.subversion.javahl.ConflictDescriptor
public class ConflictDescriptor
extends java.lang.Object
The description of a merge conflict, encountered during
merge/update/switch operations.
- Since:
- 1.5
-
Nested Class Summary
Nested ClassesModifier and TypeClassDescriptionfinal class
Poor man's enum forsvn_wc_conflict_action_t
.final class
Poor man's enum forsvn_wc_conflict_kind_t
.final class
Poor man's enum forsvn_wc_conflict_reason_t
. -
Field Summary
FieldsModifier and TypeFieldDescriptionprivate int
private java.lang.String
private int
private boolean
private java.lang.String
private java.lang.String
private java.lang.String
private int
private int
private java.lang.String
private java.lang.String
private int
private ConflictVersion
private ConflictVersion
private java.lang.String
-
Constructor Summary
ConstructorsConstructorDescriptionConflictDescriptor
(java.lang.String path, int conflictKind, int nodeKind, java.lang.String propertyName, boolean isBinary, java.lang.String mimeType, int action, int reason, int 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
private int conflictKind -
nodeKind
private int nodeKind- See Also:
-
propertyName
private java.lang.String propertyName -
isBinary
private boolean isBinary -
mimeType
private java.lang.String mimeType -
action
private int action- See Also:
-
#Action
-
reason
private int reason- See Also:
-
#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 int operation- See Also:
-
srcLeftVersion
- See Also:
-
srcRightVersion
- See Also:
-
-
Constructor Details
-
ConflictDescriptor
ConflictDescriptor(java.lang.String path, int conflictKind, int nodeKind, java.lang.String propertyName, boolean isBinary, java.lang.String mimeType, int action, int reason, int 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. -
ConflictDescriptor
-
-
Method Details
-
getPath
public java.lang.String getPath() -
getKind
public int getKind() -
getNodeKind
public int getNodeKind()- See Also:
-
getPropertyName
public java.lang.String getPropertyName() -
isBinary
public boolean isBinary() -
getMIMEType
public java.lang.String getMIMEType() -
getAction
public int getAction() -
getReason
public int 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 int getOperation() -
getSrcLeftVersion
-
getSrcRightVersion
-