# Package org.eclipse.emf.compare.internal.conflict

package org.eclipse.emf.compare.internal.conflict

Related Packages
Package
Description
org.eclipse.emf.compare.internal
Classes
Class
Description
AbstractConflictSearch<T extends Diff>
Class in charge of finding conflicting diffs for a given diff of type T.
AttributeChangeConflictSearch
Search conflicts for `AttributeChange`s.
AttributeChangeConflictSearch.Add
Search conflicts for `AttributeChange` of kind `DifferenceKind.ADD`.
AttributeChangeConflictSearch.Change
Search conflicts for `AttributeChange` of kind `DifferenceKind.CHANGE`.
AttributeChangeConflictSearch.Delete
Search conflicts for `AttributeChange` of kind `DifferenceKind.DELETE`.
AttributeChangeConflictSearch.Move
Search conflicts for `AttributeChange` of kind `DifferenceKind.MOVE`.
ComparisonIndex
Index of diffs in a comparison.
ConflictSearchFactory
Factory for ConflictSearch classes.
ContainmentRefChangeConflictSearch
Search conflicts for containment `ReferenceChange`s.
ContainmentRefChangeConflictSearch.Add
Search conflicts for containment `ReferenceChange` of kind `DifferenceKind.ADD`.
ContainmentRefChangeConflictSearch.Change
Search conflicts for containment `ReferenceChange` of kind `DifferenceKind.CHANGE`.
ContainmentRefChangeConflictSearch.Delete
Search conflicts for containment `ReferenceChange` of kind `DifferenceKind.DELETE`.
ContainmentRefChangeConflictSearch.Move
Search conflicts for containment `ReferenceChange` of kind `DifferenceKind.MOVE`.
DiffTreeIterator
A custom iterator that will walk a Match->submatch tree, and allow iteration over the Diffs of these Matches.
FeatureMapChangeConflictSearch
Search conflicts for `FeatureMapChange`s.
FeatureMapChangeConflictSearch.Add
Search conflicts for `FeatureMapChange` of kind `DifferenceKind.ADD`.
FeatureMapChangeConflictSearch.Change
Search conflicts for `ReferenceChange` of kind `DifferenceKind.CHANGE`.
FeatureMapChangeConflictSearch.Delete
Search conflicts for `FeatureMapChange` of kind `DifferenceKind.DELETE`.
FeatureMapChangeConflictSearch.Move
Search conflicts for `FeatureMapChange` of kind `DifferenceKind.MOVE`.
NonContainmentRefChangeConflictSearch
Search conflicts for non-containment `ReferenceChange`s.
NonContainmentRefChangeConflictSearch.Add
Search conflicts for non-containment `ReferenceChange` of kind `DifferenceKind.ADD`.
NonContainmentRefChangeConflictSearch.Change
Search conflicts for non-containment `ReferenceChange` of kind `DifferenceKind.CHANGE`.
NonContainmentRefChangeConflictSearch.Delete
Search conflicts for non-containment `ReferenceChange` of kind `DifferenceKind.DELETE`.
NonContainmentRefChangeConflictSearch.Move
Search conflicts for non-containment `ReferenceChange` of kind `DifferenceKind.MOVE`.
ResourceAttachmentChangeConflictSearch
Search for `ResourceAttachmentChange` conflicts.
ResourceAttachmentChangeConflictSearch.Add
Search conflicts for `ResourceAttachmentChange` of kind `DifferenceKind.ADD`.
ResourceAttachmentChangeConflictSearch.Change
Search conflicts for `ResourceAttachmentChange` of kind `DifferenceKind.CHANGE`.
ResourceAttachmentChangeConflictSearch.Delete
Search conflicts for `ResourceAttachmentChange` of kind `DifferenceKind.DELETE`.
ResourceAttachmentChangeConflictSearch.Move
Search conflicts for `ResourceAttachmentChange` of kind `DifferenceKind.MOVE`.