com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions
Class KeepLocalWritableConflictResolution

java.lang.Object
  extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.ConflictResolution
      extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.CoreConflictResolution
          extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.KeepLocalWritableConflictResolution

public class KeepLocalWritableConflictResolution
extends CoreConflictResolution


Field Summary
 
Fields inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.ConflictResolution
DefaultErrorMessage
 
Constructor Summary
KeepLocalWritableConflictResolution(ConflictDescription conflictDescription, java.lang.String description, java.lang.String helpText)
           
 
Method Summary
 ConflictResolution newForConflictDescription(ConflictDescription conflictDescription)
           
 void setEncoding(FileEncoding newEncoding)
          Sets the file encoding of the resultant merged file.
 void setNewPath(java.lang.String newPath)
          Sets the server name of the resultant merged file.
 ConflictResolutionStatus work()
           
 
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.CoreConflictResolution
getResolution
 
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
 

Constructor Detail

KeepLocalWritableConflictResolution

public KeepLocalWritableConflictResolution(ConflictDescription conflictDescription,
                                           java.lang.String description,
                                           java.lang.String helpText)
Method Detail

newForConflictDescription

public ConflictResolution newForConflictDescription(ConflictDescription conflictDescription)
Overrides:
newForConflictDescription in class CoreConflictResolution

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.

Overrides:
setNewPath in class CoreConflictResolution
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.

Overrides:
setEncoding in class CoreConflictResolution
Parameters:
newEncoding - The new FileEncoding

work

public ConflictResolutionStatus work()
Overrides:
work in class CoreConflictResolution


© 2015 Microsoft. All rights reserved.