com.starbase.starteam
Class MergePoint

java.lang.Object
  |
  +--com.starbase.starteam.MergePoint

public class MergePoint

extends java.lang.Object

This class provides information about how two item revisions are related with respect to merging. Suppose the file "foo.txt" branches at revision 1.3 to create a new revision 1.3.1.0. A checkin on the main branch will create revision 1.4 and a subsequent checkin on the alternate branch will create revision 1.3.1.1. If the user then merges the changes between 1.3 to 1.4 in to a new branch revision 1.3.1.2 a MergePoint can be used to record the sources used to create this new revision. In this case the MergePoint would have a source RevisionID corresponding to the 1.4 revision of "foo.txt" and a target RevisionID corresponding to the 1.3.1.2 revision of "foo.txt".

See Also:

Item.resolveMergePoint(com.starbase.starteam.Item), Item.recordMergePoint(com.starbase.starteam.Item)

Constructor Summary

MergePoint(RevisionID source, RevisionID target)
Creates a new MergePoint for the specified source and target RevisionIDs.

Method Summary

boolean	equals(java.lang.Object source) returns true if this object instance is equal to the source
RevisionID	getSource() Returns the RevisionID of the merge source.
RevisionID	getTarget() Returns the RevisionID of the merge target.
int	hashCode() returns a unique hash for all instances of this type
void	setSource(RevisionID source) Sets the RevisionID of the source.
void	setTarget(RevisionID target) Sets the RevisionID of the target.

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

MergePoint

public MergePoint(RevisionID source,
                  RevisionID target)

Creates a new MergePoint for the specified source and target RevisionIDs.

Parameters:

source - the source RevisionID

target - the target RevisionID

Method Detail

getSource

public RevisionID getSource()

Returns the RevisionID of the merge source.

Returns:

the RevisionID of the merge source.

setSource

public void setSource(RevisionID source)

Sets the RevisionID of the source. The source cannot be null.

Parameters:

source - the RevisionID of the source. Cannot be null.

getTarget

public RevisionID getTarget()

Returns the RevisionID of the merge target.

Returns:

the RevisionID of the merge target.

setTarget

public void setTarget(RevisionID target)

Sets the RevisionID of the target. The target cannot be null.

equals

public boolean equals(java.lang.Object source)

returns true if this object instance is equal to the source

Overrides:

equals in class java.lang.Object

Parameters:

source - Object the source to comapre with

Returns:

boolean true if this object is equal to the source

hashCode

public int hashCode()

returns a unique hash for all instances of this type

Overrides:

hashCode in class java.lang.Object

Returns:

int a unique hash for all instances of this type