Class ConflictDescriptor


  • public class ConflictDescriptor
    extends java.lang.Object
    The description of a merge conflict, encountered during merge/update/switch operations.
    Since:
    1.5
    • Field Detail

      • path

        private java.lang.String path
      • conflictKind

        private int conflictKind
      • nodeKind

        private int nodeKind
        See Also:
        NodeKind
      • 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:
        Operation
    • Constructor Detail

      • 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.
    • Method Detail

      • getPath

        public java.lang.String getPath()
      • getKind

        public int getKind()
      • getNodeKind

        public int getNodeKind()
        See Also:
        NodeKind
      • 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()