Uses of Interface
org.eclipse.emf.compare.Diff
Packages that use Diff
Package
Description
-
Uses of Diff in org.eclipse.emf.compare
Subinterfaces of Diff in org.eclipse.emf.compareModifier and TypeInterfaceDescriptioninterfaceA representation of the model object 'Attribute Change'.interfaceA representation of the model object 'Feature Map Change'.interfaceA representation of the model object 'Reference Change'.interfaceA representation of the model object 'Resource Attachment Change'.interfaceA representation of the model object 'Resource Location Change'.Methods in org.eclipse.emf.compare that return DiffModifier and TypeMethodDescriptionCompareFactory.createDiff()Returns a new object of class 'Diff'.Diff.getPrimeRefining()Returns the value of the 'Prime Refining' reference.Methods in org.eclipse.emf.compare that return types with arguments of type DiffModifier and TypeMethodDescriptionMatch.getAllDifferences()Finds and returns all differences contained in this Match and its children, recursively.Comparison.getDifferences()Returns all differences contained by this Comparison and its children.Comparison.getDifferences(EObject element) Returns all differences that reference the given EObject (for instance, all ReferenceChanges that reference the given EObject through the "value" EReference).Conflict.getDifferences()Returns the value of the 'Differences' reference list.Equivalence.getDifferences()Returns the value of the 'Differences' reference list.Match.getDifferences()Returns the value of the 'Differences' containment reference list.Diff.getImpliedBy()Returns the value of the 'Implied By' reference list.Diff.getImplies()Returns the value of the 'Implies' reference list.Conflict.getLeftDifferences()This can be used to retrieve the list of differences that were made in the left element.Diff.getRefinedBy()Returns the value of the 'Refined By' reference list.Diff.getRefines()Returns the value of the 'Refines' reference list.Diff.getRequiredBy()Returns the value of the 'Required By' reference list.Diff.getRequires()Returns the value of the 'Requires' reference list.Conflict.getRightDifferences()This can be used to retrieve the list of differences that were made in the right element. -
Uses of Diff in org.eclipse.emf.compare.command.impl
Fields in org.eclipse.emf.compare.command.impl with type parameters of type DiffModifier and TypeFieldDescriptionAbstractCopyCommand.differencesThe list of differences we are to merge.Methods in org.eclipse.emf.compare.command.impl that return types with arguments of type DiffModifier and TypeMethodDescriptioncom.google.common.collect.Multimap<DifferenceState, Diff> AbstractCopyCommand.getChangedDiffs()Returns the state changes to any diffs that this command produced.static com.google.common.collect.Multimap<DifferenceState, Diff> AbstractCopyCommand.getChangedDiffs(ChangeDescription changeDescription, Collection<? extends Diff> relevantDiffs) Returns the state changes to any relevant diffs modified in the given change description.Method parameters in org.eclipse.emf.compare.command.impl with type arguments of type DiffModifier and TypeMethodDescriptionstatic com.google.common.collect.Multimap<DifferenceState, Diff> AbstractCopyCommand.getChangedDiffs(ChangeDescription changeDescription, Collection<? extends Diff> relevantDiffs) Returns the state changes to any relevant diffs modified in the given change description.Constructor parameters in org.eclipse.emf.compare.command.impl with type arguments of type DiffModifierConstructorDescriptionAbstractCopyCommand(ChangeRecorder changeRecorder, Collection<Notifier> notifiers, List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) Constructs an instance of this command given the list of differences that it needs to merge.CopyCommand(ChangeRecorder changeRecorder, Collection<Notifier> notifiers, List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) Deprecated.Constructs an instance of this command given the list of differences that it needs to merge.MergeCommand(ChangeRecorder changeRecorder, Collection<Notifier> notifiers, List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry, IMergeRunnable runnable) Creates a new instance. -
Uses of Diff in org.eclipse.emf.compare.conflict
Methods in org.eclipse.emf.compare.conflict with parameters of type DiffModifier and TypeMethodDescriptionprotected voidDefaultConflictDetector.checkConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called once for each difference in the comparison model.protected voidDefaultConflictDetector.checkFeatureAddConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called fromDefaultConflictDetector.checkConflict(Comparison, Diff, Iterable)in order to detect conflicts on a Diff that is of type "ADD" and which is not a containment reference change.protected voidDefaultConflictDetector.checkFeatureChangeConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called fromDefaultConflictDetector.checkConflict(Comparison, Diff, Iterable)in order to detect conflicts on a Diff that is of type "CHANGE".protected voidDefaultConflictDetector.checkFeatureDeleteConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called fromDefaultConflictDetector.checkConflict(Comparison, Diff, Iterable)in order to detect conflicts on a Diff that is of type "DELETE" and which is not a containment reference change.protected voidDefaultConflictDetector.checkFeatureMoveConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called fromDefaultConflictDetector.checkConflict(Comparison, Diff, Iterable)in order to detect conflicts on a Diff that is of type "CHANGE" or "MOVE".protected voidDefaultConflictDetector.conflictOn(Comparison comparison, Diff diff1, Diff diff2, ConflictKind kind) This will be called whenever we detect a new conflict in order to create (or update) the actual association.Method parameters in org.eclipse.emf.compare.conflict with type arguments of type DiffModifier and TypeMethodDescriptionprotected voidDefaultConflictDetector.checkConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called once for each difference in the comparison model.protected voidDefaultConflictDetector.checkFeatureAddConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called fromDefaultConflictDetector.checkConflict(Comparison, Diff, Iterable)in order to detect conflicts on a Diff that is of type "ADD" and which is not a containment reference change.protected voidDefaultConflictDetector.checkFeatureChangeConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called fromDefaultConflictDetector.checkConflict(Comparison, Diff, Iterable)in order to detect conflicts on a Diff that is of type "CHANGE".protected voidDefaultConflictDetector.checkFeatureDeleteConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called fromDefaultConflictDetector.checkConflict(Comparison, Diff, Iterable)in order to detect conflicts on a Diff that is of type "DELETE" and which is not a containment reference change.protected voidDefaultConflictDetector.checkFeatureMoveConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates) This will be called fromDefaultConflictDetector.checkConflict(Comparison, Diff, Iterable)in order to detect conflicts on a Diff that is of type "CHANGE" or "MOVE".protected voidDefaultConflictDetector.checkResourceAttachmentConflict(Comparison comparison, ResourceAttachmentChange diff, Iterable<Diff> candidates) This will be called once for each ResourceAttachmentChange in the comparison model. -
Uses of Diff in org.eclipse.emf.compare.domain
Method parameters in org.eclipse.emf.compare.domain with type arguments of type DiffModifier and TypeMethodDescriptionICompareEditingDomain.createCopyCommand(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) Deprecated.ICompareEditingDomain.createCopyCommand(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry, IMergeRunnable runnable) Creates a new command that will execute the givenIMergeRunnablethat is expected to merge the given differences in from right to left or left to right by using the mergers defined in the given merger registry.voidIMergeRunnable.merge(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) Execute the merge operation. -
Uses of Diff in org.eclipse.emf.compare.domain.impl
Method parameters in org.eclipse.emf.compare.domain.impl with type arguments of type DiffModifier and TypeMethodDescriptionEMFCompareEditingDomain.createCopyCommand(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) Creates a new command that will merge the given differences in from right to left or left to right by using the mergers defined in the given merger registry.EMFCompareEditingDomain.createCopyCommand(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry, IMergeRunnable runnable) Creates a new command that will execute the givenIMergeRunnablethat is expected to merge the given differences in from right to left or left to right by using the mergers defined in the given merger registry. -
Uses of Diff in org.eclipse.emf.compare.equi
Methods in org.eclipse.emf.compare.equi with parameters of type DiffModifier and TypeMethodDescriptionprotected voidDefaultEquiEngine.checkForEquivalences(Comparison comparison, Diff difference) Checks the potential equivalence from the givendifference. -
Uses of Diff in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer
Methods in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer that return DiffModifier and TypeMethodDescriptionprotected DiffEMFCompareContentMergeViewer.getDiffFrom(IMergeViewer viewer) Checks the element selected in the given viewer in order to determine whether it can be adapted into a Diff. -
Uses of Diff in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.text
Methods in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.text that return DiffModifier and TypeMethodDescriptionEMFCompareTextMergeViewer.EditCommand.getDiff()Returns the diff on which this command operates.Methods in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.text that return types with arguments of type DiffModifier and TypeMethodDescriptioncom.google.common.collect.Multimap<DifferenceState, Diff> EMFCompareTextMergeViewer.EditCommand.getChangedDiffs()Returns the state changes to any diffs that this command produced.Constructors in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.text with parameters of type DiffModifierConstructorDescriptionEditCommand(Diff diff, IModelUpdateStrategy modelUpdateStrategy, IMergeViewer.MergeViewerSide side, String newValue) Creates a new compound command for the givenside. -
Uses of Diff in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree.provider
Methods in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree.provider that return types with arguments of type DiffModifier and TypeMethodDescriptionTreeMergeViewerItemContentProvider.collectAndFilterDifferences(Iterable<Object> objects, IMergeViewerItemProviderConfiguration configuration) Determines the differences related to the given objects and filters them according to theTreeMergeViewerItemContentProvider.visibleContainmentDiffPredicate(IMergeViewerItemProviderConfiguration).TreeMergeViewerItemContentProvider.getVisibleContainmentDiffs(EObject object, IMergeViewerItemProviderConfiguration configuration) Determines all differences regarding the givenobjectwhich are related to a containment reference change and are visible in the viewer.protected com.google.common.base.Predicate<Diff> TreeMergeViewerItemContentProvider.visibleContainmentDiffPredicate(IMergeViewerItemProviderConfiguration configuration) Predicate for checking if the givendiffis visible and itself (or any of its 'refining' diffs) is a containment reference change.protected com.google.common.base.Predicate<Diff> TreeMergeViewerItemContentProvider.visibleInMergeViewerPredicate(com.google.common.base.Predicate<? super EObject> predicate, IDifferenceGroupProvider groupProvider) Predicate for checking if the givendiffis visible in the merge viewer.Methods in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree.provider with parameters of type DiffModifier and TypeMethodDescriptionprotected IMergeViewerItemTreeMergeViewerItemContentProvider.createMergeViewerItem(Comparison comparison, Diff diff, Object left, Object right, Object ancestor, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) Creates theIMergeViewerItemfrom the given data.protected IMergeViewerItemTreeMergeViewerItemContentProvider.createMergeViewerItem(Comparison comparison, Diff diff, Match match, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) Creates theIMergeViewerItemfrom the given data.protected ObjectTreeMergeViewerItemContentProvider.getDiffValue(Diff diff) Determines the value of the given diff.protected booleanTreeMergeViewerItemContentProvider.yieldsMergeViewerItem(Comparison comparison, Diff diff, Collection<?> values) Indicates whether for the given values at least oneIMergeViewerItemshould be created.Method parameters in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree.provider with type arguments of type DiffModifier and TypeMethodDescriptionprotected ObjectTreeMergeViewerItemContentProvider.getFirstValue(Iterable<Diff> diffs) Determines the first non-null value of the given diffs.protected booleanTreeMergeViewerItemContentProvider.yieldsInsertionPoint(IMergeViewerItem parent, Iterable<? extends Diff> diffs, IMergeViewerItemProviderConfiguration configuration) Indicates whether for the given diffs at least oneIMergeViewerIteminsertion point should be created. -
Uses of Diff in org.eclipse.emf.compare.ide.ui.internal.logical
Methods in org.eclipse.emf.compare.ide.ui.internal.logical with parameters of type DiffModifier and TypeMethodDescriptionprotected voidEMFResourceMappingMerger.doMergeForDiff(Monitor emfMonitor, Set<URI> conflictingURIs, Diff diff, IDiffRelationshipComputer relationshipComputer) Method parameters in org.eclipse.emf.compare.ide.ui.internal.logical with type arguments of type DiffModifier and TypeMethodDescriptionEMFResourceMappingMerger.collectConflictingResources(Iterator<Diff> diffIterator) Iterates over the given diffs to collect the resources they impact. -
Uses of Diff in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer
Methods in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer that return types with arguments of type DiffMethods in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer with parameters of type Diff -
Uses of Diff in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions
Methods in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions that return types with arguments of type DiffModifier and TypeMethodDescriptionAbstractMergeContainedAction.getDiffPredicate()Return a predicate that filters the {selected differencesto just those differences this action will actually operate upon.MergeContainedAction.getDiffPredicate()MergeContainedConflictingAction.getDiffPredicate()MergeContainedNonConflictingAction.getDiffPredicate()AbstractMergeContainedAction.getSelectedDifferences(org.eclipse.jface.viewers.IStructuredSelection selection) MergeAction.getSelectedDifferences()Returns the cached selected differences.MergeAction.getSelectedDifferences(Stream<Diff> diffs) MergeAction.getSelectedDifferences(org.eclipse.jface.viewers.IStructuredSelection selection) MergeAllNonConflictingAction.getSelectedDifferences(Stream<Diff> diffs) MergeAction.getStatePredicate()MergeContainedConflictingAction.getStatePredicate()MergeNonConflictingRunnable.merge(Comparison comparison, boolean leftToRight, IMerger.Registry mergerRegistry) Merges all non-conflicting differences from the given comparison in either direction.Methods in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions with parameters of type DiffModifier and TypeMethodDescriptionprotected voidMergeNonConflictingRunnable.doMergeDiffWithConflicts(boolean leftToRight, IMerger.Registry mergerRegistry, List<Diff> affectedDiffs, Monitor emfMonitor, Diff diff) protected voidAbstractMergeRunnable.markAsMerged(Diff diff, MergeMode mode, boolean mergeRightToLeft, IMerger.Registry mergerRegistry) Marks a single diff as merged, keeping track of the merge mode used for the operation.Method parameters in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions with type arguments of type DiffModifier and TypeMethodDescriptionprotected voidMergeNonConflictingRunnable.doMergeDiffWithConflicts(boolean leftToRight, IMerger.Registry mergerRegistry, List<Diff> affectedDiffs, Monitor emfMonitor, Diff diff) protected voidMergeAction.execute(ICompareCommandStack commandStack, MergeMode mode, List<Diff> diffs) protected voidMergeAllNonConflictingAction.execute(ICompareCommandStack commandStack, MergeMode mode, List<Diff> diffs) protected voidMergeAction.executeCompareCopyCommand(ICompareCommandStack commandStack, MergeMode mode, List<Diff> diffs) MergeAction.getSelectedDifferences(Stream<Diff> diffs) MergeAllNonConflictingAction.getSelectedDifferences(Stream<Diff> diffs) protected voidAbstractMergeRunnable.markAllAsMerged(Collection<? extends Diff> diffToMarkAsMerged, MergeMode mode, IMerger.Registry mergerRegistry) Marks all of the given diffs as merged, keeping track of the merged mode used for the operation.voidMergeConflictingRunnable.merge(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) Execute the merge operation.voidMergeContainedRunnable.merge(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) voidMergeNonConflictingRunnable.merge(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) Execute the merge operation.voidMergeRunnableImpl.merge(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) protected voidAbstractMergeRunnable.mergeAll(Collection<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry) Constructors in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions with parameters of type DiffModifierConstructorDescriptionRevealConflictingDiffsAction(org.eclipse.jface.viewers.StructuredViewer viewer, Diff selectedDiff, IEMFCompareConfiguration compareConfiguration) -
Uses of Diff in org.eclipse.emf.compare.impl
Classes in org.eclipse.emf.compare.impl that implement DiffModifier and TypeClassDescriptionclassAn implementation of the model object 'Attribute Change'.classAn implementation of the model object 'Diff'.classAn implementation of the model object 'Feature Map Change'.classAn implementation of the model object 'Reference Change'.classAn implementation of the model object 'Resource Attachment Change'.classAn implementation of the model object 'Resource Location Change'.Fields in org.eclipse.emf.compare.impl declared as DiffModifier and TypeFieldDescriptionprotected DiffDiffImpl.primeRefiningThe cached value of the 'Prime Refining' reference.Fields in org.eclipse.emf.compare.impl with type parameters of type DiffModifier and TypeFieldDescriptionConflictImpl.differencesThe cached value of the 'Differences' reference list.EquivalenceImpl.differencesThe cached value of the 'Differences' reference list.MatchImpl.differencesThe cached value of the 'Differences' containment reference list.DiffImpl.impliedByThe cached value of the 'Implied By' reference list.DiffImpl.impliesThe cached value of the 'Implies' reference list.DiffImpl.refinedByThe cached value of the 'Refined By' reference list.DiffImpl.refinesThe cached value of the 'Refines' reference list.DiffImpl.requiredByThe cached value of the 'Required By' reference list.DiffImpl.requiresThe cached value of the 'Requires' reference list.Methods in org.eclipse.emf.compare.impl that return DiffModifier and TypeMethodDescriptionDiffImpl.basicGetPrimeRefining()CompareFactoryImpl.createDiff()DiffImpl.getPrimeRefining()Methods in org.eclipse.emf.compare.impl that return types with arguments of type DiffModifier and TypeMethodDescriptionMatchImpl.getAllDifferences()ComparisonImpl.getDifferences()ComparisonImpl.getDifferences(EObject element) ConflictImpl.getDifferences()EquivalenceImpl.getDifferences()MatchImpl.getDifferences()DiffImpl.getImpliedBy()DiffImpl.getImplies()ConflictImpl.getLeftDifferences()DiffImpl.getRefinedBy()DiffImpl.getRefines()DiffImpl.getRequiredBy()DiffImpl.getRequires()ConflictImpl.getRightDifferences() -
Uses of Diff in org.eclipse.emf.compare.internal.conflict
Classes in org.eclipse.emf.compare.internal.conflict with type parameters of type DiffModifier and TypeClassDescriptionclassAbstractConflictSearch<T extends Diff>Class in charge of finding conflicting diffs for a given diff of type T.Fields in org.eclipse.emf.compare.internal.conflict declared as DiffModifier and TypeFieldDescriptionprotected final TAbstractConflictSearch.diffThe difference, nevernull.Methods in org.eclipse.emf.compare.internal.conflict that return DiffMethods in org.eclipse.emf.compare.internal.conflict that return types with arguments of type DiffModifier and TypeMethodDescriptionAbstractConflictSearch<? extends Diff> ConflictSearchFactory.caseFeatureMapChange(FeatureMapChange diff) AbstractConflictSearch<? extends Diff> ConflictSearchFactory.caseReferenceChange(ReferenceChange diff) AbstractConflictSearch<? extends Diff> ConflictSearchFactory.caseResourceAttachmentChange(ResourceAttachmentChange diff) AbstractConflictSearch.getDiffsInSameMatch()Get the diffs in the sameMatchas diff.Methods in org.eclipse.emf.compare.internal.conflict with parameters of type DiffModifier and TypeMethodDescriptionprotected booleanAbstractConflictSearch.areMergeableStringAttributeChanges(Diff diff1, Diff diff2) Specifies whether the two given diffs,diff1anddiff2, are bothattribute changesof String attributes and can be merged with a line-based three-way merge.protected voidAbstractConflictSearch.conflict(Diff other, ConflictKind kind) This will be called whenever we detect a new conflict in order to create (or update) the actual association.protected booleanAbstractConflictSearch.isFeatureMapChange(Diff toCheck) Specifies whether the givendiffis aFeatureMapChange.protected booleanAbstractConflictSearch.isFeatureMapChangeOrMergeableStringAttributeChange(Diff diff1, Diff diff2) Specifies whether the givendiff1anddiff2are eitherfeature map changesor mergeableattribute changesof String attributes.protected booleanAbstractConflictSearch.isStringAttributeChange(Diff toCheck) Specifies whether the givendiffis aAttributeChangeof a String attribute.Method parameters in org.eclipse.emf.compare.internal.conflict with type arguments of type Diff -
Uses of Diff in org.eclipse.emf.compare.internal.domain
Methods in org.eclipse.emf.compare.internal.domain that return types with arguments of type DiffModifier and TypeMethodDescriptionIMergeAllNonConflictingRunnable.merge(Comparison comparison, boolean leftToRight, IMerger.Registry mergerRegistry) Merges all non-conflicting differences from the given comparison in either direction. -
Uses of Diff in org.eclipse.emf.compare.internal.merge
Methods in org.eclipse.emf.compare.internal.merge with parameters of type DiffModifier and TypeMethodDescriptionMergeMode.getMergeAction(Diff difference, boolean isLeftEditable, boolean isRightEditable) Returns the required action to be done to the given difference in this mode.static MergeModeMergeMode.getMergeMode(Diff diff, boolean leftEditable, boolean rightEditable) booleanMergeMode.isLeftToRight(Diff diff, boolean isLeftEditable, boolean isRightEditable) To exactly know the way of merge (to compute consequences) we need the source of the diff. -
Uses of Diff in org.eclipse.emf.compare.internal.postprocessor.factories
Methods in org.eclipse.emf.compare.internal.postprocessor.factories that return DiffModifier and TypeMethodDescriptionabstract DiffAbstractChangeFactory.createExtension()It creates the graphical change extension.Methods in org.eclipse.emf.compare.internal.postprocessor.factories that return types with arguments of type DiffModifier and TypeMethodDescriptionAbstractChangeFactory.findCrossReferences(Comparison comparison, EObject lookup, com.google.common.base.Predicate<Diff> p) Find the differences, on the given model object, which match with the predicate.AbstractChangeFactory.getAllContainedDifferences(Diff input) Get all the add and delete changes on the objects contained in the one concerned by the given difference.AbstractChangeFactory.getExtensionKind()Returns the kind of extension that this factory has to create.IChangeFactory.getExtensionKind()Returns the kind of extension that this factory has to create.Methods in org.eclipse.emf.compare.internal.postprocessor.factories with parameters of type DiffModifier and TypeMethodDescriptionvoidAbstractChangeFactory.fillRequiredDifferences(Comparison comparison, Diff extension) Sets the required link of the difference extension created by the related factory.
It has to be called when all the extensions are created.voidIChangeFactory.fillRequiredDifferences(Comparison comparison, Diff extension) Sets the required link of the difference extension created by the related factory.
It has to be called when all the extensions are created.AbstractChangeFactory.getAllContainedDifferences(Diff input) Get all the add and delete changes on the objects contained in the one concerned by the given difference.AbstractChangeFactory.getParentMatch(Diff input) Returns the match in which the difference will be added.IChangeFactory.getParentMatch(Diff input) Returns the match in which the difference will be added.protected DifferenceKindAbstractChangeFactory.getRelatedExtensionKind(Diff input) Get theDifferenceKindof the matching diagram difference extension in relation to the given difference.booleanReturns true if this factory handles the given kind of Diff, i.e., if it can create anextension.booleanReturns true if this factory handles the given kind of Diff, i.e., if it can create anextension.abstract voidAbstractChangeFactory.setRefiningChanges(Diff extension, DifferenceKind extensionKind, Diff refiningDiff) Get the refining differences and set the given extension with them, from the given refining one.Method parameters in org.eclipse.emf.compare.internal.postprocessor.factories with type arguments of type DiffModifier and TypeMethodDescriptionAbstractChangeFactory.findCrossReferences(Comparison comparison, EObject lookup, com.google.common.base.Predicate<Diff> p) Find the differences, on the given model object, which match with the predicate. -
Uses of Diff in org.eclipse.emf.compare.internal.spec
Classes in org.eclipse.emf.compare.internal.spec that implement DiffModifier and TypeClassDescriptionclassThis specialization of theAttributeChangeImplclass allows us to define the derived features and operations implementations.classThis specialization of theDiffImplclass allows us to define the derived features and operations implementations.classThis specialization of theFeatureMapChangeImplclass allows us to define the derived features and operations implementations.classThis specialization of theReferenceChangeImplclass allows us to define the derived features and operations implementations.classThis specialization of theResourceAttachmentChangeImplclass allows us to define the derived features and operations implementations.classThis specialization of theResourceLocationChangeImplclass allows us to define the derived features and operations implementations.Methods in org.eclipse.emf.compare.internal.spec that return types with arguments of type DiffModifier and TypeMethodDescriptionMatchSpec.getAllDifferences()ComparisonSpec.getDifferences()ComparisonSpec.getDifferences(EObject element) ConflictSpec.getLeftDifferences()ConflictSpec.getRightDifferences() -
Uses of Diff in org.eclipse.emf.compare.internal.utils
Methods in org.eclipse.emf.compare.internal.utils that return types with arguments of type DiffModifier and TypeMethodDescriptionDiffUtil.getAllAtomicRefiningDiffs(Diff diff) The set of all the atomic diffs that refine the given diff or one of its refining diffs, recursively.DiffUtil.getAllRefiningDiffs(Diff diff) The set of all the diffs (atomic or not) that refine the given diff or one of its refining diffs, recursively.ComparisonUtil.getDirectSubDiffs(boolean leftToRight) When merging aDiff, returns the first level of sub diffs of this given diff, and all associated diffs (see) of these sub diffs.invalid reference
DiffUtil#getAssociatedDiffs(Iterable, boolean, Diff)ComparisonUtil.getDirectSubDiffs(boolean leftToRight) When merging aDiff, returns the first level of sub diffs of this given diff, and all associated diffs (see) of these sub diffs.invalid reference
DiffUtil#getAssociatedDiffs(Iterable, boolean, Diff)DiffUtil.getRootRefinedDiffs(Diff diff) Determines the root refined diff of a refining diff, i.e. a refined diff that is not refining another diff.ComparisonUtil.getSubDiffs(boolean leftToRight) When merging aDiff, returns the sub diffs of this given diff, and all associated diffs (see) of these sub diffs.invalid reference
DiffUtil#getAssociatedDiffs(Iterable, boolean, Diff)ComparisonUtil.getSubDiffs(boolean leftToRight) When merging aDiff, returns the sub diffs of this given diff, and all associated diffs (see) of these sub diffs.invalid reference
DiffUtil#getAssociatedDiffs(Iterable, boolean, Diff)Methods in org.eclipse.emf.compare.internal.utils with parameters of type DiffModifier and TypeMethodDescriptionstatic <E> Set<E> DiffUtil.computeIgnoredElements(Comparison comparison, IEqualityHelper equalityHelper, List<E> candidates, Diff diff, boolean rightToLeft) When computing the insertion index of an element in a list, we need to ignore all elements present in that list that feature unresolved Diffs on the same feature.static voidDeletesthe givendiff.static intDiffUtil.findInsertionIndex(Comparison comparison, Diff diff, boolean rightToLeft) This is the main entry point forDiffUtil.findInsertionIndex(Comparison, Iterable, List, List, Object).DiffUtil.getAllAtomicRefiningDiffs(Diff diff) The set of all the atomic diffs that refine the given diff or one of its refining diffs, recursively.DiffUtil.getAllRefiningDiffs(Diff diff) The set of all the diffs (atomic or not) that refine the given diff or one of its refining diffs, recursively.static ComparisonComparisonUtil.getComparison(Diff diff) Returns the comparison associated with the given diff.DiffUtil.getRootRefinedDiffs(Diff diff) Determines the root refined diff of a refining diff, i.e. a refined diff that is not refining another diff.static booleanComparisonUtil.isAddOrSetDiff(Diff difference) Checks if the given difference is either an addition or a "set" from the default value to a new reference.static booleanComparisonUtil.isDeleteOrUnsetDiff(Diff difference) Checks if the given difference is either a deletion or a "unset" to the default value.static booleanComparisonUtil.isFeatureMapContainment(Diff diff) Checks whether the given diff corresponds to a feature map containment change. -
Uses of Diff in org.eclipse.emf.compare.merge
Fields in org.eclipse.emf.compare.merge with type parameters of type DiffModifier and TypeFieldDescriptionCachingDiffRelationshipComputer.directMergeDependenciesL2RDirect merge dependencies: left to right.CachingDiffRelationshipComputer.directMergeDependenciesL2RDirect merge dependencies: left to right.CachingDiffRelationshipComputer.directMergeDependenciesR2LDirect merge dependencies: right to left.CachingDiffRelationshipComputer.directMergeDependenciesR2LDirect merge dependencies: right to left.CachingDiffRelationshipComputer.directResultingMergesL2RDirect resulting merges: left to right.CachingDiffRelationshipComputer.directResultingMergesL2RDirect resulting merges: left to right.CachingDiffRelationshipComputer.directResultingMergesR2LDirect resulting merges: right to left.CachingDiffRelationshipComputer.directResultingMergesR2LDirect resulting merges: right to left.CachingDiffRelationshipComputer.directResultingRejectionsL2RDirect resulting rejections: left to right.CachingDiffRelationshipComputer.directResultingRejectionsL2RDirect resulting rejections: left to right.CachingDiffRelationshipComputer.directResultingRejectionsR2LDirect resulting rejections: right to left.CachingDiffRelationshipComputer.directResultingRejectionsR2LDirect resulting rejections: right to left.Methods in org.eclipse.emf.compare.merge that return types with arguments of type DiffModifier and TypeMethodDescriptionCachingDiffRelationshipComputer.computeDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Computes direct merge dependencies for the given diff.CachingDiffRelationshipComputer.computeDirectResultingMerges(Diff diff, boolean mergeRightToLeft) Computes direct resulting merges for the given diff.CachingDiffRelationshipComputer.computeDirectResultingRejections(Diff diff, boolean mergeRightToLeft) Computes the direct resulting rejections.ComputeDiffsToMerge.getAllDiffsToMerge(Iterable<? extends Diff> diffs) Compute the ordered set of diffs to merge for the given diffs.ComputeDiffsToMerge.getAllDiffsToMerge(Diff diff) Compute the ordered set of diffs to merge for the given diff.DiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft) DiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft, com.google.common.base.Predicate<? super Diff> filter) IDiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft) Retrieves the set of all diffs related to the givendiffwhen merging in the given direction.IDiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft, com.google.common.base.Predicate<? super Diff> filter) Retrieves the set of all diffs related to the givendiffwhen merging in the given direction.DiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft) DiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft, com.google.common.base.Predicate<? super Diff> filter) IDiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft) Retrieves the set of all diffs that will be rejected if the givendiffis merged, either because of unresolveable conflicts or because of unreachable requirements.IDiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft, com.google.common.base.Predicate<? super Diff> filter) Retrieves the set of all diffs that will be rejected if the givendiffis merged, either because of unresolveable conflicts or because of unreachable requirements.CachingDiffRelationshipComputer.getCachedDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Returns the cached direct merge dependencies.CachingDiffRelationshipComputer.getCachedDirectResultingMerges(Diff diff, boolean mergeRightToLeft) Returns the cached direct resulting merges.CachingDiffRelationshipComputer.getCachedDirectResultingRejections(Diff diff, boolean mergeRightToLeft) Returns the cached direct resulting rejections.MergeBlockedByConflictException.getConflictingDiffs()Get the conflicting diffs.AbstractMerger.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Retrieves the set of directly required diffs needed in order to merge the current one.AdditiveConflictMerger.getDirectMergeDependencies(Diff target, boolean mergeRightToLeft) AdditiveReferenceChangeMerger.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) AdditiveResourceAttachmentChangeMerger.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) CachingDiffRelationshipComputer.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Returns the cached direct merge dependencies, if present.ConflictMerger.getDirectMergeDependencies(Diff diff, boolean rightToLeft) DiffRelationshipComputer.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) IDiffRelationshipComputer.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Retrieves the set of directly required diffs needed in order to merge the givendiff.IMerger2.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Retrieves the set of directly required diffs needed in order to merge the current one.AbstractMerger.getDirectResultingMerges(Diff target, boolean mergeRightToLeft) Returns all differences that will be merged because of our merging the giventargetdifference.AdditiveConflictMerger.getDirectResultingMerges(Diff target, boolean mergeRightToLeft) AdditiveReferenceChangeMerger.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) AdditiveResourceAttachmentChangeMerger.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) CachingDiffRelationshipComputer.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) Returns the cached direct resulting merges, if present.ConflictMerger.getDirectResultingMerges(Diff diff, boolean rightToLeft) DiffRelationshipComputer.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) IDiffRelationshipComputer.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) Returns all differences that will be merged because of our merging the givendiff.IMerger2.getDirectResultingMerges(Diff target, boolean mergeRightToLeft) Returns all differences that will be merged because of our merging the giventargetdifference.AbstractMerger.getDirectResultingRejections(Diff target, boolean rightToLeft) Returns the set of all differences that need to be rejected iftargetis merged in the given direction.CachingDiffRelationshipComputer.getDirectResultingRejections(Diff diff, boolean mergeRightToLeft) DiffRelationshipComputer.getDirectResultingRejections(Diff diff, boolean mergeRightToLeft) IDiffRelationshipComputer.getDirectResultingRejections(Diff diff, boolean mergeRightToLeft) Returns the set of all differences that need to be rejected ifdiffis merged in the given direction.IMerger2.getDirectResultingRejections(Diff target, boolean mergeRightToLeft) Returns the set of all differences that need to be rejected iftargetis merged in the given direction.AbstractMerger.getImpliedMerges(Diff target, boolean mergeRightToLeft) Returns all differences that are automatically set to the targetsstateif the given target diff is merged.AbstractMerger.getLogicallyResultingMerges(Diff diff, boolean mergeRightToLeft) Returns a set of differences that should be logically merged with the given diff.DiffRelationshipComputer.internalGetAllResultingMerges(Diff diff, boolean rightToLeft) Returns the set of all differences directly related to the given one, either as dependencies or as implications.Methods in org.eclipse.emf.compare.merge with parameters of type DiffModifier and TypeMethodDescriptionprotected voidAccept the given difference.protected voidAccept the given difference.protected voidAccept the given difference.protected voidMerge the given difference accepting it.protected voidAccept the given difference.protected voidDeprecated.protected voidCompute the ordered set of diffs for the given diff.protected voidRecursively add the required diffs, then the diff itself, to the result.voidCachingDiffRelationshipComputer.computeCache(Diff diff) Computes the cached relationships for the give diff.CachingDiffRelationshipComputer.computeDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Computes direct merge dependencies for the given diff.CachingDiffRelationshipComputer.computeDirectResultingMerges(Diff diff, boolean mergeRightToLeft) Computes direct resulting merges for the given diff.CachingDiffRelationshipComputer.computeDirectResultingRejections(Diff diff, boolean mergeRightToLeft) Computes the direct resulting rejections.protected voidExecutes a copy in the given merge direction.voidAbstractMerger.copyLeftToRight(Diff target, Monitor monitor) Executes the copy from left to right.voidConflictMerger.copyLeftToRight(Diff target, Monitor monitor) Executes the copy from left to right.voidDelegatingMerger.copyLeftToRight(Diff target, Monitor monitor) Call copyLeftToRight on the wrapped merger with the right criterion.voidIMerger.copyLeftToRight(Diff target, Monitor monitor) Executes the copy from left to right.voidPseudoConflictMerger.copyLeftToRight(Diff target, Monitor monitor) Executes the copy from left to right.voidAbstractMerger.copyRightToLeft(Diff target, Monitor monitor) Executes the copy from right to left.voidAdditiveConflictMerger.copyRightToLeft(Diff target, Monitor monitor) voidAdditiveReferenceChangeMerger.copyRightToLeft(Diff target, Monitor monitor) voidAdditiveResourceAttachmentChangeMerger.copyRightToLeft(Diff target, Monitor monitor) voidConflictMerger.copyRightToLeft(Diff target, Monitor monitor) Executes the copy from right to left.voidDelegatingMerger.copyRightToLeft(Diff target, Monitor monitor) Call copyRightToLeft on the wrapped merger with the right criterion.voidIMerger.copyRightToLeft(Diff target, Monitor monitor) Executes the copy from right to left.voidPseudoConflictMerger.copyRightToLeft(Diff target, Monitor monitor) Executes the copy from right to left.protected intAttributeChangeMerger.findInsertionIndex(Comparison comparison, Diff diff, boolean rightToLeft) This will be used by the distinct merge actions in order to find the index at which a value should be inserted in its target list.protected intFeatureMapChangeMerger.findInsertionIndex(Comparison comparison, Diff diff, boolean rightToLeft) This will be used by the distinct merge actions in order to find the index at which a value should be inserted in its target list.protected intReferenceChangeMerger.findInsertionIndex(Comparison comparison, Diff diff, boolean rightToLeft) This will be used by the distinct merge actions in order to find the index at which a value should be inserted in its target list.ComputeDiffsToMerge.getAllDiffsToMerge(Diff diff) Compute the ordered set of diffs to merge for the given diff.DiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft) DiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft, com.google.common.base.Predicate<? super Diff> filter) IDiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft) Retrieves the set of all diffs related to the givendiffwhen merging in the given direction.IDiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft, com.google.common.base.Predicate<? super Diff> filter) Retrieves the set of all diffs related to the givendiffwhen merging in the given direction.DiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft) DiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft, com.google.common.base.Predicate<? super Diff> filter) IDiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft) Retrieves the set of all diffs that will be rejected if the givendiffis merged, either because of unresolveable conflicts or because of unreachable requirements.IDiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft, com.google.common.base.Predicate<? super Diff> filter) Retrieves the set of all diffs that will be rejected if the givendiffis merged, either because of unresolveable conflicts or because of unreachable requirements.CachingDiffRelationshipComputer.getCachedDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Returns the cached direct merge dependencies.CachingDiffRelationshipComputer.getCachedDirectResultingMerges(Diff diff, boolean mergeRightToLeft) Returns the cached direct resulting merges.CachingDiffRelationshipComputer.getCachedDirectResultingRejections(Diff diff, boolean mergeRightToLeft) Returns the cached direct resulting rejections.AbstractMerger.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Retrieves the set of directly required diffs needed in order to merge the current one.AdditiveConflictMerger.getDirectMergeDependencies(Diff target, boolean mergeRightToLeft) AdditiveReferenceChangeMerger.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) AdditiveResourceAttachmentChangeMerger.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) CachingDiffRelationshipComputer.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Returns the cached direct merge dependencies, if present.ConflictMerger.getDirectMergeDependencies(Diff diff, boolean rightToLeft) DiffRelationshipComputer.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) IDiffRelationshipComputer.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Retrieves the set of directly required diffs needed in order to merge the givendiff.IMerger2.getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) Retrieves the set of directly required diffs needed in order to merge the current one.AbstractMerger.getDirectResultingMerges(Diff target, boolean mergeRightToLeft) Returns all differences that will be merged because of our merging the giventargetdifference.AdditiveConflictMerger.getDirectResultingMerges(Diff target, boolean mergeRightToLeft) AdditiveReferenceChangeMerger.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) AdditiveResourceAttachmentChangeMerger.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) CachingDiffRelationshipComputer.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) Returns the cached direct resulting merges, if present.ConflictMerger.getDirectResultingMerges(Diff diff, boolean rightToLeft) DiffRelationshipComputer.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) IDiffRelationshipComputer.getDirectResultingMerges(Diff diff, boolean mergeRightToLeft) Returns all differences that will be merged because of our merging the givendiff.IMerger2.getDirectResultingMerges(Diff target, boolean mergeRightToLeft) Returns all differences that will be merged because of our merging the giventargetdifference.AbstractMerger.getDirectResultingRejections(Diff target, boolean rightToLeft) Returns the set of all differences that need to be rejected iftargetis merged in the given direction.CachingDiffRelationshipComputer.getDirectResultingRejections(Diff diff, boolean mergeRightToLeft) DiffRelationshipComputer.getDirectResultingRejections(Diff diff, boolean mergeRightToLeft) IDiffRelationshipComputer.getDirectResultingRejections(Diff diff, boolean mergeRightToLeft) Returns the set of all differences that need to be rejected ifdiffis merged in the given direction.IMerger2.getDirectResultingRejections(Diff target, boolean mergeRightToLeft) Returns the set of all differences that need to be rejected iftargetis merged in the given direction.IMerger.Registry.getHighestRankingMerger(Diff target) Returns the merger, for the given target, owning the highest ranking.IMerger.RegistryImpl.getHighestRankingMerger(Diff target) Returns the merger, for the given target, owning the highest ranking.AbstractMerger.getImpliedMerges(Diff target, boolean mergeRightToLeft) Returns all differences that are automatically set to the targetsstateif the given target diff is merged.AbstractMerger.getLogicallyResultingMerges(Diff diff, boolean mergeRightToLeft) Returns a set of differences that should be logically merged with the given diff.Returns the best-fitting merger for the given diff according to themerger registryand themerge criterion.protected DelegatingMergerAbstractMerger.getMergerDelegate(Diff diff) Find the best merger for diff and wrap it in a delegate that will take the current merge criterion into account.static DelegatingMergerAbstractMerger.getMergerDelegate(Diff diff, IMerger.Registry2 registry, IMergeCriterion criterion) Find the best merger for diff and wrap it in a delegate that will take the given merge criterion into account.protected DelegatingMergerConflictMerger.getMergerDelegate(Diff diff) IMerger.Registry.getMergers(Diff target) Returns the list of the candidate mergers for the given difference.IMerger.RegistryImpl.getMergers(Diff target) Returns the list of the candidate mergers for the given difference.IMerger.Registry2.getMergersByRankDescending(Diff diff, IMergeCriterion criterion) Provide the merger with the highest ranking among those that: Are compatible with the given diff; Match the given non-null criterion.IMerger.RegistryImpl.getMergersByRankDescending(Diff diff, IMergeCriterion criterion) Provide the mergers sorted by rank descending.booleanbooleanIndicates whether a best-fitting merger for the given diff is available.DiffRelationshipComputer.internalGetAllResultingMerges(Diff diff, boolean rightToLeft) Returns the set of all differences directly related to the given one, either as dependencies or as implications.static booleanAbstractMerger.isAccepting(Diff diff, boolean mergeRightToLeft) Checks whether the given merge direction will result in accepting this difference based on the difference'ssource.static booleanAbstractMerger.isInTerminalState(Diff target) Returns whether the given difference is in a terminal state or not.booleanAttributeChangeMerger.isMergerFor(Diff target) Check if the merger is a good candidate to merge the given difference.booleanConflictMerger.isMergerFor(Diff target) Check if the merger is a good candidate to merge the given difference.booleanFeatureMapChangeMerger.isMergerFor(Diff target) Check if the merger is a good candidate to merge the given difference.booleanIMerger.isMergerFor(Diff target) Check if the merger is a good candidate to merge the given difference.booleanPseudoConflictMerger.isMergerFor(Diff target) Check if the merger is a good candidate to merge the given difference.booleanReferenceChangeMerger.isMergerFor(Diff target) Check if the merger is a good candidate to merge the given difference.booleanResourceAttachmentChangeMerger.isMergerFor(Diff target) Check if the merger is a good candidate to merge the given difference.booleanResourceLocationChangeMerger.isMergerFor(Diff target) Deprecated.Check if the merger is a good candidate to merge the given difference.protected voidThis can be used by mergers to merge another (required, equivalent...) difference using the right merger for that diff.protected voidReject the given difference.protected voidReject the given difference.protected voidReject the given difference.protected voidMerge the given difference rejecting it.protected voidReject the given difference.protected voidDeprecated.protected voidCachingDiffRelationshipComputer.setCachedDirectMergeDependencies(Diff diff, boolean mergeRightToLeft, Set<Diff> directMergeDependencies) Caches the given direct merge dependencies.protected voidCachingDiffRelationshipComputer.setCachedDirectResultingMerges(Diff diff, boolean mergeRightToLeft, Set<Diff> directResultingMerges) Caches the given direct resulting merges.protected voidCachingDiffRelationshipComputer.setCachedDirectResultingRejections(Diff diff, boolean mergeRightToLeft, Set<Diff> directResultingRejections) Caches the given direct resulting rejections.Method parameters in org.eclipse.emf.compare.merge with type arguments of type DiffModifier and TypeMethodDescriptionprotected voidRecursively add the required diffs, then the diff itself, to the result.protected voidComputeDiffsToMerge.addDiffs(Collection<Diff> diffs, Set<Diff> diffPath) Recursively add the given diffs to the result Set, starting by their requirements, then themselves, then their consequences, in the right order.protected voidComputeDiffsToMerge.addDiffs(Collection<Diff> diffs, Set<Diff> diffPath) Recursively add the given diffs to the result Set, starting by their requirements, then themselves, then their consequences, in the right order.voidBatchMerger.copyAllLeftToRight(Iterable<? extends Diff> differences, Monitor monitor) This will be called to copy all of the differences from the given list from the left to the right side.voidIBatchMerger.copyAllLeftToRight(Iterable<? extends Diff> differences, Monitor monitor) This will be called to copy all of the differences from the given list from the left to the right side.voidBatchMerger.copyAllRightToLeft(Iterable<? extends Diff> differences, Monitor monitor) This will be called to copy all of the differences from the given list from the right to the left side.voidIBatchMerger.copyAllRightToLeft(Iterable<? extends Diff> differences, Monitor monitor) This will be called to copy all of the differences from the given list from the right to the left side.ComputeDiffsToMerge.getAllDiffsToMerge(Iterable<? extends Diff> diffs) Compute the ordered set of diffs to merge for the given diffs.DiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft, com.google.common.base.Predicate<? super Diff> filter) IDiffRelationshipComputer.getAllResultingMerges(Diff diff, boolean rightToLeft, com.google.common.base.Predicate<? super Diff> filter) Retrieves the set of all diffs related to the givendiffwhen merging in the given direction.DiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft, com.google.common.base.Predicate<? super Diff> filter) IDiffRelationshipComputer.getAllResultingRejections(Diff diff, boolean mergeRightToLeft, com.google.common.base.Predicate<? super Diff> filter) Retrieves the set of all diffs that will be rejected if the givendiffis merged, either because of unresolveable conflicts or because of unreachable requirements.protected voidCachingDiffRelationshipComputer.setCachedDirectMergeDependencies(Diff diff, boolean mergeRightToLeft, Set<Diff> directMergeDependencies) Caches the given direct merge dependencies.protected voidCachingDiffRelationshipComputer.setCachedDirectResultingMerges(Diff diff, boolean mergeRightToLeft, Set<Diff> directResultingMerges) Caches the given direct resulting merges.protected voidCachingDiffRelationshipComputer.setCachedDirectResultingRejections(Diff diff, boolean mergeRightToLeft, Set<Diff> directResultingRejections) Caches the given direct resulting rejections.Constructor parameters in org.eclipse.emf.compare.merge with type arguments of type DiffModifierConstructorDescriptionBatchMerger(IDiffRelationshipComputer relationshipComputer, com.google.common.base.Predicate<? super Diff> filter) Constructs our batch merger provided the registry from which to retrieve the delegate mergers, and a filter if you only wish to merge specific differences.BatchMerger(IMerger.Registry registry, com.google.common.base.Predicate<? super Diff> filter) Constructs our batch merger provided the registry from which to retrieve the delegate mergers, and a filter if you only wish to merge specific differences.MergeBlockedByConflictException(Collection<Diff> conflictingDiffs) Constructor. -
Uses of Diff in org.eclipse.emf.compare.provider.spec
Methods in org.eclipse.emf.compare.provider.spec with parameters of type DiffModifier and TypeMethodDescriptionOverlayImageProvider.getComposedImage(Diff diff, Object imageToCompose) Returns a composed image with the image of the given diff the appropriate overlay. -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer
Methods in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer with parameters of type DiffModifier and TypeMethodDescriptionbooleanIModelUpdateStrategy.canUpdate(Diff diff, IMergeViewer.MergeViewerSide side) Specifies whether the value in the model can to be updated on the givenside.booleanSingleValuedAttributeModelUpdateStrategy.canUpdate(Diff diff, IMergeViewer.MergeViewerSide side) Specifies whether the value in the model can to be updated on the givenside.IModelUpdateStrategy.getModelUpdateCommand(Diff diff, Object newValue, IMergeViewer.MergeViewerSide side) Returns a command for updating the underlying model with the givennewValueon the givenside.SingleValuedAttributeModelUpdateStrategy.getModelUpdateCommand(Diff diff, Object newValue, IMergeViewer.MergeViewerSide side) Returns a command for updating the underlying model with the givennewValueon the givenside. -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl
Methods in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl that return DiffModifier and TypeMethodDescriptionprotected final DiffAbstractStructuralFeatureAccessor.getInitialDiff()Returns the initial diff associated with this accessor.Methods in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl that return types with arguments of type DiffModifier and TypeMethodDescriptionprotected com.google.common.collect.ImmutableList<Diff> AbstractStructuralFeatureAccessor.computeDifferences()Compute the differences that apply on the structural feature.protected com.google.common.collect.ImmutableList<Diff> ContainmentReferenceChangeAccessorImpl.computeDifferences()Compute the differences that apply on the structural feature.protected final com.google.common.collect.ImmutableList<Diff> AbstractStructuralFeatureAccessor.getDifferences()Returns the list of diff that apply on the structural feature.Methods in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl with parameters of type DiffModifier and TypeMethodDescriptionprotected intManyStructuralFeatureAccessorImpl.findInsertionIndex(Diff diff, boolean rightToLeft) Find the insertion index for the given diff.protected EStructuralFeatureAbstractStructuralFeatureAccessor.getAffectedFeature(Diff diff) Returns the structural feature affected by the given diff, if any.protected ObjectManyStructuralFeatureAccessorImpl.getDiffValue(Diff diff) Returns eitherReferenceChange.getValue(),AttributeChange.getValue()or aFeatureMapChange.getValue()depending on the runtime type of the give,diffor null otherwise.protected ObjectManyStructuralFeatureAccessorImpl.getValueFromDiff(Diff diff, IMergeViewer.MergeViewerSide side) Get the value of the given side associated to the given Diff.Constructors in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl with parameters of type DiffModifierConstructorDescriptionAbstractStructuralFeatureAccessor(AdapterFactory adapterFactory, Diff diff, IMergeViewer.MergeViewerSide side) Default constructor.ContainmentReferenceChangeAccessorImpl(AdapterFactory adapterFactory, Diff diff, IMergeViewer.MergeViewerSide side) .ManyStructuralFeatureAccessorImpl(AdapterFactory adapterFactory, Diff diff, IMergeViewer.MergeViewerSide side) Default constructor.MatchAccessor(AdapterFactory adapterFactory, Match match, Diff diff, IMergeViewer.MergeViewerSide side) Creates a new object wrapping the giveneObject.ResourceContentsAccessorImpl(AdapterFactory adapterFactory, Diff diff, IMergeViewer.MergeViewerSide side) Default constructor.SingleStructuralFeatureAccessorImpl(AdapterFactory adapterFactory, Diff diff, IMergeViewer.MergeViewerSide side) Default constructor. -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer
Methods in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer with parameters of type DiffModifier and TypeMethodDescriptionorg.eclipse.swt.graphics.ColorCompareColorImpl.getFillColor(Diff diff, boolean isThreeWay, boolean isIgnoreAncestor, boolean selected) Return the color of the background of the decorator of the givendiff.org.eclipse.swt.graphics.ColorCompareColorImpl.getStrokeColor(Diff diff, boolean isThreeWay, boolean isIgnoreAncestor, boolean selected) Return the color of the stroke of the decorator of the givendiff. -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.impl
Methods in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.impl that return DiffMethods in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.impl with parameters of type DiffModifier and TypeMethodDescriptionprotected org.eclipse.jface.action.IActionAbstractStructuredMergeViewer.createAction(MergeMode mode, Diff diff) Creates the action for merging the given diff via the specified mode. -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl
Methods in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl that return DiffMethods in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl that return types with arguments of type DiffModifier and TypeMethodDescriptionMergeViewerItem.filteredDiffs(Iterable<? extends Diff> unfilteredDiffs, com.google.common.base.Predicate<? super EObject> predicate, IDifferenceGroupProvider groupProvider) Deprecated.protected com.google.common.base.Predicate<Diff> MergeViewerItem.visibleInMergeViewer(com.google.common.base.Predicate<? super EObject> predicate, IDifferenceGroupProvider groupProvider) Deprecated.Method parameters in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl with type arguments of type DiffModifier and TypeMethodDescriptionMergeViewerItem.filteredDiffs(Iterable<? extends Diff> unfilteredDiffs, com.google.common.base.Predicate<? super EObject> predicate, IDifferenceGroupProvider groupProvider) Deprecated.protected booleanMergeViewerItem.yieldsInsertionPoint(Iterable<Diff> diffs) Deprecated.Constructors in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl with parameters of type DiffModifierConstructorDescriptionContainer(Comparison comparison, Diff diff, Object left, Object right, Object ancestor, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) Deprecated.Container(Comparison comparison, Diff diff, Match match, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) Deprecated.MergeViewerItem(Comparison comparison, Diff diff, Object left, Object right, Object ancestor, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) MergeViewerItem(Comparison comparison, Diff diff, Match match, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) ResourceAttachmentChangeMergeViewerItem(Comparison comparison, Diff diff, Match match, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) ResourceAttachmentChangeMergeViewerItem(Comparison comparison, Diff diff, Resource left, Resource right, Resource ancestor, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl
Fields in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl with type parameters of type DiffModifier and TypeFieldDescriptionstatic final com.google.common.base.Predicate<? super Diff> ThreeWayComparisonGroupProvider.DEFAULT_DIFF_GROUP_FILTER_PREDICATEThe default predicate used to filter differences in difference groups.protected final com.google.common.base.Predicate<? super Diff> BasicDifferenceGroupImpl.filterThe filter we'll use in order to filter the differences that are part of this group.Methods in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl that return types with arguments of type DiffModifier and TypeMethodDescriptionThreeWayComparisonGroupProvider.CompositeConflict.getDifferences()Returns an EList built by aggregating the diffs of all the aggregated conflicts.Methods in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl with parameters of type DiffModifier and TypeMethodDescriptionprotected voidBasicDifferenceGroupImpl.addDiffNode(MatchNode matchNode, Diff diff) Add the diff in the given match.protected voidThreeWayComparisonGroupProvider.ConflictsGroupImpl.addDiffNode(MatchNode matchNode, Diff diff) In the conflicts group, we want to be able to see the ResourceAttachmentChanges.protected DiffNodeBasicDifferenceGroupImpl.createDiffNode(Diff diff) Create a diff node.protected MatchBasicDifferenceGroupImpl.getTargetMatch(Diff diff) Provide the Match that should directly contain the given diff.protected booleanBasicDifferenceGroupImpl.isContainmentRefChange(Diff diff) Is it a containment reference change?protected booleanBasicDifferenceGroupImpl.mustDisplayAsDirectChildOfMatch(Diff diff) Does the given difference have to be displayed as direct child of a Match?protected booleanThreeWayComparisonGroupProvider.ConflictsGroupImpl.mustDisplayAsDirectChildOfMatch(Diff diff) In conflicts, a special case must be handled for refining diffs: If they are not part of the same conflict then they should not be in the same group as the refined diff.Constructor parameters in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl with type arguments of type DiffModifierConstructorDescriptionBasicDifferenceGroupImpl(Comparison comparison, com.google.common.base.Predicate<? super Diff> filter, String name, ECrossReferenceAdapter crossReferenceAdapter) Instantiates this group given the comparison and filter that should be used in order to determine its list of differences.BasicDifferenceGroupImpl(Comparison comparison, com.google.common.base.Predicate<? super Diff> filter, String name, org.eclipse.swt.graphics.Image image, ECrossReferenceAdapter crossReferenceAdapter) Instantiates this group given the comparison and filter that should be used in order to determine its list of differences.BasicDifferenceGroupImpl(Comparison comparison, com.google.common.base.Predicate<? super Diff> filter, ECrossReferenceAdapter crossReferenceAdapter) Instantiates this group given the comparison and filter that should be used in order to determine its list of differences.ConflictsGroupImpl(Comparison comparison, com.google.common.base.Predicate<? super Diff> filter, String name, ECrossReferenceAdapter crossReferenceAdapter) . -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.nodes
Methods in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.nodes that return DiffModifier and TypeMethodDescriptionDiffNode.getDiff()Getter for the diff represented by this TreeNode.Constructors in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.nodes with parameters of type Diff -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.internal.util
Methods in org.eclipse.emf.compare.rcp.ui.internal.util with parameters of type DiffModifier and TypeMethodDescriptionstatic EStructuralFeatureMergeViewerUtil.getAffectedFeature(Diff diff) static ObjectMergeViewerUtil.getDiffValue(Diff diff) Returns eitherReferenceChange.getValue(),AttributeChange.getValue()or aFeatureMapChange.getValue()depending on the runtime type of the givediffor null otherwise.static ResourceMergeViewerUtil.getResource(Comparison comparison, IMergeViewer.MergeViewerSide side, Diff diff) Returns the current resource on the given side of the given comparison.MergeViewerUtil.getResourceContents(Comparison comparison, IMergeViewer.MergeViewerSide side, Diff diff) Returns the contents of the current resource on the given side of the given comparison.static ObjectMergeViewerUtil.getValueFromDiff(Diff diff, IMergeViewer.MergeViewerSide side) static List<?> MergeViewerUtil.getValues(Diff diff, IMergeViewer.MergeViewerSide side) static booleanMergeViewerUtil.isMarkAsMerged(Diff diff, IMergeViewerItem item, IEMFCompareConfiguration compareConfiguration) Checks if the given diff is considered as a mark as merged diff.static booleanMergeViewerUtil.isVisibleInMergeViewer(Diff diff, IDifferenceGroupProvider groupProvider, com.google.common.base.Predicate<? super EObject> predicate) Returns true if the given diff is displayed in an group as provided by thegroupProviderand not filtered by the given filterpredicate. -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.mergeviewer
Methods in org.eclipse.emf.compare.rcp.ui.mergeviewer with parameters of type DiffModifier and TypeMethodDescriptionorg.eclipse.swt.graphics.ColorICompareColor.getFillColor(Diff diff, boolean isThreeWay, boolean isIgnoreAncestor, boolean selected) Return the color of the background of the decorator of the givendiff.org.eclipse.swt.graphics.ColorICompareColor.getStrokeColor(Diff diff, boolean isThreeWay, boolean isIgnoreAncestor, boolean selected) Return the color of the stroke of the decorator of the givendiff. -
Uses of Diff in org.eclipse.emf.compare.rcp.ui.mergeviewer.item
Methods in org.eclipse.emf.compare.rcp.ui.mergeviewer.item that return Diff -
Uses of Diff in org.eclipse.emf.compare.req
Methods in org.eclipse.emf.compare.req with parameters of type DiffModifier and TypeMethodDescriptionprotected voidDefaultReqEngine.checkForRequiredDifferences(Comparison comparison, Diff difference) Checks the potential required differences from the givendifference. -
Uses of Diff in org.eclipse.emf.compare.util
Methods in org.eclipse.emf.compare.util with parameters of type Diff -
Uses of Diff in org.eclipse.emf.compare.utils
Fields in org.eclipse.emf.compare.utils with type parameters of type DiffModifier and TypeFieldDescriptionstatic final com.google.common.base.Predicate<? super Diff> EMFComparePredicates.CONTAINMENT_REFERENCE_CHANGEDeprecated.This can be used to check whether a given diff is a containment reference change.static final com.google.common.base.Predicate<? super Diff> EMFComparePredicates.WITHOUT_CONFLICTDeprecated.This can be used to test whether a given Diff has no conflict object associated.Methods in org.eclipse.emf.compare.utils that return types with arguments of type DiffModifier and TypeMethodDescriptionstatic com.google.common.base.Predicate<? super Diff> Deprecated.This predicate can be used to check whether a given Diff represents the addition of an EObject matching the given qualified name.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.addedToAttribute(String qualifiedName, String attributeName, Object addedValue) Deprecated.This predicate can be used to check whether a given Diff represents the addition of a value in a multi-valued attribute going byattributeNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.addedToReference(String qualifiedName, String referenceName, String addedQualifiedName) Deprecated.This predicate can be used to check whether a given Diff represents the addition of a value in a multi-valued reference going byreferenceNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.addedToReference(String qualifiedName, String referenceName, String addedQualifiedName, EStructuralFeature featureDelegateForAddedName) Deprecated.This predicate can be used to check whether a given Diff represents the addition of a value in a multi-valued reference going byreferenceNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<Diff> EMFComparePredicates.allAtomicRefining(com.google.common.base.Predicate<? super Diff> predicate) Deprecated.This predicate can be used to check whether a diff has refiningDiffs AND all these refining diffs fulfill the given predicate.static com.google.common.base.Predicate<Diff> EMFComparePredicates.anyRefined(com.google.common.base.Predicate<? super Diff> predicate) Deprecated.This predicate can be used to check whether any refined diff of a given diff fulfills the given predicate.static com.google.common.base.Predicate<Diff> EMFComparePredicates.anyRefining(com.google.common.base.Predicate<? super Diff> predicate) Deprecated.This predicate can be used to check whether any refining diff of a given diff fulfills the given predicate.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.attributeValueMatch(String attributeName, Object expectedValue, boolean multiValued) Deprecated.This predicate can be used to check whether a given Diff describes an AttributeChange with the givenattributeNameand which changed value corresponds to the givenexpectedValue.static com.google.common.base.Predicate<Diff> EMFComparePredicates.canBeConsideredAsPseudoConflicting()Deprecated.This predicate can be used to test if a diff is in a pseudo conflict.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.changedAttribute(String qualifiedName, String attributeName, Object fromValue, Object toValue) Deprecated.This predicate can be used to check whether a given Diff represents the modification of a single-valued attribute going by the givenattributeNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.changedReference(String qualifiedName, String referenceName, String fromQualifiedName, String toQualifiedName) Deprecated.This predicate can be used to check whether a given Diff represents the modification of a single-valued reference going by the givenreferenceNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.containmentReferenceChange()Deprecated.MatchUtil.findAddOrDeleteContainmentDiffs(Match match) Get the potential ReferenceChanges that represent add/delete containment differences in the parent Match of the given Match.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.fromSide(DifferenceSource source) Deprecated.This can be used to check that a given Diff originates from the givensourceside.DiffUtil.getAssociatedDiffs(Diff diffRoot, Iterable<Diff> subDiffs, boolean leftToRight) Deprecated.DiffUtil.getSubDiffs(boolean leftToRight) Deprecated.When merging aDiff, returns the sub diffs of this given diff, and all associated diffs (see) of these sub diffs.invalid reference
DiffUtil#getAssociatedDiffs(Iterable, boolean, Diff)DiffUtil.getSubDiffs(boolean leftToRight) Deprecated.When merging aDiff, returns the sub diffs of this given diff, and all associated diffs (see) of these sub diffs.invalid reference
DiffUtil#getAssociatedDiffs(Iterable, boolean, Diff)static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.hasConflict(ConflictKind... kinds) Deprecated.This can be used to check whether a given Diff has a conflict of one of the given type.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.hasDirectOrIndirectConflict(ConflictKind... kinds) Deprecated.This predicate can be used to check whether a diff is in a conflict directly or indirectly.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.hasNoDirectOrIndirectConflict(ConflictKind... kinds) Deprecated.This predicate can be used to check whether a diff is not in a conflict directly or indirectly.static com.google.common.base.Predicate<Diff> EMFComparePredicates.hasSameReferenceAs(ReferenceChange diff) Deprecated.This predicate can be used to check whether a given Diff is aReferenceChangewith the same reference as thediffargument.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.hasState(DifferenceState... states) Deprecated.This can be used to check whether a given Diff is in (one of) the given state(s).static com.google.common.base.Predicate<Diff> EMFComparePredicates.isDiffOnEOppositeOf(ReferenceChange diff) Deprecated.This predicate can be used to check whether a given Diff is aReferenceChangerepresenting the eOpposite of thediffargument.static com.google.common.base.Predicate<Diff> EMFComparePredicates.isEquivalentTo(Diff diff) Deprecated.This predicate can be used to check whether a given Diff is equivalent to thediffargument.static com.google.common.base.Predicate<Diff> EMFComparePredicates.isInRealAddAddConflict()Deprecated.Indicates whether a diff is part of a real add/add conflict.static com.google.common.base.Predicate<Diff> EMFComparePredicates.isNotRefinedDirectlyConflicting(ConflictKind... kinds) Deprecated.Check whether a diff is not refined and has a direct conflict of (one of) the given type(s).static com.google.common.base.Predicate<? super Diff> Deprecated.This predicate can be used to check whether a given Diff represents the move of an EObject matching the given qualified name.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.movedInAttribute(String qualifiedName, String attributeName, Object removedValue) Deprecated.This predicate can be used to check whether a given Diff represents the moving of a value within a multi-valued attribute going byattributeNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.movedInReference(String qualifiedName, String referenceName, String removedQualifiedName) Deprecated.This predicate can be used to check whether a given Diff represents the moving of a value within a multi-valued reference going byreferenceNameon an EObject which name matchesqualifiedName.EMFCompareJavaPredicates.ofKind(DifferenceKind... kind) This predicate can be used to check whether a particular diff is of the givenkind.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.ofKind(DifferenceKind kind) Deprecated.This predicate can be used to check whether a particular diff is of the givenkind.static com.google.common.base.Predicate<Diff> EMFComparePredicates.ofKind(DifferenceKind kind1, DifferenceKind kind2) Deprecated.Accept only diffs of the given kinds.static com.google.common.base.Predicate<? super Diff> Deprecated.This can be used in order to check whether a Diff has been detected on an EObject matching the given qualified name.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.onEObject(String qualifiedName, EStructuralFeature featureDelegate) Deprecated.This can be used in order to check whether a Diff has been detected on an EObject matching the given qualified name or the qualified name under the given feature.static com.google.common.base.Predicate<? super Diff> Deprecated.This can be used in order to check that a Diff has been detected on the given EObject.EMFCompareJavaPredicates.onFeature(EStructuralFeature feature) Accept only diffs that inherit either AttributeChange, ReferenceChange, or FeatureMapChange that concern the given feature.static com.google.common.base.Predicate<? super Diff> Deprecated.This can be used to check that a given Diff correspond to either anAttributeChange, aFeatureMapChangeor aReferenceChange, and that the corresponding reference or attribute matches the givenfeatureName.static com.google.common.base.Predicate<Diff> EMFComparePredicates.onFeature(EStructuralFeature feature) Deprecated.Accept only diffs that inherit either AttributeChange, ReferenceChange, or FeatureMapChange that concern the given feature.EMFCompareJavaPredicates.possiblyConflictingWith(Diff diff) Predicate builder for diffs that can conflict with the given diff.static com.google.common.base.Predicate<Diff> EMFComparePredicates.possiblyConflictingWith(Diff diff) Deprecated.Predicate builder for diffs that can conflict with the given diff.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.referenceValueMatch(String referenceName, String qualifiedName, boolean multiValued) Deprecated.This predicate can be used to check whether a given Diff describes a ReferenceChange with the givenreferenceNameand which changed value corresponds to the givenqualifiedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.referenceValueMatch(String referenceName, String qualifiedName, boolean multiValued, EStructuralFeature featureDelegate) Deprecated.This predicate can be used to check whether a given Diff describes a ReferenceChange with the givenreferenceNameand which changed value corresponds to the givenqualifiedNameor the qualified name under the givenfeatureDelegate.static com.google.common.base.Predicate<? super Diff> Deprecated.This predicate can be used to check whether a given Diff represents the removal of an EObject matching the given qualified name.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.removedFromAttribute(String qualifiedName, String attributeName, Object removedValue) Deprecated.This predicate can be used to check whether a given Diff represents the deletion of a value from a multi-valued attribute going byattributeNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.removedFromReference(String qualifiedName, String referenceName, String removedQualifiedName) Deprecated.This predicate can be used to check whether a given Diff represents the deletion of a value from a multi-valued reference going byreferenceNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.removedFromReference(String qualifiedName, String referenceName, String removedQualifiedName, EStructuralFeature featureDelegateForRemovedName) Deprecated.This predicate can be used to check whether a given Diff represents the deletion of a value from a multi-valued reference going byreferenceNameon an EObject which name matchesqualifiedName.static com.google.common.base.Predicate<Diff> EMFComparePredicates.sameSideAs(Diff diff) Deprecated.This can be used to check that a given Diff originates from the givensourceside.static com.google.common.base.Predicate<? super Diff> Deprecated.This predicate can be used in order to check that a particular Diff describes either aReferenceChange,AttributeChangeorFeatureMapChangefor the givenexpectedValue.EMFCompareJavaPredicates.valueMatches(IEqualityHelper helper, Object value) Accept only diffs whose value matches the given value.static com.google.common.base.Predicate<Diff> EMFComparePredicates.valueMatches(IEqualityHelper helper, Object value) Deprecated.Accept only diffs whose value matches the given value.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.valueNameMatches(String expectedName) Deprecated.This can be used to check whether a given Diff describes either aReferenceChangeon an EObject which name isexpectedName.static com.google.common.base.Predicate<? super Diff> EMFComparePredicates.valueNameMatches(String expectedName, EStructuralFeature featureDelegate) Deprecated.This can be used to check whether a given Diff describes either aReferenceChangeon an EObject which name isexpectedNameor which the given feature provides theexpectedName.Methods in org.eclipse.emf.compare.utils with parameters of type DiffModifier and TypeMethodDescriptionstatic intDiffUtil.findInsertionIndex(Comparison comparison, Diff diff, boolean rightToLeft) Deprecated.This is the main entry point for.invalid reference
#findInsertionIndex(Comparison, EqualityHelper, Iterable, List, List, Object)DiffUtil.getAssociatedDiffs(Diff diffRoot, Iterable<Diff> subDiffs, boolean leftToRight) Deprecated.static EObjectMatchUtil.getContainer(Comparison comparison, Diff difference) Get the business model object containing the givendifference.static EObjectMatchUtil.getOriginContainer(Comparison comparison, Diff difference) Get the business model object containing the givendifferencein the origin side.static EStructuralFeatureMatchUtil.getStructuralFeature(Diff input) Get the structural feature of any difference.static ObjectGet the value of any difference.static com.google.common.base.Predicate<Diff> EMFComparePredicates.isEquivalentTo(Diff diff) Deprecated.This predicate can be used to check whether a given Diff is equivalent to thediffargument.EMFCompareJavaPredicates.possiblyConflictingWith(Diff diff) Predicate builder for diffs that can conflict with the given diff.static com.google.common.base.Predicate<Diff> EMFComparePredicates.possiblyConflictingWith(Diff diff) Deprecated.Predicate builder for diffs that can conflict with the given diff.static com.google.common.base.Predicate<Diff> EMFComparePredicates.sameSideAs(Diff diff) Deprecated.This can be used to check that a given Diff originates from the givensourceside.Method parameters in org.eclipse.emf.compare.utils with type arguments of type DiffModifier and TypeMethodDescriptionstatic com.google.common.base.Predicate<Diff> EMFComparePredicates.allAtomicRefining(com.google.common.base.Predicate<? super Diff> predicate) Deprecated.This predicate can be used to check whether a diff has refiningDiffs AND all these refining diffs fulfill the given predicate.static com.google.common.base.Predicate<Diff> EMFComparePredicates.anyRefined(com.google.common.base.Predicate<? super Diff> predicate) Deprecated.This predicate can be used to check whether any refined diff of a given diff fulfills the given predicate.static com.google.common.base.Predicate<Diff> EMFComparePredicates.anyRefining(com.google.common.base.Predicate<? super Diff> predicate) Deprecated.This predicate can be used to check whether any refining diff of a given diff fulfills the given predicate.DiffUtil.getAssociatedDiffs(Diff diffRoot, Iterable<Diff> subDiffs, boolean leftToRight) Deprecated.
EMFComparePredicates.CONTAINMENT_REFERENCE_CHANGE;