|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectcom.microsoft.tfs.core.clients.versioncontrol.ResolutionOptions
public final class ResolutionOptions
Contains options that affect conflict resolution.
Nested Class Summary | |
---|---|
static class |
ResolutionOptions.EncodingStrategy
|
Constructor Summary | |
---|---|
ResolutionOptions()
Creates a ResolutionOptions with the default options set. |
Method Summary | |
---|---|
FileEncoding |
getAcceptMergeEncoding()
Gets the encoding to use when an AcceptMerge resolution is desired but there is a conflicting pending encoding change. |
PropertyValue[] |
getAcceptMergeProperties()
When a conflict is to be resolved with the AcceptMerge resolution and there is a conflicting pending property change, this property contains the desired properties. |
ResolutionOptions.EncodingStrategy |
getEncodingStrategy()
Gets the encoding resolution strategy. |
FileEncoding |
getExplicitEncoding()
Gets the explicit encoding set previously as part of setting an encoding strategy. |
java.lang.String |
getNewPath()
Gets the new path to use for this resolution. |
boolean |
isAcceptMergeWithConflicts()
|
void |
setAcceptMergeEncoding(FileEncoding encoding)
When a conflict is to be resolved with the AcceptMerge resolution and there is a conflicting pending encoding change, the given encoding will be used (no file conversion is done). |
void |
setAcceptMergeProperties(PropertyValue[] acceptMergeProperties)
|
void |
setAcceptMergeWithConflicts(boolean mergeWithConflicts)
Sets the option to accept (resolve a conflict) when the merge resulted in conflicts. |
void |
setEncodingStrategy(ResolutionOptions.EncodingStrategy strategy,
FileEncoding explicitEncoding)
Sets the strategy for resolving encoding conflicts. |
void |
setNewPath(java.lang.String newPath)
Sets the new path for a conflicted item or the item in its way when it needs needs to move to a new location. |
void |
setUseInternalEngine(boolean useInternalEngine)
|
boolean |
useInternalEngine()
|
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public ResolutionOptions()
ResolutionOptions
with the default options set.
Method Detail |
---|
public void setEncodingStrategy(ResolutionOptions.EncodingStrategy strategy, FileEncoding explicitEncoding)
strategy
- the strategy to take for resolving encoding conflicts.explicitEncoding
- the encoding to use for resolving conflicts (null if the strategy
is EncodingStrategy.DEFAULT).public ResolutionOptions.EncodingStrategy getEncodingStrategy()
public FileEncoding getExplicitEncoding()
public void setUseInternalEngine(boolean useInternalEngine)
public boolean useInternalEngine()
public void setAcceptMergeEncoding(FileEncoding encoding)
encoding
- the encoding to use when an automatic merge is desired and there
is a conflicting pending change.public FileEncoding getAcceptMergeEncoding()
public PropertyValue[] getAcceptMergeProperties()
public void setAcceptMergeProperties(PropertyValue[] acceptMergeProperties)
public void setNewPath(java.lang.String newPath)
newPath
- the path to use for this conflict resolution, null to defer the
resolution in the cases documented above.public java.lang.String getNewPath()
public boolean isAcceptMergeWithConflicts()
public void setAcceptMergeWithConflicts(boolean mergeWithConflicts)
mergeWithConflicts
- true if a merge should be resolved when conflicts remain in the
file, false if the merge should not be resolved when conflicts
remain
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |