public static class ThreeWayComparisonGroupProvider.CompositeConflict extends ConflictImpl
Conflict is used to handle refined diffs and to
join conflicts for the SMV. If refining diffs are part of a conflict, we show their refined diffs
instead. As we show refined diffs instead of the refining diffs, multiple conflicts may consequently
include the same refined diffs. To avoid that, this extension of a conflict also joins such overlapping
conflicts.MinimalEObjectImpl.ContainerBasicEObjectImpl.EPropertiesHolder, BasicEObjectImpl.EPropertiesHolderBaseImpl, BasicEObjectImpl.EPropertiesHolderImplBasicNotifierImpl.EAdapterList<E extends Object & Adapter>, BasicNotifierImpl.EObservableAdapterListInternalEObject.EStorecopyright, differences, kind, KIND_EDEFAULTEVIRTUAL_GET, EVIRTUAL_IS_SET, EVIRTUAL_NO_VALUE, EVIRTUAL_SET, EVIRTUAL_UNSETNILEOPPOSITE_FEATURE_BASE| Constructor and Description |
|---|
CompositeConflict(Conflict conflict)
Creates a new composite conflict for the given conflict.
|
| Modifier and Type | Method and Description |
|---|---|
Set<Conflict> |
getConflicts()
Returns an unmodifiable view of the joined conflicts.
|
EList<Diff> |
getDifferences()
Returns an EList built by aggregating the diffs of all the aggregated conflicts.
|
ConflictKind |
getKind() |
void |
join(ThreeWayComparisonGroupProvider.CompositeConflict conflict)
Joins the provided composite conflict with this composite conflict.
|
eGet, eInverseAdd, eInverseRemove, eIsSet, eSet, eStaticClass, eUnset, getLeftDifferences, getRightDifferences, setKind, toStringdynamicGet, dynamicSet, dynamicUnset, eAdapters, eBasicAdapterArray, eBasicAdapterListeners, eBasicAdapters, eBasicHasAdapters, eBasicProperties, eBasicSetAdapterArray, eBasicSetAdapterListeners, eBasicSetContainer, eBasicSetContainer, eBasicSetContainerFeatureID, eBasicSetSettings, eBasicSettings, eClass, eContainerFeatureID, eContents, eCrossReferences, eDeliver, eDirectResource, eDynamicClass, eHasSettings, eInternalContainer, eIsProxy, eProperties, eProxyURI, eSetClass, eSetDeliver, eSetDirectResource, eSetProxyURI, eSettingseAddVirtualValue, eAllContents, eBaseStructuralFeatureID, eBasicRemoveFromContainer, eBasicRemoveFromContainerFeature, eBasicSetContainer, eComputeVirtualValuesCapacity, eContainer, eContainerAdapterArray, eContainingFeature, eContainmentFeature, eContainmentFeature, eContains, eDerivedOperationID, eDerivedOperationID, eDerivedStructuralFeatureID, eDerivedStructuralFeatureID, eDynamicBasicRemoveFromContainer, eDynamicFeature, eDynamicFeatureID, eDynamicGet, eDynamicGet, eDynamicGet, eDynamicInverseAdd, eDynamicInverseAdd, eDynamicInverseRemove, eDynamicInverseRemove, eDynamicInvoke, eDynamicInvoke, eDynamicIsSet, eDynamicIsSet, eDynamicIsSet, eDynamicSet, eDynamicSet, eDynamicSet, eDynamicUnset, eDynamicUnset, eDynamicUnset, eGet, eGet, eGet, eInternalResource, eInverseAdd, eInverseRemove, eInvocationDelegate, eInvoke, eInvoke, eIsSet, eObjectForURIFragmentSegment, eOpenGet, eOpenIsSet, eOpenSet, eOpenUnset, eRemoveVirtualValue, eResolveProxy, eResource, eSet, eSetResource, eSetStore, eSetting, eSettingDelegate, eSetVirtualIndexBits, eSetVirtualValue, eSetVirtualValues, eStaticFeatureCount, eStaticOperationCount, eStore, eUnset, eURIFragmentSegment, eVirtualBitCount, eVirtualGet, eVirtualGet, eVirtualIndex, eVirtualIndexBits, eVirtualIsSet, eVirtualSet, eVirtualUnset, eVirtualValue, eVirtualValueseNotificationRequired, eNotifyclone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, waiteAllContents, eClass, eContainer, eContainingFeature, eContainmentFeature, eContents, eCrossReferences, eGet, eGet, eInvoke, eIsProxy, eIsSet, eResource, eSet, eUnseteAdapters, eDeliver, eNotify, eSetDelivereNotificationRequiredpublic ConflictKind getKind()
ConflictImplgetKind in interface ConflictgetKind in class ConflictImplConflictKind,
Conflict.setKind(ConflictKind),
ComparePackage.getConflict_Kind()public EList<Diff> getDifferences()
This list is not supposed to be used for update, since modifying this list will not modify the underlying conflicts.
getDifferences in interface ConflictgetDifferences in class ConflictImplComparePackage.getConflict_Differences(),
Diff.getConflict()public Set<Conflict> getConflicts()
null nor empty.public void join(ThreeWayComparisonGroupProvider.CompositeConflict conflict)
conflict - The conflict to be joined with this composite conflict
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.