com.ibm.xtools.comparemerge.emf.delta.impl

Class ConflictImpl

java.lang.Object

org.eclipse.emf.common.notify.impl.BasicNotifierImpl

org.eclipse.emf.ecore.impl.BasicEObjectImpl

org.eclipse.emf.ecore.impl.EObjectImpl

com.ibm.xtools.comparemerge.emf.delta.impl.ConflictImpl

All Implemented Interfaces:

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

public class ConflictImpl
extends org.eclipse.emf.ecore.impl.EObjectImpl
implements Conflict

Nested Class Summary

Nested classes/interfaces inherited from class org.eclipse.emf.ecore.impl.BasicEObjectImpl

org.eclipse.emf.ecore.impl.BasicEObjectImpl.EPropertiesHolder, org.eclipse.emf.ecore.impl.BasicEObjectImpl.EPropertiesHolderBaseImpl, org.eclipse.emf.ecore.impl.BasicEObjectImpl.EPropertiesHolderImpl

Nested classes/interfaces inherited from class org.eclipse.emf.common.notify.impl.BasicNotifierImpl

org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EAdapterList<E extends java.lang.Object & org.eclipse.emf.common.notify.Adapter>, org.eclipse.emf.common.notify.impl.BasicNotifierImpl.EObservableAdapterList

Nested classes/interfaces inherited from interface org.eclipse.emf.ecore.InternalEObject

org.eclipse.emf.ecore.InternalEObject.EStore

Field Summary

Fields

Modifier and Type	Field and Description
protected Delta	autoResolveTarget
protected java.util.List	deltas
protected ConflictType	type

Fields inherited from class org.eclipse.emf.ecore.impl.EObjectImpl

eAdapters, eContainer, eContainerFeatureID, EDELIVER, EDYNAMIC_CLASS, eFlags, ELAST_EOBJECT_FLAG, ELAST_NOTIFIER_FLAG, eProperties, EPROXY

Fields inherited from class org.eclipse.emf.ecore.impl.BasicEObjectImpl

EVIRTUAL_GET, EVIRTUAL_IS_SET, EVIRTUAL_NO_VALUE, EVIRTUAL_SET, EVIRTUAL_UNSET

Fields inherited from interface com.ibm.xtools.comparemerge.emf.delta.Conflict

RESOLVED_PROPERTY

Fields inherited from interface org.eclipse.emf.ecore.InternalEObject

EOPPOSITE_FEATURE_BASE

Constructor Summary

Constructors

Modifier	Constructor and Description
protected	ConflictImpl()
	ConflictImpl(ConflictType type)

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.
protected void	calculateAutoResolveTarget()
void	customResolve(Delta delta) Resolves this conflict with delta not known to the delta container.
java.lang.Object	eGet(int featureID, boolean resolve, boolean coreType)
org.eclipse.emf.common.notify.NotificationChain	eInverseAdd(org.eclipse.emf.ecore.InternalEObject otherEnd, int featureID, org.eclipse.emf.common.notify.NotificationChain msgs)
org.eclipse.emf.common.notify.NotificationChain	eInverseRemove(org.eclipse.emf.ecore.InternalEObject otherEnd, int featureID, org.eclipse.emf.common.notify.NotificationChain msgs)
boolean	eIsSet(int featureID)
void	eSet(int featureID, java.lang.Object newValue)
protected org.eclipse.emf.ecore.EClass	eStaticClass()
void	eUnset(int featureID)
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 target) 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) Test whether the two deltas are equivalent if add/add n delete/delete deltas have same guid and target, or if the change/change delta have same guid + same changes
boolean	isResolved() Returns whether or not this conflict is resolved.
void	print(java.io.PrintStream out) Prints a text representation to a stream.
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 class org.eclipse.emf.ecore.impl.EObjectImpl

eAdapters, eBasicAdapters, eBasicProperties, eBasicSetContainer, eClass, eContainerFeatureID, eDeliver, eInternalContainer, eInvoke, eIsProxy, eProperties, eSetClass, eSetDeliver, eSetProxyURI

Methods inherited from class org.eclipse.emf.ecore.impl.BasicEObjectImpl

eAddVirtualValue, eAllContents, eBaseStructuralFeatureID, eBasicRemoveFromContainer, eBasicRemoveFromContainerFeature, eBasicSetContainer, eComputeVirtualValuesCapacity, eContainer, eContainerAdapterArray, eContainingFeature, eContainmentFeature, eContainmentFeature, eContains, eContents, eCrossReferences, eDerivedOperationID, eDerivedOperationID, eDerivedStructuralFeatureID, eDerivedStructuralFeatureID, eDirectResource, eDynamicBasicRemoveFromContainer, eDynamicClass, eDynamicFeature, eDynamicFeatureID, eDynamicGet, eDynamicGet, eDynamicGet, eDynamicInverseAdd, eDynamicInverseAdd, eDynamicInverseRemove, eDynamicInverseRemove, eDynamicInvoke, eDynamicInvoke, eDynamicIsSet, eDynamicIsSet, eDynamicIsSet, eDynamicSet, eDynamicSet, eDynamicSet, eDynamicUnset, eDynamicUnset, eDynamicUnset, eGet, eGet, eGet, eHasSettings, eInternalResource, eInverseAdd, eInverseRemove, eInvocationDelegate, eInvoke, eIsSet, eObjectForURIFragmentSegment, eOpenGet, eOpenIsSet, eOpenSet, eOpenUnset, eProxyURI, eRemoveVirtualValue, eResolveProxy, eResource, eSet, eSetDirectResource, eSetResource, eSetStore, eSetting, eSettingDelegate, eSettings, eSetVirtualIndexBits, eSetVirtualValue, eSetVirtualValues, eStaticFeatureCount, eStaticOperationCount, eStore, eUnset, eURIFragmentSegment, eVirtualBitCount, eVirtualGet, eVirtualGet, eVirtualIndex, eVirtualIndexBits, eVirtualIsSet, eVirtualSet, eVirtualUnset, eVirtualValue, eVirtualValues, toString

Methods inherited from class org.eclipse.emf.common.notify.impl.BasicNotifierImpl

eBasicAdapterArray, eBasicHasAdapters, eNotificationRequired, eNotify

Methods inherited from class java.lang.Object

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

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 org.eclipse.emf.ecore.InternalEObject

eNotificationRequired

Field Detail

type

protected ConflictType type

deltas

protected java.util.List deltas

autoResolveTarget

protected Delta autoResolveTarget

Constructor Detail

ConflictImpl

protected ConflictImpl()

ConflictImpl

public ConflictImpl(ConflictType type)

Method Detail

eStaticClass

protected org.eclipse.emf.ecore.EClass eStaticClass()

Overrides:

eStaticClass in class org.eclipse.emf.ecore.impl.EObjectImpl

calculateAutoResolveTarget

protected void calculateAutoResolveTarget()

isAutoResolveTarget

public boolean isAutoResolveTarget(Delta target)

Description copied from interface: Conflict

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

Specified by:

isAutoResolveTarget in interface Conflict

Parameters:

target - a conflicting delta

Returns:

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

getType

public ConflictType getType()

Description copied from interface: Conflict

Returns the type.

Specified by:

getType in interface Conflict

Returns:

conflict type

getDeltas

public java.util.List getDeltas()

Description copied from interface: Conflict

Returns a list of deltas involved in the conflict.

Specified by:

getDeltas in interface Conflict

Returns:

list of deltas

eInverseAdd

public org.eclipse.emf.common.notify.NotificationChain eInverseAdd(org.eclipse.emf.ecore.InternalEObject otherEnd,
                                                                   int featureID,
                                                                   org.eclipse.emf.common.notify.NotificationChain msgs)

Overrides:

eInverseAdd in class org.eclipse.emf.ecore.impl.BasicEObjectImpl

eInverseRemove

public org.eclipse.emf.common.notify.NotificationChain eInverseRemove(org.eclipse.emf.ecore.InternalEObject otherEnd,
                                                                      int featureID,
                                                                      org.eclipse.emf.common.notify.NotificationChain msgs)

Overrides:

eInverseRemove in class org.eclipse.emf.ecore.impl.BasicEObjectImpl

eGet

public java.lang.Object eGet(int featureID,
                             boolean resolve,
                             boolean coreType)

Specified by:

eGet in interface org.eclipse.emf.ecore.InternalEObject

Overrides:

eGet in class org.eclipse.emf.ecore.impl.BasicEObjectImpl

eSet

public void eSet(int featureID,
                 java.lang.Object newValue)

Specified by:

eSet in interface org.eclipse.emf.ecore.InternalEObject

Overrides:

eSet in class org.eclipse.emf.ecore.impl.BasicEObjectImpl

eUnset

public void eUnset(int featureID)

Specified by:

eUnset in interface org.eclipse.emf.ecore.InternalEObject

Overrides:

eUnset in class org.eclipse.emf.ecore.impl.BasicEObjectImpl

eIsSet

public boolean eIsSet(int featureID)

Specified by:

eIsSet in interface org.eclipse.emf.ecore.InternalEObject

Overrides:

eIsSet in class org.eclipse.emf.ecore.impl.BasicEObjectImpl

getContainedConflicts

public java.util.List getContainedConflicts()

Description copied from interface: Conflict

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

Specified by:

getContainedConflicts in interface Conflict

Returns:

a list of all conflicts involving deltas of this conflict

addDelta

public void addDelta(Delta delta)

Description copied from interface: Conflict

Adds a delta.

Specified by:

addDelta in interface Conflict

Parameters:

delta - a delta

isResolved

public boolean isResolved()

Description copied from interface: Conflict

Returns whether or not this conflict is resolved.

Specified by:

isResolved in interface Conflict

Returns:

true if this conflict is resolved, otherwise false.

customResolve

public void customResolve(Delta delta)

Description copied from interface: Conflict

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

Specified by:

customResolve in interface Conflict

Parameters:

delta - a delta

getCustomResolveDelta

public Delta getCustomResolveDelta()

Description copied from interface: Conflict

Returns the custom resolve delta.

Specified by:

getCustomResolveDelta in interface Conflict

isCustomResolved

public boolean isCustomResolved()

Description copied from interface: Conflict

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

Specified by:

isCustomResolved in interface Conflict

Returns:

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

isAutomaticallyResolvable

public boolean isAutomaticallyResolvable()

Description copied from interface: Conflict

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

Specified by:

isAutomaticallyResolvable in interface Conflict

Returns:

true if automatically resolvable, otherwise false

addPropertyChangeListener

public void addPropertyChangeListener(java.beans.PropertyChangeListener listener)

Description copied from interface: Conflict

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.

Specified by:

addPropertyChangeListener in interface Conflict

Parameters:

listener - a property change listener

removePropertyChangeListener

public void removePropertyChangeListener(java.beans.PropertyChangeListener listener)

Description copied from interface: Conflict

Removes a property change listener.

Specified by:

removePropertyChangeListener in interface Conflict

Parameters:

listener - a property change listener

propertyChange

public void propertyChange(java.beans.PropertyChangeEvent evt)

Description copied from interface: Conflict

Responds to a property change event.

Specified by:

propertyChange in interface Conflict

Specified by:

propertyChange in interface java.beans.PropertyChangeListener

print

public void print(java.io.PrintStream out)

Description copied from interface: Printable

Prints a text representation to a stream.

Specified by:

print in interface Printable

Parameters:

out - output stream

isEquivalent

public boolean isEquivalent(Delta d1,
                            Delta d2)

Test whether the two deltas are equivalent if add/add n delete/delete deltas have same guid and target, or if the change/change delta have same guid + same changes

Specified by:

isEquivalent in interface Conflict

setCustomProperty

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

Description copied from interface: Conflict

Set custom property

Specified by:

setCustomProperty in interface Conflict

getCustomProperty

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

Description copied from interface: Conflict

Returns custom property

Specified by:

getCustomProperty in interface Conflict