SVNKit Home

org.tmatesoft.svn.core.wc
Class SVNConflictDescription

java.lang.Object
  extended by org.tmatesoft.svn.core.wc.SVNConflictDescription

public class SVNConflictDescription
extends Object

The SVNConflictDescription represents an object that describes a conflict that has occurred in the working copy. It's passed to ISVNConflictHandler.handleConflict(SVNConflictDescription).

Since:
1.2.0
Version:
1.2.0
Author:
TMate Software Ltd.

Constructor Summary
SVNConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, String propertyName, boolean isPropertyConflict, SVNConflictAction conflictAction, SVNConflictReason conflictReason)
          Creates a new SVNConflictDescription object.
 
Method Summary
 SVNConflictAction getConflictAction()
          Returns the action which attempted on an object and which lead to the conflict.
 SVNConflictReason getConflictReason()
          Returns the reason why the conflict occurred.
 SVNMergeFileSet getMergeFiles()
          Returns information about files involved in the merge.
 SVNNodeKind getNodeKind()
          Returns the node kind of the item which the conflict occurred on.
 String getPropertyName()
          Returns the name of the property on which the conflict occurred.
 boolean isPropertyConflict()
          Tells whether it's a property merge conflict or not.
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Constructor Detail

SVNConflictDescription

public SVNConflictDescription(SVNMergeFileSet mergeFiles,
                              SVNNodeKind nodeKind,
                              String propertyName,
                              boolean isPropertyConflict,
                              SVNConflictAction conflictAction,
                              SVNConflictReason conflictReason)
Creates a new SVNConflictDescription object.

propertyName is relevant only for property conflicts (i.e. in case isPropertyConflict is true).

Parameters:
mergeFiles - files involved in the merge
nodeKind - node kind of the item which the conflict occurred on
propertyName - name of the property property which the conflict occurred on
isPropertyConflict - true if this object describes a property conflict; otherwise false
conflictAction - action which lead to the conflict
conflictReason - why the conflict ever occurred
Method Detail

getMergeFiles

public SVNMergeFileSet getMergeFiles()
Returns information about files involved in the merge.

Returns:
merge file set

getConflictAction

public SVNConflictAction getConflictAction()
Returns the action which attempted on an object and which lead to the conflict.

Returns:
conflicted action

getConflictReason

public SVNConflictReason getConflictReason()
Returns the reason why the conflict occurred.

Returns:
reason of the conflict

isPropertyConflict

public boolean isPropertyConflict()
Tells whether it's a property merge conflict or not.

Returns:
true if the conflict occurred while modifying a property; otherwise false

getNodeKind

public SVNNodeKind getNodeKind()
Returns the node kind of the item which the conflict occurred on.

Returns:
node kind

getPropertyName

public String getPropertyName()
Returns the name of the property on which the conflict occurred.

Note: relevant only in case of a property conflict.

Returns:
conflicted property name

SVNKit Home

Copyright © 2004-2008 TMate Software Ltd. All Rights Reserved.