com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions
Class CoreConflictResolution
java.lang.Object
com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.ConflictResolution
com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.CoreConflictResolution
- Direct Known Subclasses:
- KeepLocalWritableConflictResolution
public class CoreConflictResolution
- extends ConflictResolution
A CoreConflictResolution is a type of ConflictResolution which knows how to
resolve conflicts using the core conflict resolution mechanism. (
ConflictResolution.resolveConflict()
). This is used for most conflicts.
- Since:
- TEE-SDK-10.1
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.ConflictResolution |
addStatusListener, cancel, getConflictDescription, getConflicts, getDescription, getErrorMessage, getHelpText, getStatus, needsEncodingSelection, needsNewPath, removeStatusListener, resolveConflict, setErrorMessage, setStatus |
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
CoreConflictResolution
public CoreConflictResolution(ConflictDescription conflictDescription,
java.lang.String description,
java.lang.String helpText,
ConflictResolutionOptions options,
Resolution resolution)
newForConflictDescription
public ConflictResolution newForConflictDescription(ConflictDescription conflictDescription)
- Specified by:
newForConflictDescription
in class ConflictResolution
setNewPath
public void setNewPath(java.lang.String newPath)
- Description copied from class:
ConflictResolution
- Sets the server name of the resultant merged file. This should be called
only if
ConflictResolution.needsNewPath()
returns true.
- Specified by:
setNewPath
in class ConflictResolution
- Parameters:
newPath
- The new (server) file path
setEncoding
public void setEncoding(FileEncoding newEncoding)
- Description copied from class:
ConflictResolution
- Sets the file encoding of the resultant merged file. This should be
called only if
ConflictResolution.needsEncodingSelection()
returns true.
- Specified by:
setEncoding
in class ConflictResolution
- Parameters:
newEncoding
- The new FileEncoding
work
public ConflictResolutionStatus work()
- Specified by:
work
in class ConflictResolution
getResolution
public Resolution getResolution()
© 2015 Microsoft. All rights reserved.