com.starbase.starteam.viewcomparemerge
Class MergeAction

java.lang.Object
  |
  +--com.starbase.starteam.viewcomparemerge.MergeAction

public class MergeAction

extends java.lang.Object

An action that may be used to resolve a merge condition.

Field Summary

static MergeAction	DELETE Delete the target item.
static MergeAction	DELETE_AND_REVERSE_SHARE Equivalent to a DELETE followed by a REVERSE_SHARE.
static MergeAction	FAIL Fail -- that is, don't allow commit while this action is selected.
static MergeAction	IGNORE No action.
static MergeAction	MARK_RESOLVED Just mark the difference as resolved by creating a merge point.
static MergeAction	MERGE Merge the source and target items.
static MergeAction	MOVE Move the target item to another folder.
static MergeAction	MOVE_AND_MERGE Equivalent to a MOVE followed by a MERGE.
static MergeAction	MOVE_AND_OVERWRITE Equivalent to a MOVE followed by an OVERWRITE.
static MergeAction	MOVE_AND_RE_PIN Equivalent to a MOVE followed by a RE_PIN.
static MergeAction	OVERWRITE Overwrite the target with the content of the source.
static MergeAction	RE_PIN Change the revision to which the target item is pinned to match the source item.
static MergeAction	REVERSE_SHARE Move the source item to the target and share it back to the source.
static MergeAction	SHARE Share the source item to the target.

Method Summary

boolean	equals(java.lang.Object other)
static MergeAction	fromID(int actionID) Gets the MergeAction that corresponds to the given action ID.
static MergeAction[]	getAllActions() Returns an array of all MergeAction instances
static MergeAction[]	getAllPrimitiveActions() Returns an array of all primitive MergeAction instances
int	getID() Gets the unique ID associated with this action.
java.lang.String	getName() Returns a String representation of this merge action
int	hashCode()
boolean	includes(MergeAction action) Determines whether or not this action includes the primitives specified in the given action, in any order.
java.lang.String	toString() Returns a String representation of this merge action

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait

Field Detail

IGNORE

public static final MergeAction IGNORE

No action.

RE_PIN

public static final MergeAction RE_PIN

Change the revision to which the target item is pinned to match the source item.

MOVE

public static final MergeAction MOVE

Move the target item to another folder.

MERGE

public static final MergeAction MERGE

Merge the source and target items.

DELETE

public static final MergeAction DELETE

Delete the target item.

SHARE

public static final MergeAction SHARE

Share the source item to the target.

REVERSE_SHARE

public static final MergeAction REVERSE_SHARE

Move the source item to the target and share it back to the source.

OVERWRITE

public static final MergeAction OVERWRITE

Overwrite the target with the content of the source. Ignore merge conflicts

FAIL

public static final MergeAction FAIL

Fail -- that is, don't allow commit while this action is selected.

MARK_RESOLVED

public static final MergeAction MARK_RESOLVED

Just mark the difference as resolved by creating a merge point.

MOVE_AND_MERGE

public static final MergeAction MOVE_AND_MERGE

Equivalent to a MOVE followed by a MERGE.

See Also:

MergeAction.MERGE, MergeAction.MOVE

MOVE_AND_OVERWRITE

public static final MergeAction MOVE_AND_OVERWRITE

Equivalent to a MOVE followed by an OVERWRITE.

See Also:

MergeAction.OVERWRITE, MergeAction.MOVE

MOVE_AND_RE_PIN

public static final MergeAction MOVE_AND_RE_PIN

Equivalent to a MOVE followed by a RE_PIN.

See Also:

MergeAction.RE_PIN, MergeAction.MOVE

DELETE_AND_REVERSE_SHARE

public static final MergeAction DELETE_AND_REVERSE_SHARE

Equivalent to a DELETE followed by a REVERSE_SHARE.

See Also:

MergeAction.DELETE, MergeAction.REVERSE_SHARE

Method Detail

getAllActions

public static MergeAction[] getAllActions()

Returns an array of all MergeAction instances

Returns:

MergeAction[] an array of all MergeAction instances

getAllPrimitiveActions

public static MergeAction[] getAllPrimitiveActions()

Returns an array of all primitive MergeAction instances

Returns:

MergeAction[] an array of all primitive MergeAction instances

includes

public boolean includes(MergeAction action)

Determines whether or not this action includes the primitives specified in the given action, in any order.

Parameters:

action - The MergeAction to be found.

Returns:

True if this action includes all the primitives specified in the given action, in any order; false otherwise.

getName

public java.lang.String getName()

Returns a String representation of this merge action

Returns:

String a String representation of this merge action

getID

public int getID()

Gets the unique ID associated with this action.

Returns:

The unique ID associated with this action.

See Also:

MergeAction.fromID(int)

fromID

public static MergeAction fromID(int actionID)

Gets the MergeAction that corresponds to the given action ID.

Parameters:

actionID - The unique ID of some merge action.

Returns:

The merge action.

See Also:

MergeAction.getID()

toString

public java.lang.String toString()

Returns a String representation of this merge action

Overrides:

toString in class java.lang.Object

Returns:

String a String representation of this merge action

equals

public boolean equals(java.lang.Object other)

Overrides:

equals in class java.lang.Object

Returns:

true if the given object is a MergeAction that is equal to this one.

hashCode

public int hashCode()

Overrides:

hashCode in class java.lang.Object