Package org.tmatesoft.svn.core.wc
Class SVNPropertyConflictDescription
java.lang.Object
org.tmatesoft.svn.core.wc.SVNConflictDescription
org.tmatesoft.svn.core.wc.SVNPropertyConflictDescription
SVNPropertyConflictDescription brings a property conflict description.
- Since:
- 1.3
- Version:
- 1.3
-
Field Summary
Fields -
Constructor Summary
ConstructorsConstructorDescriptionSVNPropertyConflictDescription
(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, String propertyName, SVNConflictAction conflictAction, SVNConflictReason conflictReason) Creates a newSVNPropertyConflictDescription
object. -
Method Summary
Modifier and TypeMethodDescriptionReturns the name of the property, on which the conflict occurred.boolean
Returnstrue
.boolean
Returnsfalse
.boolean
Returnsfalse
.Methods inherited from class org.tmatesoft.svn.core.wc.SVNConflictDescription
getConflictAction, getConflictReason, getMergeFiles, getNodeKind, getPath, setConflictAction
-
Field Details
-
myPropertyName
-
-
Constructor Details
-
SVNPropertyConflictDescription
public SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, String propertyName, SVNConflictAction conflictAction, SVNConflictReason conflictReason) Creates a newSVNPropertyConflictDescription
object.- Parameters:
mergeFiles
- files involved in a property conflictnodeKind
- kind of the conflicted nodepropertyName
- versioned property nameconflictAction
- action lead to the conflictconflictReason
- the reason why the conflict occurred- Since:
- 1.3
-
-
Method Details
-
isTextConflict
public boolean isTextConflict()Returnsfalse
.- Specified by:
isTextConflict
in classSVNConflictDescription
- Returns:
false
- Since:
- 1.3
-
isPropertyConflict
public boolean isPropertyConflict()Returnstrue
.- Specified by:
isPropertyConflict
in classSVNConflictDescription
- Returns:
true
- Since:
- 1.3
-
isTreeConflict
public boolean isTreeConflict()Returnsfalse
.- Specified by:
isTreeConflict
in classSVNConflictDescription
- Returns:
false
- Since:
- 1.3
-
getPropertyName
Returns the name of the property, on which the conflict occurred.- Specified by:
getPropertyName
in classSVNConflictDescription
- Returns:
- conflicted property name
- Since:
- 1.3
-