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
AttributeChanges.Search conflicts forAttributeChangeof kindDifferenceKind.ADD.Search conflicts forAttributeChangeof kindDifferenceKind.CHANGE.Search conflicts forAttributeChangeof kindDifferenceKind.DELETE.Search conflicts forAttributeChangeof kindDifferenceKind.MOVE.Index of diffs in a comparison.Factory for ConflictSearch classes.Search conflicts for containmentReferenceChanges.Search conflicts for containmentReferenceChangeof kindDifferenceKind.ADD.Search conflicts for containmentReferenceChangeof kindDifferenceKind.CHANGE.Search conflicts for containmentReferenceChangeof kindDifferenceKind.DELETE.Search conflicts for containmentReferenceChangeof kindDifferenceKind.MOVE.A custom iterator that will walk a Match->submatch tree, and allow iteration over the Diffs of these Matches.Search conflicts forFeatureMapChanges.Search conflicts forFeatureMapChangeof kindDifferenceKind.ADD.Search conflicts forReferenceChangeof kindDifferenceKind.CHANGE.Search conflicts forFeatureMapChangeof kindDifferenceKind.DELETE.Search conflicts forFeatureMapChangeof kindDifferenceKind.MOVE.Search conflicts for non-containmentReferenceChanges.Search conflicts for non-containmentReferenceChangeof kindDifferenceKind.ADD.Search conflicts for non-containmentReferenceChangeof kindDifferenceKind.CHANGE.Search conflicts for non-containmentReferenceChangeof kindDifferenceKind.DELETE.Search conflicts for non-containmentReferenceChangeof kindDifferenceKind.MOVE.Search forResourceAttachmentChangeconflicts.Search conflicts forResourceAttachmentChangeof kindDifferenceKind.ADD.Search conflicts forResourceAttachmentChangeof kindDifferenceKind.CHANGE.Search conflicts forResourceAttachmentChangeof kindDifferenceKind.DELETE.Search conflicts forResourceAttachmentChangeof kindDifferenceKind.MOVE.