Package org.tmatesoft.svn.core.wc
Class SVNTextConflictDescription
- java.lang.Object
-
- org.tmatesoft.svn.core.wc.SVNConflictDescription
-
- org.tmatesoft.svn.core.wc.SVNTextConflictDescription
-
public class SVNTextConflictDescription extends SVNConflictDescription
SVNTextConflictDescription brings information about conflict on a file.- Since:
- 1.3
- Version:
- 1.3
- Author:
- TMate Software Ltd.
-
-
Constructor Summary
Constructors Constructor Description SVNTextConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason)
Creates a newSVNTextConflictDescription
object.
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description java.lang.String
getPropertyName()
Returnsnull
.boolean
isPropertyConflict()
Returnsfalse
.boolean
isTextConflict()
Returnstrue
.boolean
isTreeConflict()
Returnsfalse
.-
Methods inherited from class org.tmatesoft.svn.core.wc.SVNConflictDescription
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, getPath, setConflictAction
-
-
-
-
Constructor Detail
-
SVNTextConflictDescription
public SVNTextConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason)
Creates a newSVNTextConflictDescription
object.- Parameters:
mergeFiles
- files involved in the mergenodeKind
- node kind of the item which the conflict occurred on conflict; otherwise falseconflictAction
- action which lead to the conflictconflictReason
- why the conflict ever occurred- Since:
- 1.3
-
-
Method Detail
-
isTextConflict
public boolean isTextConflict()
Returnstrue
.- Specified by:
isTextConflict
in classSVNConflictDescription
- Returns:
true
- Since:
- 1.3
-
isPropertyConflict
public boolean isPropertyConflict()
Returnsfalse
.- Specified by:
isPropertyConflict
in classSVNConflictDescription
- Returns:
false
- Since:
- 1.3
-
isTreeConflict
public boolean isTreeConflict()
Returnsfalse
.- Specified by:
isTreeConflict
in classSVNConflictDescription
- Returns:
false
- Since:
- 1.3
-
getPropertyName
public java.lang.String getPropertyName()
Returnsnull
.- Specified by:
getPropertyName
in classSVNConflictDescription
- Returns:
null
- Since:
- 1.3
-
-