com.starteam.viewcomparemerge
Class StarTeamFileMergeAdapter

java.lang.Object
  com.starteam.viewcomparemerge.FileMergeAdapter
      com.starteam.viewcomparemerge.StarTeamFileMergeAdapter

public class StarTeamFileMergeAdapter
extends FileMergeAdapter

Facilitates the use of the StarTeam File Compare / Merge tool (also known as "DeltaII") to resolve a file merge condition. Used as follows:

 FileMergeAdapter tool = new StarTeamFileMergeAdapter(diff);
 int exitCode = tool.merge();
 if (exitCode == 0) {
        System.out.println("The merge was successful!");
 } else {
        System.out.println("Merge failed with exit code: " + exitCode);
 }
 

Note that StarTeam File Compare / Merge is the default file merge tool in StarTeam 9.0 and later. It replaces VisMerge.exe, which is now obsolete.

See Also:

WorkstationDefaultMergeAdapter, VisMergeAdapter, CustomThreeWayMergeAdapter, FileMergeAdapter

Field Summary

Fields inherited from class com.starteam.viewcomparemerge.FileMergeAdapter

PARAM_COMMON_ANCESTOR, PARAM_OUTPUT_FILE, PARAM_SOURCE_ANCESTOR, PARAM_SOURCE_FILE, PARAM_TARGET_ANCESTOR, PARAM_TARGET_FILE

Constructor Summary

StarTeamFileMergeAdapter(ItemDifference diff)
Constructs a VisMerge adapter for resolving a given file merge condition.

Method Summary

boolean	getAutoMergeLinesWithNoConflicts() Determines whether or not changed lines with no conflicts will be merged automatically.
void	setAutoMergeLinesWithNoConflicts(boolean bAutoMerge) Determines whether or not changed lines with no conflicts will be merged automatically.

Methods inherited from class com.starteam.viewcomparemerge.FileMergeAdapter

merge

Methods inherited from class java.lang.Object

equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

StarTeamFileMergeAdapter

public StarTeamFileMergeAdapter(ItemDifference diff)

Constructs a VisMerge adapter for resolving a given file merge condition.

Parameters:

diff - The ItemDifference whose file merge condition is to be resolved.

Method Detail

getAutoMergeLinesWithNoConflicts

public boolean getAutoMergeLinesWithNoConflicts()

Determines whether or not changed lines with no conflicts will be merged automatically.

Returns:

true to automatically merge lines with no conflicts; false if all changes must be merged manually. Automatic merging is enabled by default.

setAutoMergeLinesWithNoConflicts

public void setAutoMergeLinesWithNoConflicts(boolean bAutoMerge)

Determines whether or not changed lines with no conflicts will be merged automatically.

Parameters:

bAutoMerge - true to automatically merge lines with no conflicts; false if all changes must be merged manually. Automatic merging is enabled by default.