com.ibm.xtools.comparemerge.emf.delta.deltaresolver

Class DeltaResolver

java.lang.Object

com.ibm.xtools.comparemerge.emf.delta.deltaresolver.DeltaResolver

All Implemented Interfaces:

java.beans.PropertyChangeListener, java.util.EventListener

public class DeltaResolver
extends java.lang.Object
implements java.beans.PropertyChangeListener

The DeltaResolver is responsible for creating a merged resource then maintaining its integrity by accepting requests to accept and reject deltas.

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
protected static class	DeltaResolver.SilentGroup Helper class to group deltas for silent merge

Field Summary

Fields

Modifier and Type	Field and Description
protected org.eclipse.emf.ecore.resource.Resource	base
protected java.util.List	conflicts
protected DeltaContainer[]	contributorDeltas
protected IContributorProvider	contributorProvider
protected org.eclipse.emf.ecore.resource.Resource[]	contributors
protected EntriesTable	featureToIndexListTable
protected com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher	matcher
protected boolean	outOfBoundsRecoveryEnable
protected java.beans.PropertyChangeSupport	propertyChangeSupport
protected ResourceModifier	resourceModifier
protected SilentMergeOptions	silentMergeOptions
static boolean	TRACE_INDEX_OUT_OF_BOUNDS
protected int	unresolvedConflictCount
protected int	unresolvedDeltaCount

Constructor Summary

Constructors

Constructor and Description
DeltaResolver()

Method Summary

Modifier and Type	Method and Description
protected Resolution	accept(Delta delta)
protected void	acceptAllNonconflictingDeltas() Apply all the non-conflicting deltas to the merged resource.
protected void	addDestinationContainer(org.eclipse.emf.ecore.resource.Resource resource, Location destinationLocation, Delta delta) Adds a suitable destination container in the base resource.
protected void	addIds(org.eclipse.emf.ecore.EObject value, ChangeDelta changeDelta) Add IDs for copied EObject which are used in change deltas TODO: Test in the context of logical merge
protected void	addIds(org.eclipse.emf.ecore.EObject eObject, org.eclipse.emf.ecore.xmi.XMLResource xmlResource, ListDelta listDelta)
void	addObject(ListDelta listDelta)
void	addPropertyChangeListener(java.beans.PropertyChangeListener listener) Adds a property change listener that may be interested in Delta.RESOLVED_PROPERTY and/or Conflict.RESOLVED_PROPERTY change events.
void	addPropertyChangeListener(java.lang.String propertyName, java.beans.PropertyChangeListener listener) Adds a property change listener that may be interested in Delta.RESOLVED_PROPERTY or Conflict.RESOLVED_PROPERTY change events.
void	apply(Resolution resolution)
protected org.eclipse.emf.ecore.EObject	applyMorfDelta(MorphDelta delta) Object morphing is metamodel specific - should be overridden by subclasses
void	changeObject(ChangeDelta changeDelta, boolean isSet, java.lang.Object changeValue)
protected void	combine(DeltaResolver.SilentGroup group, java.util.Set<Delta> leftDeltas, java.util.Set<Delta> rightDeltas) Split deltas into groups for silent merge
protected org.eclipse.emf.ecore.EAnnotation	createEAnnotation(java.lang.String source)
protected void	deleteIds(org.eclipse.emf.ecore.EObject eObject, org.eclipse.emf.ecore.xmi.XMLResource xmlResource, ListDelta listDelta)
void	deleteObject(ListDelta listDelta)
protected void	deleteSourceContainer(Location sourceLocation) Delete any unnecessary source container from the base resource.
protected org.eclipse.emf.ecore.EAnnotation	findAnnotation(EAnnotationLocation annotationLocation, org.eclipse.emf.ecore.resource.Resource resource)
protected void	findConflictingResources()
protected org.eclipse.emf.ecore.EObject	findEObjectInResource(org.eclipse.emf.ecore.xmi.XMLResource xmlResource, java.lang.String id)
org.eclipse.emf.common.command.Command	getAcceptCommand(Delta delta) Returns a command that will accept a delta in the merged resource.
protected java.util.List	getAllDeltasWithinCollection(Location location)
org.eclipse.emf.common.command.Command	getApplyResolutionCommand(java.util.List<Delta> deltas, ResolutionType type)
int	getCalculatedBaseIndex(ListDelta listDelta) Return an index for a location of a delta calculated to the base resource.
int	getCalculatedBaseIndex(Location location, Delta inputDelta) Return an index for a location of a delta calculated to the base resource.
int	getCalculatedContributorIndex(ListDelta listDelta, org.eclipse.emf.ecore.resource.Resource contributor) Return an index for a location of a delta calculated to a contributor resource.
int	getCalculatedContributorIndex(Location location, Delta inputDelta, org.eclipse.emf.ecore.resource.Resource contributor) Return an index for a location of a delta calculated to a contributor resource.
int	getCalculatedMergedIndex(ListDelta listDelta) Return an index for a location of a delta calculated to the merged resource.
int	getCalculatedMergedIndex(Location location, Delta inputDelta) Return an index for a location of a delta calculated to the merged resource.
DeltaContainer	getDeltaContainer(org.eclipse.emf.ecore.resource.Resource contributor)
java.util.Set	getNonconflictingDeltas(org.eclipse.emf.ecore.resource.Resource contributor) Return all non-conflicting deltas a contributor.
org.eclipse.emf.common.command.Command	getRejectCommand(Delta delta) Returns a command that will reject a delta in the merged resource.
int	getUnresolvedConflictCount() Returns the number of unresolved conflicts
int	getUnresolvedDeltaCount() Returns the number of unresolved deltas
protected void	ignoreConflicts()
void	init(java.lang.String newResourceType, com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher newMatcher, org.eclipse.emf.ecore.resource.Resource newBase, IContributorProvider provider, java.util.List newConflicts) Init this delta resolver with a new base and contributor resources, contributor deltas and conflicts.
void	propertyChange(java.beans.PropertyChangeEvent event)
protected Resolution	reject(Delta delta)
void	removePropertyChangeListener(java.beans.PropertyChangeListener listener) Removes a property change listener.
void	removePropertyChangeListener(java.lang.String propertyName, java.beans.PropertyChangeListener listener) Removes a property change listener.
protected void	resolveAllAutoResolvableConflicts() Resolve as many conflicts as possible.
void	run() Run this delta resolver.
void	setResourceModifier(ResourceModifier modifier)
void	setSilentMergeOptions(SilentMergeOptions options)
void	unapply(Resolution resolution)
protected org.eclipse.emf.ecore.EObject	unapplyMorfDelta(MorphDelta delta) Object morphing is metamodel specific - should be overridden by subclasses

Methods inherited from class java.lang.Object

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

Field Detail

TRACE_INDEX_OUT_OF_BOUNDS

public static final boolean TRACE_INDEX_OUT_OF_BOUNDS

See Also:

Constant Field Values

matcher

protected com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher

base

protected org.eclipse.emf.ecore.resource.Resource base

contributors

protected org.eclipse.emf.ecore.resource.Resource[] contributors

contributorDeltas

protected DeltaContainer[] contributorDeltas

conflicts

protected java.util.List conflicts

unresolvedDeltaCount

protected int unresolvedDeltaCount

unresolvedConflictCount

protected int unresolvedConflictCount

propertyChangeSupport

protected java.beans.PropertyChangeSupport propertyChangeSupport

featureToIndexListTable

protected EntriesTable featureToIndexListTable

resourceModifier

protected ResourceModifier resourceModifier

outOfBoundsRecoveryEnable

protected boolean outOfBoundsRecoveryEnable

contributorProvider

protected IContributorProvider contributorProvider

silentMergeOptions

protected SilentMergeOptions silentMergeOptions

Constructor Detail

DeltaResolver

public DeltaResolver()

Method Detail

init

public void init(java.lang.String newResourceType,
                 com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher newMatcher,
                 org.eclipse.emf.ecore.resource.Resource newBase,
                 IContributorProvider provider,
                 java.util.List newConflicts)

Init this delta resolver with a new base and contributor resources, contributor deltas and conflicts.

Parameters:

newResourceType - type of resources

newMatcher - a matcher

newBase - base resource

provider - contributors provider

newConflicts - conflicts

setResourceModifier

public void setResourceModifier(ResourceModifier modifier)

run

public void run()

Run this delta resolver.

findConflictingResources

protected void findConflictingResources()

ignoreConflicts

protected void ignoreConflicts()

getDeltaContainer

public DeltaContainer getDeltaContainer(org.eclipse.emf.ecore.resource.Resource contributor)

apply

public void apply(Resolution resolution)

applyMorfDelta

protected org.eclipse.emf.ecore.EObject applyMorfDelta(MorphDelta delta)

Object morphing is metamodel specific - should be overridden by subclasses

Parameters:

delta -

Returns:

- object returned by the morph

unapplyMorfDelta

protected org.eclipse.emf.ecore.EObject unapplyMorfDelta(MorphDelta delta)

Object morphing is metamodel specific - should be overridden by subclasses

Parameters:

delta -

Returns:

- object returned by the morph

unapply

public void unapply(Resolution resolution)

combine

protected void combine(DeltaResolver.SilentGroup group,
                       java.util.Set<Delta> leftDeltas,
                       java.util.Set<Delta> rightDeltas)

Split deltas into groups for silent merge

Parameters:

group -

leftDeltas -

rightDeltas -

acceptAllNonconflictingDeltas

protected void acceptAllNonconflictingDeltas()

Apply all the non-conflicting deltas to the merged resource. Note: we must process the individual leafs instead of letting the composites process their own children. NOTE: This methods must work similar to 'AcceptAllNonConflicting deltas' command when invoking merge in visual mode.

accept

protected Resolution accept(Delta delta)

reject

protected Resolution reject(Delta delta)

getNonconflictingDeltas

public java.util.Set getNonconflictingDeltas(org.eclipse.emf.ecore.resource.Resource contributor)

Return all non-conflicting deltas a contributor.

resolveAllAutoResolvableConflicts

protected void resolveAllAutoResolvableConflicts()

Resolve as many conflicts as possible. The primary rule is that the deltas must be the "same". This is defined simply as acceptance of either side makes no difference to the merged model.

addObject

public void addObject(ListDelta listDelta)

addIds

protected void addIds(org.eclipse.emf.ecore.EObject eObject,
                      org.eclipse.emf.ecore.xmi.XMLResource xmlResource,
                      ListDelta listDelta)

addDestinationContainer

protected void addDestinationContainer(org.eclipse.emf.ecore.resource.Resource resource,
                                       Location destinationLocation,
                                       Delta delta)

Adds a suitable destination container in the base resource.

Parameters:

destinationLocation - destinationLocation

deleteObject

public void deleteObject(ListDelta listDelta)

deleteIds

protected void deleteIds(org.eclipse.emf.ecore.EObject eObject,
                         org.eclipse.emf.ecore.xmi.XMLResource xmlResource,
                         ListDelta listDelta)

deleteSourceContainer

protected void deleteSourceContainer(Location sourceLocation)

Delete any unnecessary source container from the base resource.

Parameters:

sourceLocation - sourceLocation

getCalculatedMergedIndex

public int getCalculatedMergedIndex(Location location,
                                    Delta inputDelta)

Return an index for a location of a delta calculated to the merged resource.

Parameters:

location - Location containing index to calculated

inputDelta - delta

Returns:

calculated index

getCalculatedBaseIndex

public int getCalculatedBaseIndex(Location location,
                                  Delta inputDelta)

Return an index for a location of a delta calculated to the base resource.

Parameters:

location - Location containing index to calculated

inputDelta - delta

Returns:

calculated index

getCalculatedContributorIndex

public int getCalculatedContributorIndex(Location location,
                                         Delta inputDelta,
                                         org.eclipse.emf.ecore.resource.Resource contributor)

Return an index for a location of a delta calculated to a contributor resource.

Parameters:

location - Location containing index to calculated

inputDelta - delta

Returns:

calculated index

getCalculatedMergedIndex

public int getCalculatedMergedIndex(ListDelta listDelta)

Return an index for a location of a delta calculated to the merged resource.

Parameters:

listDelta -

Returns:

calculated index

getCalculatedBaseIndex

public int getCalculatedBaseIndex(ListDelta listDelta)

Return an index for a location of a delta calculated to the base resource.

Parameters:

listDelta -

Returns:

calculated index

getCalculatedContributorIndex

public int getCalculatedContributorIndex(ListDelta listDelta,
                                         org.eclipse.emf.ecore.resource.Resource contributor)

Return an index for a location of a delta calculated to a contributor resource.

Parameters:

listDelta -

Returns:

calculated index

getAllDeltasWithinCollection

protected java.util.List getAllDeltasWithinCollection(Location location)

changeObject

public void changeObject(ChangeDelta changeDelta,
                         boolean isSet,
                         java.lang.Object changeValue)

addIds

protected void addIds(org.eclipse.emf.ecore.EObject value,
                      ChangeDelta changeDelta)

Add IDs for copied EObject which are used in change deltas TODO: Test in the context of logical merge

Parameters:

value -

changeDelta -

findEObjectInResource

protected org.eclipse.emf.ecore.EObject findEObjectInResource(org.eclipse.emf.ecore.xmi.XMLResource xmlResource,
                                                              java.lang.String id)

getAcceptCommand

public org.eclipse.emf.common.command.Command getAcceptCommand(Delta delta)

Returns a command that will accept a delta in the merged resource. Accepting a delta may have side-effects on the state of other deltas.

Parameters:

delta - a delta

Returns:

a command

getApplyResolutionCommand

public org.eclipse.emf.common.command.Command getApplyResolutionCommand(java.util.List<Delta> deltas,
                                                                        ResolutionType type)

getRejectCommand

public org.eclipse.emf.common.command.Command getRejectCommand(Delta delta)

Returns a command that will reject a delta in the merged resource. Rejecting a delta may have side-effects on the state of other deltas.

Parameters:

delta - a delta

Returns:

a command

getUnresolvedDeltaCount

public int getUnresolvedDeltaCount()

Returns the number of unresolved deltas

Returns:

unresolved delta count

getUnresolvedConflictCount

public int getUnresolvedConflictCount()

Returns the number of unresolved conflicts

Returns:

unresolved conflict count

addPropertyChangeListener

public void addPropertyChangeListener(java.beans.PropertyChangeListener listener)

Adds a property change listener that may be interested in Delta.RESOLVED_PROPERTY and/or Conflict.RESOLVED_PROPERTY change events. The event's source can be a Delta or a Conflict. The event's old and new values are always null, but can be queried with Delta.isResolved() and Delta.isAccepted() or Conflict.isResolved.

Parameters:

listener - a property change listener

removePropertyChangeListener

public void removePropertyChangeListener(java.beans.PropertyChangeListener listener)

Removes a property change listener.

Parameters:

listener - a property change listener

addPropertyChangeListener

public void addPropertyChangeListener(java.lang.String propertyName,
                                      java.beans.PropertyChangeListener listener)

Adds a property change listener that may be interested in Delta.RESOLVED_PROPERTY or Conflict.RESOLVED_PROPERTY change events. The event's source can be a Delta or a Conflict. The event's old and new values are always null, but can be queried with Delta.isResolved() and Delta.isAccepted() or Conflict.isResolved.

Parameters:

propertyName - a property name

listener - a property change listener

removePropertyChangeListener

public void removePropertyChangeListener(java.lang.String propertyName,
                                         java.beans.PropertyChangeListener listener)

Removes a property change listener.

Parameters:

propertyName - a property name

listener - a property change listener

propertyChange

public void propertyChange(java.beans.PropertyChangeEvent event)

Specified by:

propertyChange in interface java.beans.PropertyChangeListener

createEAnnotation

protected org.eclipse.emf.ecore.EAnnotation createEAnnotation(java.lang.String source)

findAnnotation

protected org.eclipse.emf.ecore.EAnnotation findAnnotation(EAnnotationLocation annotationLocation,
                                                           org.eclipse.emf.ecore.resource.Resource resource)

setSilentMergeOptions

public void setSilentMergeOptions(SilentMergeOptions options)