com.ibm.xtools.comparemerge.emf.delta

Interface Conflict

All Superinterfaces:

org.eclipse.emf.ecore.EObject, java.util.EventListener, org.eclipse.emf.common.notify.Notifier, Printable, java.beans.PropertyChangeListener

All Known Implementing Classes:

ConflictImpl

public interface Conflict
extends org.eclipse.emf.ecore.EObject, java.beans.PropertyChangeListener, Printable

A conflict between deltas generated by different contributors. That is, two deltas, one that, when resolved, hides the effect of resolving the other.

Field Summary

Fields

Modifier and Type	Field and Description
static java.lang.String	RESOLVED_PROPERTY

Method Summary

Modifier and Type	Method and Description
void	addDelta(Delta delta) Adds a delta.
void	addPropertyChangeListener(java.beans.PropertyChangeListener listener) Adds a property change listener that may be interested in Conflict.RESOLVED_PROPERTY change events.
void	customResolve(Delta delta) Resolves this conflict with delta not known to the delta container.
java.util.List	getContainedConflicts() Returns a list of all conflicts involving deltas of this conflict.
java.lang.Object	getCustomProperty(java.lang.String property) Returns custom property
Delta	getCustomResolveDelta() Returns the custom resolve delta.
java.util.List	getDeltas() Returns a list of deltas involved in the conflict.
ConflictType	getType() Returns the type.
boolean	isAutomaticallyResolvable() Returns whether or not a conflict can be automatically resolved without interventsion or losing any data.
boolean	isAutoResolveTarget(Delta delta) Returns whether or not a delta is the automatically resolving delta for this conflict.
boolean	isCustomResolved() Returns whether or not this conflict is resolved with a custom delta.
boolean	isEquivalent(Delta d1, Delta d2)
boolean	isResolved() Returns whether or not this conflict is resolved.
void	propertyChange(java.beans.PropertyChangeEvent evt) Responds to a property change event.
void	removePropertyChangeListener(java.beans.PropertyChangeListener listener) Removes a property change listener.
void	setCustomProperty(java.lang.String property, java.lang.Object value) Set custom property

Methods inherited from interface org.eclipse.emf.ecore.EObject

eAllContents, eClass, eContainer, eContainingFeature, eContainmentFeature, eContents, eCrossReferences, eGet, eGet, eInvoke, eIsProxy, eIsSet, eResource, eSet, eUnset

Methods inherited from interface org.eclipse.emf.common.notify.Notifier

eAdapters, eDeliver, eNotify, eSetDeliver

Methods inherited from interface com.ibm.xtools.comparemerge.emf.delta.util.Printable

print

Field Detail

RESOLVED_PROPERTY

static final java.lang.String RESOLVED_PROPERTY

See Also:

Constant Field Values

Method Detail

getType

ConflictType getType()

Returns the type.

Returns:

conflict type

isResolved

boolean isResolved()

Returns whether or not this conflict is resolved.

Returns:

true if this conflict is resolved, otherwise false.

getCustomResolveDelta

Delta getCustomResolveDelta()

Returns the custom resolve delta.

isCustomResolved

boolean isCustomResolved()

Returns whether or not this conflict is resolved with a custom delta.

Returns:

true if this conflict is resolved with a custom delta, othewise false

isAutomaticallyResolvable

boolean isAutomaticallyResolvable()

Returns whether or not a conflict can be automatically resolved without interventsion or losing any data.

Returns:

true if automatically resolvable, otherwise false

isAutoResolveTarget

boolean isAutoResolveTarget(Delta delta)

Returns whether or not a delta is the automatically resolving delta for this conflict.

Parameters:

delta - a conflicting delta

Returns:

true if the delt is the automatically resolving delta, otherwise false.

isEquivalent

boolean isEquivalent(Delta d1,
                     Delta d2)

getDeltas

java.util.List getDeltas()

Returns a list of deltas involved in the conflict.

Returns:

list of deltas

getContainedConflicts

java.util.List getContainedConflicts()

Returns a list of all conflicts involving deltas of this conflict.

Returns:

a list of all conflicts involving deltas of this conflict

addDelta

void addDelta(Delta delta)

Adds a delta.

Parameters:

delta - a delta

customResolve

void customResolve(Delta delta)

Resolves this conflict with delta not known to the delta container.

Parameters:

delta - a delta

addPropertyChangeListener

void addPropertyChangeListener(java.beans.PropertyChangeListener listener)

Adds a property change listener that may be interested in Conflict.RESOLVED_PROPERTY change events. The event's source is a Conflict. The event's old and new values are always null, but can be queried with Conflict.isResolved. Note the possibility of hurting performance of the engine by adding property change listeners before running a merge session.

Parameters:

listener - a property change listener

removePropertyChangeListener

void removePropertyChangeListener(java.beans.PropertyChangeListener listener)

Removes a property change listener.

Parameters:

listener - a property change listener

propertyChange

void propertyChange(java.beans.PropertyChangeEvent evt)

Responds to a property change event.

Specified by:

propertyChange in interface java.beans.PropertyChangeListener

Parameters:

evt -

setCustomProperty

void setCustomProperty(java.lang.String property,
                       java.lang.Object value)

Set custom property

Parameters:

property -

value -

getCustomProperty

java.lang.Object getCustomProperty(java.lang.String property)

Returns custom property

Parameters:

property -