|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectcom.microsoft.tfs.core.internal.wrappers.WebServiceObjectWrapper
com.microsoft.tfs.core.clients.versioncontrol.soapextensions.Conflict
public final class Conflict
Represents a single conflict between two items.
Field Summary |
---|
Fields inherited from class com.microsoft.tfs.core.internal.wrappers.WebServiceObjectWrapper |
---|
webServiceObject |
Constructor Summary | |
---|---|
Conflict(ms.tfs.versioncontrol.clientservices._03._Conflict conflict)
|
|
Conflict(Conflict conflict)
Creates a clone of the given conflict. |
Method Summary | |
---|---|
boolean |
canMergeContent()
Tests whether this conflict needs a content merge. |
int |
compareTo(Conflict other)
|
void |
downloadBaseFile(VersionControlClient client,
java.lang.String absolutePath)
Downloads the content for the base (original) file in the conflict. |
void |
downloadProperties(Workspace workspace)
|
void |
downloadTheirFile(VersionControlClient client,
java.lang.String absolutePath)
Downloads the content for their file in the conflict. |
void |
downloadYourFile(VersionControlClient client,
java.lang.String absolutePath)
Downloads the content for your file in the conflict. |
ChangeType |
getBaseChangeType()
|
int |
getBaseDeletionID()
|
java.lang.String |
getBaseDownloadURL()
|
FileEncoding |
getBaseEncoding()
|
byte[] |
getBaseHashValue()
|
int |
getBaseItemID()
|
ItemType |
getBaseItemType()
|
PropertyValue[] |
getBaseProperties()
Properties for BaseServerItem. |
int |
getBasePropertyID()
|
java.lang.String |
getBaseServerItem()
|
int |
getBaseVersion()
|
int |
getConflictID()
|
ConflictOptions |
getConflictOptions()
|
MergeSummary |
getContentMergeSummary()
Gets the summary of the work performed by a content merge for this getWebServiceObject(). |
java.lang.String |
getDetailedMessage(boolean asConflict)
Converts this conflict into a displayable message. |
java.lang.String |
getFileExtension()
|
java.lang.String |
getFileName()
|
long |
getLocalFileLastModifiedDateUsedForHashValue()
Last Modified UTC time of the local file, which was used to calculate local hash value. |
byte[] |
getLocalHashValue()
|
java.lang.String |
getLocalPath()
|
java.lang.String |
getMergedFileName()
|
int |
getPendingChangeID()
|
PropertiesMergeSummary |
getPropertiesMergeSummary()
Returns the property merge summary if one has been generated. |
int |
getReason()
|
Resolution |
getResolution()
|
ResolutionOptions |
getResolutionOptions()
|
java.lang.String |
getServerPath()
|
java.lang.String |
getSourceLocalItem()
|
java.lang.String |
getTargetLocalItem()
|
ChangeType |
getTheirChangeType()
|
int |
getTheirDeletionID()
|
java.lang.String |
getTheirDownloadURL()
|
FileEncoding |
getTheirEncoding()
|
byte[] |
getTheirHashValue()
|
int |
getTheirItemID()
|
ItemType |
getTheirItemType()
|
int |
getTheirLastMergedVersion()
|
PropertyValue[] |
getTheirProperties()
Properties for TheirServerItem. |
int |
getTheirPropertyID()
|
java.lang.String |
getTheirServerItem()
|
java.lang.String |
getTheirShelvesetDisplayName(Workspace workspace)
The shelveset display name consists of the shelveset name and username if it's different than the authorized user. |
java.lang.String |
getTheirShelvesetName()
|
java.lang.String |
getTheirShelvesetOwnerName()
|
int |
getTheirVersion()
|
int |
getTheirVersionFrom()
|
ConflictType |
getType()
|
ms.tfs.versioncontrol.clientservices._03._Conflict |
getWebServiceObject()
Gets the web service object this class wraps. |
ChangeType |
getYourChangeType()
|
int |
getYourDeletionID()
|
java.lang.String |
getYourDownloadURL()
|
FileEncoding |
getYourEncoding()
|
int |
getYourItemID()
|
ItemType |
getYourItemType()
|
int |
getYourLastMergedVersion()
|
ChangeType |
getYourLocalChangeType()
|
PropertyValue[] |
getYourProperties()
Properties for YourServerItem. |
int |
getYourPropertyID()
|
java.lang.String |
getYourServerItem()
|
java.lang.String |
getYourServerItemSource()
|
int |
getYourVersion()
|
boolean |
hasConflictingContentChange()
Determine if the conflict contains one or more conflicting change. |
boolean |
hasConflictingPropertyChange()
Determine if the conflict contains conflicting property changes. |
boolean |
hasLocalTargetContentChangeOnly()
Return True only if the conflict has ContentMergeSummary calculated and the conflicting and source/server chunks are 0, but local/target are not zero. |
boolean |
hasNoLocalRenames()
|
boolean |
hasSourceServerContentChangeOnly()
Return True only if the conflict has ContentMergeSummary calculated and the conflicting and target/local chunks are 0, but source/server are not zero. |
boolean |
isAutoMergeApplicable(AutoResolveOptions resolveOptions)
Return True if conflict can be auto resolved as AcceptMerge in the given mode. |
boolean |
isAutoResolved()
True if this conflict was resolved automatically. |
boolean |
isBaseless()
|
boolean |
isBasicMergeAllowed(Workspace workspace)
Check the basic requirements for merge operation. |
boolean |
isBinary()
|
boolean |
isEncodingChanged()
Check to see if the encoding has changed. |
boolean |
isEncodingMismatched()
|
boolean |
isForced()
|
boolean |
isFromDeletedShelveset()
|
boolean |
isLocalOrTargetFileInVersionControl()
Check to see if the local/target file is in version control. |
boolean |
isNameChanged()
Check to see if the file name has changed. |
boolean |
isNameChangeIsRedundant()
|
boolean |
isNamespaceConflict()
|
boolean |
isPropertyConflict()
|
boolean |
isRedundant(boolean quick,
Workspace workspace)
Verifies that this conflict is caused by 2 identical changes. |
boolean |
isResolved()
|
boolean |
isRollbackConflict()
|
boolean |
isShelvesetConflict()
|
boolean |
isTheirNameChanged()
|
boolean |
isValidForAutoMerge(Workspace workspace)
|
boolean |
isVersionConflictAndServerItemDoesNotExist()
|
boolean |
isVersionGetCheckinConflict()
|
boolean |
isYourNameChanged()
|
PropertiesMergeSummary |
mergeProperties(Workspace workspace)
Generates the properties merge summary. |
boolean |
requiresExplicitAcceptMerge()
Returns true if the AcceptMerge resolution is not conservative and may produce unexpected results. |
void |
resetChangeSummaryIfLocalFileModified()
Removes ChangeSummary and merge file if local file was modified after those values were calculated. |
void |
setAutoResolved(boolean autoResolved)
|
void |
setBaseChangeType(ChangeType baseChangeType)
|
void |
setBaseDeletionID(int baseDeletionID)
|
void |
setBaseEncoding(int baseEncoding)
|
void |
setBaseHashValue(byte[] baseHashValue)
|
void |
setBaseItemID(int baseItemID)
|
void |
setBaseItemType(ItemType baseItemType)
|
void |
setBaseServerItem(java.lang.String baseServerItem)
|
void |
setBaseVersion(int baseVersion)
|
void |
setConflictID(int conflictID)
|
void |
setConflictOptions(ConflictOptions options)
|
void |
setContentMergeSummary(MergeSummary summary)
Sets the summary of the merge operation. |
void |
setForced(boolean isForced)
|
void |
setLocalFileLastModifiedDateUsedForHashValue(long localFileLastModifiedDateUsedForHashValue)
|
void |
setLocalFileLastModifiedDateUsedForThreeWayMerge(long localFileLastModifiedDateUsedForThreeWayMerge)
Last Modified UTC time of the local file, which was used for performing three way merge and creating merge file. |
void |
setLocalHashValue(byte[] localHashValue)
|
void |
setMergedFileName(java.lang.String file)
|
void |
setNamespaceConflict(boolean isNamespaceConflict)
|
void |
setPendingChangeID(int pendingChangeID)
|
void |
setReason(int reason)
|
void |
setResolution(Resolution resolution)
|
void |
setResolutionOptions(ResolutionOptions options)
|
void |
setResolved(boolean isResolved)
|
void |
setSourceLocalItem(java.lang.String sourceLocalItem)
|
void |
setTargetLocalItem(java.lang.String targetLocalItem)
|
void |
setTheirDeletionID(int theirDeletionID)
|
void |
setTheirEncoding(int theirEncoding)
|
void |
setTheirHashValue(byte[] theirHashValue)
|
void |
setTheirItemID(int theirItemID)
|
void |
setTheirItemType(ItemType theirItemType)
|
void |
setTheirLastMergedVersion(int theirLastMergedVersion)
|
void |
setTheirServerItem(java.lang.String theirServerItem)
|
void |
setTheirVersion(int theirVersion)
|
void |
setType(ConflictType type)
|
void |
setYourChangeType(ChangeType yourChangeType)
|
void |
setYourDeletionID(int yourDeletionID)
|
void |
setYourEncoding(int yourEncoding)
|
void |
setYourItemID(int yourItemID)
|
void |
setYourItemType(ItemType yourItemType)
|
void |
setYourLastMergedVersion(int yourLastMergedVersion)
|
void |
setYourLocalChangeType(ChangeType yourLocalChangeType)
|
void |
setYourServerItem(java.lang.String yourServerItem)
|
void |
setYourServerItemSource(java.lang.String yourServerItemSource)
|
void |
setYourVersion(int yourVersion)
|
boolean |
theirFileExists()
|
void |
updateLocalHashValue()
Updates LocalHashValue if it's invalid. |
Methods inherited from class com.microsoft.tfs.core.internal.wrappers.WebServiceObjectWrapper |
---|
equals, hashCode, toString |
Methods inherited from class java.lang.Object |
---|
clone, finalize, getClass, notify, notifyAll, wait, wait, wait |
Constructor Detail |
---|
public Conflict(ms.tfs.versioncontrol.clientservices._03._Conflict conflict)
public Conflict(Conflict conflict)
conflict
- the conflict to copy (must not be null
)Method Detail |
---|
public ms.tfs.versioncontrol.clientservices._03._Conflict getWebServiceObject()
public int compareTo(Conflict other)
compareTo
in interface java.lang.Comparable<Conflict>
public ChangeType getBaseChangeType()
public int getBaseDeletionID()
public FileEncoding getBaseEncoding()
public int getBasePropertyID()
public byte[] getBaseHashValue()
public int getBaseItemID()
public ItemType getBaseItemType()
public java.lang.String getBaseServerItem()
public int getBaseVersion()
public int getConflictID()
public int getPendingChangeID()
public int getReason()
public Resolution getResolution()
public java.lang.String getSourceLocalItem()
public java.lang.String getTargetLocalItem()
public ChangeType getTheirChangeType()
public int getTheirDeletionID()
public FileEncoding getTheirEncoding()
public int getTheirPropertyID()
public byte[] getTheirHashValue()
public int getTheirItemID()
public ItemType getTheirItemType()
public int getTheirLastMergedVersion()
public java.lang.String getTheirServerItem()
public int getTheirVersion()
public int getTheirVersionFrom()
public ConflictType getType()
public ChangeType getYourChangeType()
public int getYourDeletionID()
public FileEncoding getYourEncoding()
public int getYourPropertyID()
public int getYourItemID()
public ItemType getYourItemType()
public int getYourLastMergedVersion()
public ChangeType getYourLocalChangeType()
public java.lang.String getYourServerItem()
public java.lang.String getYourServerItemSource()
public int getYourVersion()
public ConflictOptions getConflictOptions()
public boolean isForced()
public boolean isNamespaceConflict()
public boolean isShelvesetConflict()
public boolean isResolved()
public void setBaseChangeType(ChangeType baseChangeType)
public void setBaseDeletionID(int baseDeletionID)
public void setBaseEncoding(int baseEncoding)
public void setBaseHashValue(byte[] baseHashValue)
public void setBaseItemID(int baseItemID)
public void setBaseItemType(ItemType baseItemType)
public void setBaseServerItem(java.lang.String baseServerItem)
public void setBaseVersion(int baseVersion)
public void setConflictID(int conflictID)
public void setForced(boolean isForced)
public void setNamespaceConflict(boolean isNamespaceConflict)
public void setResolved(boolean isResolved)
public void setPendingChangeID(int pendingChangeID)
public void setReason(int reason)
public void setResolution(Resolution resolution)
public void setSourceLocalItem(java.lang.String sourceLocalItem)
public void setTargetLocalItem(java.lang.String targetLocalItem)
public void setTheirDeletionID(int theirDeletionID)
public void setTheirEncoding(int theirEncoding)
public void setTheirHashValue(byte[] theirHashValue)
public void setTheirItemID(int theirItemID)
public void setTheirItemType(ItemType theirItemType)
public void setTheirLastMergedVersion(int theirLastMergedVersion)
public void setTheirServerItem(java.lang.String theirServerItem)
public void setTheirVersion(int theirVersion)
public void setType(ConflictType type)
public void setYourChangeType(ChangeType yourChangeType)
public void setYourDeletionID(int yourDeletionID)
public void setYourEncoding(int yourEncoding)
public void setYourItemID(int yourItemID)
public void setYourItemType(ItemType yourItemType)
public void setYourLastMergedVersion(int yourLastMergedVersion)
public void setYourLocalChangeType(ChangeType yourLocalChangeType)
public void setYourServerItem(java.lang.String yourServerItem)
public void setYourServerItemSource(java.lang.String yourServerItemSource)
public void setYourVersion(int yourVersion)
public void setConflictOptions(ConflictOptions options)
public java.lang.String getBaseDownloadURL()
public java.lang.String getTheirDownloadURL()
public java.lang.String getYourDownloadURL()
public java.lang.String getTheirShelvesetName()
public java.lang.String getTheirShelvesetOwnerName()
public java.lang.String getMergedFileName()
public void setMergedFileName(java.lang.String file)
public void setResolutionOptions(ResolutionOptions options)
public ResolutionOptions getResolutionOptions()
public void setContentMergeSummary(MergeSummary summary)
summary
- the merge summary.public MergeSummary getContentMergeSummary()
public boolean canMergeContent()
true
if this conflict's content can be merged,
false
if the type of conflict would not allow a
content merge. Does not check whether this conflict has already
been resolved (can return true
after a resolution
has been set)public java.lang.String getLocalPath()
public java.lang.String getServerPath()
public java.lang.String getTheirShelvesetDisplayName(Workspace workspace)
null
)public void downloadBaseFile(VersionControlClient client, java.lang.String absolutePath)
absolutePath
- where to save the downloaded file contentspublic void downloadTheirFile(VersionControlClient client, java.lang.String absolutePath)
absolutePath
- where to save the downloaded file contentspublic void downloadYourFile(VersionControlClient client, java.lang.String absolutePath)
absolutePath
- where to save the downloaded file contentspublic boolean theirFileExists()
public boolean requiresExplicitAcceptMerge()
public boolean isEncodingMismatched()
public boolean isBaseless()
public boolean isBinary()
public boolean isBasicMergeAllowed(Workspace workspace)
public boolean isEncodingChanged()
public boolean isPropertyConflict()
public boolean isLocalOrTargetFileInVersionControl()
public java.lang.String getFileName()
public java.lang.String getFileExtension()
null
)public boolean isAutoResolved()
public void setAutoResolved(boolean autoResolved)
public boolean isFromDeletedShelveset()
public boolean isVersionConflictAndServerItemDoesNotExist()
public boolean isVersionGetCheckinConflict()
public boolean isRollbackConflict()
public boolean isNameChanged()
public boolean isYourNameChanged()
public boolean isTheirNameChanged()
public boolean isNameChangeIsRedundant()
public boolean hasNoLocalRenames()
public boolean isValidForAutoMerge(Workspace workspace)
public boolean isAutoMergeApplicable(AutoResolveOptions resolveOptions)
public long getLocalFileLastModifiedDateUsedForHashValue()
public void setLocalFileLastModifiedDateUsedForHashValue(long localFileLastModifiedDateUsedForHashValue)
public void updateLocalHashValue()
public boolean isRedundant(boolean quick, Workspace workspace)
quick
- If true, does not recalculate local file hash and quickly fails.
If false, computes hash if it's not valid.public void resetChangeSummaryIfLocalFileModified()
public boolean hasLocalTargetContentChangeOnly()
public boolean hasSourceServerContentChangeOnly()
public boolean hasConflictingContentChange()
public boolean hasConflictingPropertyChange()
public byte[] getLocalHashValue()
public void setLocalHashValue(byte[] localHashValue)
public void setLocalFileLastModifiedDateUsedForThreeWayMerge(long localFileLastModifiedDateUsedForThreeWayMerge)
public PropertiesMergeSummary mergeProperties(Workspace workspace)
null
if
there is not a property conflict.
public PropertiesMergeSummary getPropertiesMergeSummary()
public PropertyValue[] getYourProperties()
downloadProperties(Workspace)
or
mergeProperties(Workspace)
is called.
public PropertyValue[] getTheirProperties()
downloadProperties(Workspace)
or
mergeProperties(Workspace)
is called.
public PropertyValue[] getBaseProperties()
downloadProperties(Workspace)
or
mergeProperties(Workspace)
is called.
public void downloadProperties(Workspace workspace)
public java.lang.String getDetailedMessage(boolean asConflict)
This method returns rather short messages. It's mainly for the CLC. See
ConflictDescription
for use in a graphical environment.
asConflict
- the displayable message for this conflict
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |