com.starbase.starteam.viewcomparemerge
Class VisMergeAdapter

java.lang.Object
  |
  +--com.starbase.starteam.viewcomparemerge.FileMergeAdapter
        |
        +--com.starbase.starteam.viewcomparemerge.VisMergeAdapter

public class VisMergeAdapter

extends FileMergeAdapter

Facilitates the use of the StarTeam VisMerge tool to resolve a file merge condition. Used as follows:

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

Note that VisMerge was the default file merge tool in StarTeam 8.0 and earlier.

See Also:

WorkstationDefaultMergeAdapter, StarTeamFileMergeAdapter, Custom3WayMergeAdapter, FileMergeAdapter

Field Summary

Fields inherited from class com.starbase.starteam.viewcomparemerge.FileMergeAdapter

PARAM_COMMON_ANCESTOR, PARAM_OUTPUT_FILE, PARAM_SOURCE_ANCESTOR, PARAM_SOURCE_FILE, PARAM_TARGET_ANCESTOR, PARAM_TARGET_FILE

Constructor Summary

VisMergeAdapter(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.
boolean	getIgnoreWhiteSpace() 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.
void	setIgnoreWhiteSpace(boolean bIgnore) Determines whether or not changed lines with no conflicts will be merged automatically.

Methods inherited from class com.starbase.starteam.viewcomparemerge.FileMergeAdapter

merge

Methods inherited from class java.lang.Object

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

Constructor Detail

VisMergeAdapter

public VisMergeAdapter(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.

getIgnoreWhiteSpace

public boolean getIgnoreWhiteSpace()

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.

setIgnoreWhiteSpace

public void setIgnoreWhiteSpace(boolean bIgnore)

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