com.ibm.xtools.comparemerge.emf.delta.util

Class ConflictUtil

java.lang.Object

com.ibm.xtools.comparemerge.emf.delta.util.ConflictUtil

public class ConflictUtil
extends java.lang.Object

Some convenient utility methods for working with conflicts.

Constructor Summary

Constructors

Constructor and Description
ConflictUtil()

Method Summary

Modifier and Type	Method and Description
static boolean	isAddAdd(Conflict conflict) Returns whether or not a conflict is an add/add.
static boolean	isAddChange(Conflict conflict) Returns whether or not a conflict is an add/change.
static boolean	isAddDelete(Conflict conflict) Returns whether or not a conflict is an add/delete.
static boolean	isAddMove(Conflict conflict) Returns whether or not a conflict is an add/move.
static boolean	isChangeChange(Conflict conflict) Returns whether or not a conflict is a change/change.
static boolean	isChangeDelete(Conflict conflict) Returns whether or not a conflict is a change/delete.
static boolean	isChangeMove(Conflict conflict) Returns whether or not a conflict is a change/move.
static boolean	isCompositeComposite(Conflict conflict) Returns whether or not a conflict is a composite/composite.
static boolean	isDeleteDelete(Conflict conflict) Returns whether or not a conflict is a delete/delete.
static boolean	isMorphDelete(Conflict conflict) Returns whether or not a conflict is an morph/delete.
static boolean	isMorphMorph(Conflict conflict) Returns whether or not a conflict is an morph/morph.
static boolean	isMoveDelete(Conflict conflict) Returns whether or not a conflict is a move/delete.
static boolean	isMoveMove(Conflict conflict) Returns whether or not a conflict is a move/move.

Methods inherited from class java.lang.Object

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

Constructor Detail

ConflictUtil

public ConflictUtil()

Method Detail

isMorphDelete

public static boolean isMorphDelete(Conflict conflict)

Returns whether or not a conflict is an morph/delete.

Parameters:

conflict - a conflict

Returns:

true if a conflict is an morph/delete conflict, otherwise false.

isMorphMorph

public static boolean isMorphMorph(Conflict conflict)

Returns whether or not a conflict is an morph/morph.

Parameters:

conflict - a conflict

Returns:

true if a conflict is an morph/morph conflict, otherwise false.

isAddAdd

public static boolean isAddAdd(Conflict conflict)

Returns whether or not a conflict is an add/add.

Parameters:

conflict - a conflict

Returns:

true if a conflict is an add/add conflict, otherwise false.

isAddDelete

public static boolean isAddDelete(Conflict conflict)

Returns whether or not a conflict is an add/delete.

Parameters:

conflict - a conflict

Returns:

true if a conflict is an add/delete conflict, otherwise false.

isAddChange

public static boolean isAddChange(Conflict conflict)

Returns whether or not a conflict is an add/change.

Parameters:

conflict - a conflict

Returns:

true if a conflict is an add/change conflict, otherwise false.

isAddMove

public static boolean isAddMove(Conflict conflict)

Returns whether or not a conflict is an add/move.

Parameters:

conflict - a conflict

Returns:

true if a conflict is an add/move conflict, otherwise false.

isChangeChange

public static boolean isChangeChange(Conflict conflict)

Returns whether or not a conflict is a change/change.

Parameters:

conflict - a conflict

Returns:

true if a conflict is a change/change conflict, otherwise false.

isChangeDelete

public static boolean isChangeDelete(Conflict conflict)

Returns whether or not a conflict is a change/delete.

Parameters:

conflict - a conflict

Returns:

true if a conflict is a change/delete conflict, otherwise false.

isChangeMove

public static boolean isChangeMove(Conflict conflict)

Returns whether or not a conflict is a change/move.

Parameters:

conflict - a conflict

Returns:

true if a conflict is a change/move conflict, otherwise false.

isDeleteDelete

public static boolean isDeleteDelete(Conflict conflict)

Returns whether or not a conflict is a delete/delete.

Parameters:

conflict - a conflict

Returns:

true if a conflict is a delete/delete conflict, otherwise false.

isMoveDelete

public static boolean isMoveDelete(Conflict conflict)

Returns whether or not a conflict is a move/delete.

Parameters:

conflict - a conflict

Returns:

true if a conflict is a move/delete conflict, otherwise false.

isMoveMove

public static boolean isMoveMove(Conflict conflict)

Returns whether or not a conflict is a move/move.

Parameters:

conflict - a conflict

Returns:

true if a conflict is a move/move conflict, otherwise false.

isCompositeComposite

public static boolean isCompositeComposite(Conflict conflict)

Returns whether or not a conflict is a composite/composite.

Parameters:

conflict - a conflict

Returns:

true if a conflict is a composite/composite conflict, otherwise false.