Package org.eclipse.emf.compare.internal.conflict
package org.eclipse.emf.compare.internal.conflict
-
ClassesClassDescriptionAbstractConflictSearch<T extends Diff>Class in charge of finding conflicting diffs for a given diff of type T.Search conflicts for
AttributeChange
s.Search conflicts forAttributeChange
of kindDifferenceKind.ADD
.Search conflicts forAttributeChange
of kindDifferenceKind.CHANGE
.Search conflicts forAttributeChange
of kindDifferenceKind.DELETE
.Search conflicts forAttributeChange
of kindDifferenceKind.MOVE
.Index of diffs in a comparison.Factory for ConflictSearch classes.Search conflicts for containmentReferenceChange
s.Search conflicts for containmentReferenceChange
of kindDifferenceKind.ADD
.Search conflicts for containmentReferenceChange
of kindDifferenceKind.CHANGE
.Search conflicts for containmentReferenceChange
of kindDifferenceKind.DELETE
.Search conflicts for containmentReferenceChange
of kindDifferenceKind.MOVE
.A custom iterator that will walk a Match->submatch tree, and allow iteration over the Diffs of these Matches.Search conflicts forFeatureMapChange
s.Search conflicts forFeatureMapChange
of kindDifferenceKind.ADD
.Search conflicts forReferenceChange
of kindDifferenceKind.CHANGE
.Search conflicts forFeatureMapChange
of kindDifferenceKind.DELETE
.Search conflicts forFeatureMapChange
of kindDifferenceKind.MOVE
.Search conflicts for non-containmentReferenceChange
s.Search conflicts for non-containmentReferenceChange
of kindDifferenceKind.ADD
.Search conflicts for non-containmentReferenceChange
of kindDifferenceKind.CHANGE
.Search conflicts for non-containmentReferenceChange
of kindDifferenceKind.DELETE
.Search conflicts for non-containmentReferenceChange
of kindDifferenceKind.MOVE
.Search forResourceAttachmentChange
conflicts.Search conflicts forResourceAttachmentChange
of kindDifferenceKind.ADD
.Search conflicts forResourceAttachmentChange
of kindDifferenceKind.CHANGE
.Search conflicts forResourceAttachmentChange
of kindDifferenceKind.DELETE
.Search conflicts forResourceAttachmentChange
of kindDifferenceKind.MOVE
.