|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectcom.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription
public class VersionConflictDescription
This is a version conflict - the typical type of conflict, occuring when there have been both local and server changes to a file.
Constructor Summary | |
---|---|
protected |
VersionConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
|
Method Summary | |
---|---|
boolean |
analyzeConflict()
Analyze the conflict for mergeability, etc. |
void |
clearAnalysis()
Clears any data leftover from the analysis of this conflict. |
protected boolean |
filesRenamed()
|
protected boolean |
filesRenamedOnly()
|
java.lang.String |
getChangeDescription()
Gets the change description. |
ConflictCategory |
getConflictCategory()
Gets the category of this conflict |
java.lang.String |
getDescription()
A long description of this conflict, suitable for display to the user. |
java.lang.String |
getName()
A short description of the conflict, eg "Version Conflict" |
ConflictResolution[] |
getResolutions(ConflictResolutionContributor conflictResolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
boolean |
hasAnalyzed()
Returns whether this conflict has been analyzed for mergeability. |
protected boolean |
isEncodingChange()
|
boolean |
isResolutionEnabled(ConflictResolution resolution)
Determines if a conflict resolution should be enabled (shown to the user.) We may know ahead of time that certain conflict resolutions (for example, AcceptMerge) are invalid (due to analyzing the conflict.) |
boolean |
showChangeDescription()
The UI should attempt to show a change description (number of local/server/conflicting changes.) |
protected boolean |
targetRenamed()
Exists only to be overridden by merge. |
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription |
---|
getConflict, getConflictItemSpecs, getLocalFileDescription, getLocalPath, getLocalPath, getRemoteFileDescription, getServerPath, getWorkspace, isBaseless, loadContributedResolutions |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
protected VersionConflictDescription(Workspace workspace, Conflict conflict, ItemSpec[] conflictItemSpecs)
Method Detail |
---|
public ConflictCategory getConflictCategory()
getConflictCategory
in class ConflictDescription
public java.lang.String getName()
getName
in class ConflictDescription
public java.lang.String getDescription()
getDescription
in class ConflictDescription
public boolean showChangeDescription()
showChangeDescription
in class ConflictDescription
public boolean analyzeConflict()
analyzeConflict
in class ConflictDescription
public boolean hasAnalyzed()
hasAnalyzed
in class ConflictDescription
public void clearAnalysis()
clearAnalysis
in class ConflictDescription
protected boolean filesRenamed()
protected boolean filesRenamedOnly()
protected boolean isEncodingChange()
protected boolean targetRenamed()
public java.lang.String getChangeDescription()
getChangeDescription
in class ConflictDescription
public ConflictResolution[] getResolutions(ConflictResolutionContributor conflictResolutionContributor)
null
and
contains a matching tool, external resolution options may be available.
getResolutions
in class ConflictDescription
conflictResolutionContributor
- an object which contributes resolutions for conflicts. May be
null
, but external resolution options won't be
available.
ConflictResolution
s for this particular
conflict.public boolean isResolutionEnabled(ConflictResolution resolution)
isResolutionEnabled
in class ConflictDescription
resolution
- The resolution to examine
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |