Uses of Interface
org.eclipse.emf.compare.Comparison
-
-
Uses of Comparison in org.eclipse.emf.compare
Methods in org.eclipse.emf.compare that return Comparison Modifier and Type Method Description Comparison
EMFCompare. compare(IComparisonScope scope)
Computes and returns a new Comparison object representation the differences between Notifier in the givescope
.Comparison
EMFCompare. compare(IComparisonScope scope, Monitor monitor)
Launches the comparison with the given scope and reporting progress to the givenmonitor
.Comparison
CompareFactory. createComparison()
Returns a new object of class 'Comparison'.Comparison
Match. getComparison()
Finds and return the Comparison containing this Match.Comparison
MatchResource. getComparison()
Returns the value of the 'Comparison' container reference.Methods in org.eclipse.emf.compare with parameters of type Comparison Modifier and Type Method Description void
MatchResource. setComparison(Comparison value)
Sets the value of the 'Comparison
' container reference. -
Uses of Comparison in org.eclipse.emf.compare.adapterfactory.context
Methods in org.eclipse.emf.compare.adapterfactory.context that return Comparison Modifier and Type Method Description protected Comparison
AbstractContextTester. getComparison(Map<Object,Object> context)
Returns the comparison stored under theIContextTester.CTX_COMPARISON
key. -
Uses of Comparison in org.eclipse.emf.compare.command.impl
Constructors in org.eclipse.emf.compare.command.impl with parameters of type Comparison Constructor Description MergeAllNonConflictingCommand(ChangeRecorder changeRecorder, Collection<Notifier> notifiers, Comparison comparison, boolean leftToRight, IMerger.Registry mergerRegistry, IMergeAllNonConflictingRunnable runnable)
Creates a new instance. -
Uses of Comparison in org.eclipse.emf.compare.conflict
Methods in org.eclipse.emf.compare.conflict with parameters of type Comparison Modifier and Type Method Description protected void
DefaultConflictDetector. checkConflict(Comparison comparison, Diff diff, Iterable<Diff> candidates)
This will be called once for each difference in the comparison model.protected void
DefaultConflictDetector. checkContainmentConflict(Comparison comparison, ReferenceChange diff, Iterable<ReferenceChange> candidates)
This will be called once for each ReferenceChange on containment references in the comparison model.protected void
DefaultConflictDetector. checkContainmentConflict(Comparison comparison, ReferenceChange diff, ReferenceChange candidate)
For each couple of diffs on the same value in which one is a containment reference change, we will call this in order to check for possible conflicts.protected void
DefaultConflictDetector. checkContainmentFeatureMapConflict(Comparison comparison, FeatureMapChange diff, Iterable<FeatureMapChange> candidates)
This will be called once for each FeatureMapChange on containment values in the comparison model.protected void
DefaultConflictDetector. checkContainmentFeatureMapConflict(Comparison comparison, FeatureMapChange diff, FeatureMapChange candidate)
For each couple of diffs on the same value in which one is a containment feature map change, we will call this in order to check for possible conflicts.protected void
DefaultConflictDetector. 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 void
DefaultConflictDetector. 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 void
DefaultConflictDetector. 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 void
DefaultConflictDetector. 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 void
DefaultConflictDetector. checkResourceAttachmentConflict(Comparison comparison, ResourceAttachmentChange diff, Iterable<Diff> candidates)
This will be called once for each ResourceAttachmentChange in the comparison model.protected void
DefaultConflictDetector. checkResourceAttachmentConflict(Comparison comparison, ResourceAttachmentChange diff, ReferenceChange candidate)
This will be called fromDefaultConflictDetector.checkResourceAttachmentConflict(Comparison, ResourceAttachmentChange, Iterable)
for each ReferenceChange in the comparison model that is on the other side and that impacts the changed root.protected void
DefaultConflictDetector. 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.void
DefaultConflictDetector. detect(Comparison comparison, Monitor monitor)
This is the entry point of the conflict detection process.void
IConflictDetector. detect(Comparison comparison, Monitor monitor)
This is the entry point of the conflict detection process.void
MatchBasedConflictDetector. detect(Comparison comparison, Monitor monitor)
This is the entry point of the conflict detection process.protected MatchResource
DefaultConflictDetector. getMatchResource(Comparison comparison, Resource resource)
Returns the MatchResource corresponding to the givenresource
. -
Uses of Comparison in org.eclipse.emf.compare.diff
Methods in org.eclipse.emf.compare.diff with parameters of type Comparison Modifier and Type Method Description void
DefaultDiffEngine. diff(Comparison comparison, Monitor monitor)
This is the entry point of the differencing process.void
IDiffEngine. diff(Comparison comparison, Monitor monitor)
This is the entry point of the differencing process.protected static com.google.common.base.Optional<Match>
DefaultDiffEngine. getMatchIfPresent(Comparison comparison, List<Object> list, int index)
This will be used in order to read the LCS synchronously with the iteration on its target lists' values.protected <E> int
DefaultDiffEngine. indexOf(Comparison comparison, List<E> list, E element)
Checks whether the givenlist
contains the givenelement
according to the semantics ofIEqualityHelper#matchingValues(Comparison, Object, Object)
and returns the index at which it is positioned if applicable. -
Uses of Comparison in org.eclipse.emf.compare.domain.impl
Methods in org.eclipse.emf.compare.domain.impl with parameters of type Comparison Modifier and Type Method Description ICompareCopyCommand
EMFCompareEditingDomain. createCopyAllNonConflictingCommand(Comparison comparison, boolean leftToRight, IMerger.Registry mergerRegistry, IMergeAllNonConflictingRunnable runnable)
Creates a command that will merge all non-conflicting differences in the given direction. -
Uses of Comparison in org.eclipse.emf.compare.equi
Methods in org.eclipse.emf.compare.equi with parameters of type Comparison Modifier and Type Method Description protected void
DefaultEquiEngine. checkForEquivalences(Comparison comparison, Diff difference)
Checks the potential equivalence from the givendifference
.protected void
DefaultEquiEngine. checkForEquivalences(Comparison comparison, FeatureMapChange featureMapChange)
Checks the potential equivalence from the givendifference
.protected void
DefaultEquiEngine. checkForEquivalences(Comparison comparison, ReferenceChange referenceChange)
Checks the potential equivalence from the givendifference
.void
DefaultEquiEngine. computeEquivalences(Comparison comparison, Monitor monitor)
This is the entry point of the equivalence computing process.void
IEquiEngine. computeEquivalences(Comparison comparison, Monitor monitor)
This is the entry point of the equivalence computing process. -
Uses of Comparison in org.eclipse.emf.compare.ide.ui.internal.configuration
Methods in org.eclipse.emf.compare.ide.ui.internal.configuration that return Comparison Modifier and Type Method Description Comparison
EMFCompareConfiguration. getComparison()
Methods in org.eclipse.emf.compare.ide.ui.internal.configuration with parameters of type Comparison Modifier and Type Method Description protected void
EMFCompareConfiguration. initStructureMergeViewerFilter(Comparison comparison, IComparisonScope comparisonScope)
protected void
EMFCompareConfiguration. initStructureMergeViewerGroupProvider(Comparison comparison, IComparisonScope comparisonScope)
void
EMFCompareConfiguration. setComparisonAndScope(Comparison newComparison, IComparisonScope newComparisonScope)
-
Uses of Comparison 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 Comparison Modifier and Type Method Description protected Comparison
DelegatingTreeMergeViewerItemContentProvider. getComparison()
Get theComparison
.Comparison
MergeViewerItemProviderConfiguration. getComparison()
Get theComparison
.Methods in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree.provider with parameters of type Comparison Modifier and Type Method Description protected IMergeViewerItem
TreeMergeViewerItemContentProvider. createMergeViewerItem(Comparison comparison, Diff diff, Object left, Object right, Object ancestor, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory)
Creates theIMergeViewerItem
from the given data.protected IMergeViewerItem
TreeMergeViewerItemContentProvider. createMergeViewerItem(Comparison comparison, Diff diff, Match match, IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory)
Creates theIMergeViewerItem
from the given data.protected boolean
TreeMergeViewerItemContentProvider. yieldsMergeViewerItem(Comparison comparison, Diff diff, Collection<?> values)
Indicates whether for the given values at least oneIMergeViewerItem
should be created.Constructors in org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree.provider with parameters of type Comparison Constructor Description DelegatingTreeMergeViewerItemContentProvider(Comparison comparison, IMergeViewerItemProviderConfiguration configuration)
Constructor.MergeViewerItemProviderConfiguration(AdapterFactory adapterFactory, IDifferenceGroupProvider groupProvider, com.google.common.base.Predicate<? super EObject> predicate, Comparison comparison, IMergeViewer.MergeViewerSide side)
Constructor. -
Uses of Comparison in org.eclipse.emf.compare.ide.ui.internal.editor
Constructors in org.eclipse.emf.compare.ide.ui.internal.editor with parameters of type Comparison Constructor Description ComparisonEditorInput(EMFCompareConfiguration configuration, Comparison comparison, ICompareEditingDomain editingDomain, AdapterFactory adapterFactory)
-
Uses of Comparison in org.eclipse.emf.compare.ide.ui.internal.mergeresolution
Methods in org.eclipse.emf.compare.ide.ui.internal.mergeresolution with parameters of type Comparison Modifier and Type Method Description void
MergeResolutionListenerRegistry. mergeResolutionCompleted(Comparison comparison)
Notifies all registered extension point clients of the completed merge resolution. -
Uses of Comparison in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer
Methods in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer that return Comparison Modifier and Type Method Description Comparison
IComparisonProvider. getComparison(org.eclipse.core.runtime.IProgressMonitor monitor)
Methods in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer with parameters of type Comparison Modifier and Type Method Description protected void
EMFCompareStructureMergeViewer. compareInputChanged(Comparison input, org.eclipse.core.runtime.IProgressMonitor monitor)
protected void
EMFCompareStructureMergeViewer. compareInputChanged(IComparisonScope scope, Comparison comparison, org.eclipse.core.runtime.IProgressMonitor monitor)
protected void
EMFCompareStructureMergeViewer. hookAdapters(org.eclipse.compare.structuremergeviewer.ICompareInput input, Comparison compareResult)
Hooks the adapters required for handling UI properly.protected ComposedAdapterFactory
EMFCompareStructureMergeViewer. initAdapterFactory(Comparison comparison)
Creates a new adapter factory based on the current compare configuration.protected void
EMFCompareStructureMergeViewer. selectFirstDiffOrDisplayLabelViewer(Comparison comparison)
Select the first difference...if there are differences, otherwise, display appropriate content viewer (no differences or no visible differences) -
Uses of Comparison in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions
Methods in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions with parameters of type Comparison Modifier and Type Method Description Iterable<Diff>
MergeNonConflictingRunnable. merge(Comparison comparison, boolean leftToRight, IMerger.Registry mergerRegistry)
Merges all non-conflicting differences from the given comparison in either direction.void
MergeAllNonConflictingAction. setComparison(Comparison comparison)
Constructors in org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions with parameters of type Comparison Constructor Description MergeAllNonConflictingAction(IEMFCompareConfiguration compareConfiguration, Comparison comparison, IMerger.Registry mergerRegistry, MergeMode mode)
Constructor. -
Uses of Comparison in org.eclipse.emf.compare.ide.ui.mergeresolution
Methods in org.eclipse.emf.compare.ide.ui.mergeresolution with parameters of type Comparison Modifier and Type Method Description void
IMergeResolutionListener. mergeResolutionCompleted(Comparison comparison)
Fired when a merge is resolved entirely (no more unresolved conflicts) and the user saves the merge result. -
Uses of Comparison in org.eclipse.emf.compare.impl
Classes in org.eclipse.emf.compare.impl that implement Comparison Modifier and Type Class Description class
ComparisonImpl
An implementation of the model object 'Comparison'.Methods in org.eclipse.emf.compare.impl that return Comparison Modifier and Type Method Description Comparison
CompareFactoryImpl. createComparison()
Comparison
MatchImpl. getComparison()
Comparison
MatchResourceImpl. getComparison()
Methods in org.eclipse.emf.compare.impl with parameters of type Comparison Modifier and Type Method Description NotificationChain
MatchResourceImpl. basicSetComparison(Comparison newComparison, NotificationChain msgs)
void
MatchResourceImpl. setComparison(Comparison newComparison)
-
Uses of Comparison in org.eclipse.emf.compare.internal.conflict
Fields in org.eclipse.emf.compare.internal.conflict declared as Comparison Modifier and Type Field Description protected Comparison
AbstractConflictSearch. comparison
The comparison that contains diff.Methods in org.eclipse.emf.compare.internal.conflict with parameters of type Comparison Modifier and Type Method Description protected FeatureFilter
AbstractConflictSearch. getFeatureFilter(Comparison comp)
Returns the feature filter attached to the given comparison if any.static ComparisonIndex
ComparisonIndex. index(Comparison comparison, Monitor monitor)
Utility method to index a comparison.Constructors in org.eclipse.emf.compare.internal.conflict with parameters of type Comparison Constructor Description ConflictSearchFactory(Comparison comparison, Monitor monitor)
Constructor. -
Uses of Comparison in org.eclipse.emf.compare.internal.domain
Methods in org.eclipse.emf.compare.internal.domain with parameters of type Comparison Modifier and Type Method Description Iterable<Diff>
IMergeAllNonConflictingRunnable. merge(Comparison comparison, boolean leftToRight, IMerger.Registry mergerRegistry)
Merges all non-conflicting differences from the given comparison in either direction. -
Uses of Comparison in org.eclipse.emf.compare.internal.postprocessor.factories
Methods in org.eclipse.emf.compare.internal.postprocessor.factories with parameters of type Comparison Modifier and Type Method Description void
AbstractChangeFactory. 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.void
IChangeFactory. 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.protected List<Diff>
AbstractChangeFactory. 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 Comparison in org.eclipse.emf.compare.internal.spec
Classes in org.eclipse.emf.compare.internal.spec that implement Comparison Modifier and Type Class Description class
ComparisonSpec
This specialization of theComparisonImpl
class allows us to define the derived features and operations implementations.Methods in org.eclipse.emf.compare.internal.spec that return Comparison Modifier and Type Method Description Comparison
MatchSpec. getComparison()
-
Uses of Comparison in org.eclipse.emf.compare.internal.utils
Methods in org.eclipse.emf.compare.internal.utils that return Comparison Modifier and Type Method Description static Comparison
ComparisonUtil. getComparison(Diff diff)
Returns the comparison associated with the given diff.static Comparison
ComparisonUtil. getComparison(EObject object)
Returns the comparison associated with the given object.Methods in org.eclipse.emf.compare.internal.utils with parameters of type Comparison Modifier and Type Method Description static <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 <E> int
DiffUtil. findInsertionIndex(Comparison comparison, Iterable<E> ignoredElements, List<E> source, List<E> target, E newElement)
This will try and determine the index at which a given element from thesource
list should be inserted in thetarget
list.static <E> int
DiffUtil. findInsertionIndex(Comparison comparison, List<E> source, List<E> target, E newElement)
This will try and determine the index at which a given element from thesource
list should be inserted in thetarget
list.static int
DiffUtil. findInsertionIndex(Comparison comparison, Diff diff, boolean rightToLeft)
This is the main entry point forDiffUtil.findInsertionIndex(Comparison, Iterable, List, List, Object)
.static <E> int
DiffUtil. findInsertionIndexForElementAt(Comparison comparison, List<E> source, List<E> target, List<E> lcs, int currentIndexInSource)
This will try and determine the index at which a given element from thesource
list should be inserted in thetarget
list.static <E> List<E>
DiffUtil. longestCommonSubsequence(Comparison comparison, Iterable<E> ignoredElements, List<E> sequence1, List<E> sequence2)
This will compute the longest common subsequence between the two given Lists, ignoring any object that is included inignoredElements
.static <E> List<E>
DiffUtil. longestCommonSubsequence(Comparison comparison, List<E> sequence1, List<E> sequence2)
This will compute the longest common subsequence between the two given Lists.static EObject
ComparisonUtil. moveElementGetExpectedContainer(Comparison comparison, FeatureMapChange diff, boolean rightToLeft)
Get the expected target container in case of a move. -
Uses of Comparison in org.eclipse.emf.compare.match
Methods in org.eclipse.emf.compare.match that return Comparison Modifier and Type Method Description Comparison
DefaultComparisonFactory. createComparison()
Returns a newComparison
.Comparison
IComparisonFactory. createComparison()
Returns a newComparison
.Comparison
DefaultMatchEngine. match(IComparisonScope scope, Monitor monitor)
This is the entry point of a Comparison process.Comparison
IMatchEngine. match(IComparisonScope scope, Monitor monitor)
This is the entry point of a Comparison process.Methods in org.eclipse.emf.compare.match with parameters of type Comparison Modifier and Type Method Description protected void
DefaultMatchEngine. match(Comparison comparison, IComparisonScope scope, Notifier left, Notifier right, Notifier origin, Monitor monitor)
This methods will delegate to the proper "match(T, T, T)" implementation according to the types ofleft
,right
andorigin
.protected void
DefaultMatchEngine. match(Comparison comparison, IComparisonScope scope, EObject left, EObject right, EObject origin, Monitor monitor)
This will query the scope for the givenEObject
s' children, then delegate to anIEObjectMatcher
to compute the Matches.protected void
DefaultMatchEngine. match(Comparison comparison, IComparisonScope scope, Resource left, Resource right, Resource origin, Monitor monitor)
This will only query the scope for the given Resources' children, then delegate to anIEObjectMatcher
to determine the EObject matches.protected void
DefaultMatchEngine. match(Comparison comparison, IComparisonScope scope, ResourceSet left, ResourceSet right, ResourceSet origin, Monitor monitor)
This will be used to match the givenResourceSet
s. -
Uses of Comparison in org.eclipse.emf.compare.match.eobject
Methods in org.eclipse.emf.compare.match.eobject with parameters of type Comparison Modifier and Type Method Description boolean
CachingDistance. areIdentic(Comparison inProgress, EObject a, EObject b)
Check that two objects are equals from the distance function point of view (distance should be 0) You should prefer this method when you just want to check objects are not equals enabling the distance to stop sooner.boolean
EditionDistance. areIdentic(Comparison inProgress, EObject a, EObject b)
Check that two objects are equals from the distance function point of view (distance should be 0) You should prefer this method when you just want to check objects are not equals enabling the distance to stop sooner.boolean
ProximityEObjectMatcher.DistanceFunction. areIdentic(Comparison inProgress, EObject a, EObject b)
Check that two objects are equals from the distance function point of view (distance should be 0) You should prefer this method when you just want to check objects are not equals enabling the distance to stop sooner.void
IdentifierEObjectMatcher. createMatches(Comparison comparison, Iterator<? extends EObject> leftEObjects, Iterator<? extends EObject> rightEObjects, Iterator<? extends EObject> originEObjects, Monitor monitor)
This will be called by the match engine to determine matches between EObjects.void
IEObjectMatcher. createMatches(Comparison comparison, Iterator<? extends EObject> leftEObjects, Iterator<? extends EObject> rightEObjects, Iterator<? extends EObject> originEObjects, Monitor monitor)
This will be called by the match engine to determine matches between EObjects.void
ProximityEObjectMatcher. createMatches(Comparison comparison, Iterator<? extends EObject> leftEObjects, Iterator<? extends EObject> rightEObjects, Iterator<? extends EObject> originEObjects, Monitor monitor)
This will be called by the match engine to determine matches between EObjects.double
CachingDistance. distance(Comparison inProgress, EObject a, EObject b)
Return the distance between two EObjects.double
EditionDistance. distance(Comparison inProgress, EObject a, EObject b)
Return the distance between two EObjects.double
ProximityEObjectMatcher.DistanceFunction. distance(Comparison inProgress, EObject a, EObject b)
Return the distance between two EObjects.protected void
IdentifierEObjectMatcher. doDelegation(Comparison comparison, List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID, List<EObject> originEObjectsNoID, Monitor monitor)
Execute matching process for the delegated IEObjectMatcher.Map<EObjectIndex.Side,EObject>
EObjectIndex. findClosests(Comparison inProgress, EObject eObj, EObjectIndex.Side side)
Return the closest EObjects found in other sides than the one given.void
URIDistance. setComparison(Comparison comparison)
Set an optional comparison used to retrieve matches already computed. -
Uses of Comparison in org.eclipse.emf.compare.match.eobject.internal
Methods in org.eclipse.emf.compare.match.eobject.internal with parameters of type Comparison Modifier and Type Method Description Map<EObjectIndex.Side,EObject>
ByTypeIndex. findClosests(Comparison inProgress, EObject obj, EObjectIndex.Side side)
Return the closest EObjects found in other sides than the one given.Map<EObjectIndex.Side,EObject>
ProximityIndex. findClosests(Comparison inProgress, EObject eObj, EObjectIndex.Side passedObjectSide)
Return the closest EObjects found in other sides than the one given. -
Uses of Comparison in org.eclipse.emf.compare.match.impl
Methods in org.eclipse.emf.compare.match.impl that return Comparison Modifier and Type Method Description Comparison
NotLoadedFragmentMatch. getComparison()
-
Uses of Comparison in org.eclipse.emf.compare.merge
Methods in org.eclipse.emf.compare.merge with parameters of type Comparison Modifier and Type Method Description protected void
ResourceAttachmentChangeMerger. deleteFormerResourceIfNecessary(Comparison comparison, Resource oldResource, boolean rightToLeft)
Deprecated.UseResourceAttachmentChangeMerger#deleteFormerResourceIfNecessary(ResourceAttachmentChange, Resource, boolean)
instead.protected void
AttributeChangeMerger. doMove(AttributeChange diff, Comparison comparison, EObject expectedContainer, Object expectedValue, boolean rightToLeft)
This will do the actual work of moving the element into its attribute.protected void
FeatureMapChangeMerger. doMove(FeatureMapChange diff, Comparison comparison, EObject expectedContainer, FeatureMap.Entry expectedValue, boolean rightToLeft)
This will do the actual work of moving the element into its attribute.protected void
ReferenceChangeMerger. doMove(ReferenceChange diff, Comparison comparison, EObject expectedContainer, EObject expectedValue, boolean rightToLeft)
This will do the actual work of moving the element into its reference.protected int
AttributeChangeMerger. 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 int
FeatureMapChangeMerger. 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 int
ReferenceChangeMerger. 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 <E> int
ResourceAttachmentChangeMerger. findInsertionIndex(Comparison comparison, List<E> source, List<E> target, E newElement)
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 EObject
ReferenceChangeMerger. findMatchIn(Comparison comparison, List<EObject> list, EObject element)
Seeks a match of the givenelement
in the given list, using the equality helper to find it.protected MatchResource
ResourceAttachmentChangeMerger. getMatchResource(Comparison comparison, Resource resource)
Returns the MatchResource corresponding to the givenresource
.Constructors in org.eclipse.emf.compare.merge with parameters of type Comparison Constructor Description ResourceChangeAdapter(Comparison comparison, IComparisonScope scope)
Constructor. -
Uses of Comparison in org.eclipse.emf.compare.postprocessor
Methods in org.eclipse.emf.compare.postprocessor with parameters of type Comparison Modifier and Type Method Description void
IPostProcessor. postComparison(Comparison comparison, Monitor monitor)
This will be called by EMF Compare in order to execute the specified behavior after a comparison, from acomparison
.void
IPostProcessor. postConflicts(Comparison comparison, Monitor monitor)
This will be called by EMF Compare in order to execute the specified behavior after the conflicts step, from acomparison
.void
IPostProcessor. postDiff(Comparison comparison, Monitor monitor)
This will be called by EMF Compare in order to execute the specified behavior after the difference step, from acomparison
.void
IPostProcessor. postEquivalences(Comparison comparison, Monitor monitor)
This will be called by EMF Compare in order to execute the specified behavior after the equivalences step, from acomparison
.void
IPostProcessor. postMatch(Comparison comparison, Monitor monitor)
This will be called by EMF Compare in order to execute the specified behavior after the match step, from acomparison
.void
IPostProcessor. postRequirements(Comparison comparison, Monitor monitor)
This will be called by EMF Compare in order to execute the specified behavior after the requirements step, from acomparison
. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor
Methods in org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor that return Comparison Modifier and Type Method Description Comparison
ICompareAccessor. getComparison()
Returns the comparison object used by this accessor. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.internal.configuration
Methods in org.eclipse.emf.compare.rcp.ui.internal.configuration that return Comparison Modifier and Type Method Description Comparison
IEMFCompareConfiguration. getComparison()
Comparison
IComparisonAndScopeChange. getNewComparison()
Comparison
IComparisonAndScopeChange. getOldComparison()
Methods in org.eclipse.emf.compare.rcp.ui.internal.configuration with parameters of type Comparison Modifier and Type Method Description void
IEMFCompareConfiguration. setComparisonAndScope(Comparison comparison, IComparisonScope comparisonScope)
-
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.internal.configuration.impl
Methods in org.eclipse.emf.compare.rcp.ui.internal.configuration.impl that return Comparison Modifier and Type Method Description Comparison
ComparisonAndScopeChange. getNewComparison()
Comparison
ComparisonAndScopeChange. getOldComparison()
Constructors in org.eclipse.emf.compare.rcp.ui.internal.configuration.impl with parameters of type Comparison Constructor Description ComparisonAndScopeChange(Comparison oldComparison, Comparison newComparison, IComparisonScope oldPredicate, IComparisonScope newScope)
-
Uses of Comparison 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 Comparison Modifier and Type Method Description Comparison
AbstractStructuralFeatureAccessor. getComparison()
Returns the comparison object used by this accessor.Comparison
MatchAccessor. getComparison()
Returns the comparison object used by this accessor.Comparison
ResourceContentsAccessorImpl. getComparison()
Returns the comparison object used by this accessor. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.customization
Methods in org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.customization with parameters of type Comparison Modifier and Type Method Description IMergeViewerItemContentProvider
ContentMergeViewerCustomizationRegistry. getBestFittingMergeViewerItemContentProvider(Comparison comparison, Object object)
Returns the best fittingIMergeViewerItemContentProvider
.IMergeViewerItemProvider
ContentMergeViewerCustomizationRegistry. getBestFittingMergeViewerItemProvider(Comparison comparison, Object object)
Returns the best fittingIMergeViewerItemProvider
. -
Uses of Comparison 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 Comparison Modifier and Type Method Description Comparison
MergeViewerItem. getComparison()
Methods in org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl with parameters of type Comparison Modifier and Type Method Description protected List<IMergeViewerItem>
MergeViewerItem. createInsertionPoints(Comparison comparison, EStructuralFeature eStructuralFeature, List<? extends IMergeViewerItem> values, List<? extends Diff> differences)
Deprecated. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.actions
Methods in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.actions with parameters of type Comparison Modifier and Type Method Description void
FilterActionMenu. updateMenu(IComparisonScope newScope, Comparison newComparison)
Create all of our filtering actions into the given menu.void
GroupActionMenu. updateMenu(IComparisonScope scope, Comparison comparison)
Create the grouping action in the given menu. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl
Methods in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl with parameters of type Comparison Modifier and Type Method Description List<IDifferenceFilter>
DifferenceFilterRegistryImpl. getFilters(IComparisonScope scope, Comparison comparison)
Returns the list ofIDifferenceFilter
contained in the registry. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl
Methods in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl that return Comparison Modifier and Type Method Description protected Comparison
BasicDifferenceGroupImpl. getComparison()
Returns the comparison object.Methods in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl with parameters of type Comparison Modifier and Type Method Description protected Collection<? extends IDifferenceGroup>
ByResourceGroupProvider. buildGroups(Comparison comparison2)
Builds the groups for this comparison.protected Collection<? extends IDifferenceGroup>
DefaultGroupProvider. buildGroups(Comparison comparison2)
Builds the groups for this comparison.protected Collection<? extends IDifferenceGroup>
KindGroupProvider. buildGroups(Comparison comparison2)
Builds the groups for this comparison.protected Collection<? extends IDifferenceGroup>
ThreeWayComparisonGroupProvider. buildGroups(Comparison comparison2)
IDifferenceGroupProvider.Descriptor
DifferenceGroupRegistryImpl. getDefaultGroupProvider(IComparisonScope scope, Comparison comparison)
Returns the default group provider.List<IDifferenceGroupProvider.Descriptor>
DifferenceGroupRegistryImpl. getGroupProviders(IComparisonScope scope, Comparison comparison)
Returns the list ofIDifferenceGroupProvider
contained in the registry.boolean
ThreeWayComparisonGroupProvider. isEnabled(IComparisonScope scope, Comparison comparison)
Returns the activation condition based on the scope and comparison objects.Constructors in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl with parameters of type Comparison Constructor Description BasicDifferenceGroupImpl(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)
.ConflictsGroupImpl(Comparison comparison, String name, ECrossReferenceAdapter crossReferenceAdapter)
Instantiates this group given the comparison.ResourceGroup(Comparison comparison, ECrossReferenceAdapter crossReferenceAdapter)
. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.match
Methods in org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.match with parameters of type Comparison Modifier and Type Method Description void
MatchOfContainmentReferenceChangeProcessor. execute(Comparison comp)
Check for the givenComparison
, ifMatch
es are related to a containment ReferenceChange. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.internal.util
Methods in org.eclipse.emf.compare.rcp.ui.internal.util with parameters of type Comparison Modifier and Type Method Description static IMergeViewerItem
ResourceUIUtil. addNewContainerForNotLoadedFragmentMatches(Collection<IMergeViewerItem> items, IMergeViewer.MergeViewerSide side, Comparison comparison, AdapterFactory adapterFactory)
Adds a new parent container to the given list of IMergeViewerItems if needed and returns it.static IMergeViewerItem
ResourceUIUtil. createItemForNotLoadedFragmentMatch(Match match, IMergeViewer.MergeViewerSide side, Comparison comparison, AdapterFactory adapterFactory)
Constructs aNotLoadedFragmentMatch
from the givenMatch
and then return theIMergeViewerItem
corresponding to this NotLoadedFragmentMatch.static Collection<Match>
ResourceUIUtil. getChildrenMatchWithNotLoadedParent(Comparison comparison, Match match, IMergeViewer.MergeViewerSide side)
Filters, from the root matches of the given comparison, those who will children matches of the given match if all fragments of the whole models involved in comparison had been loaded, for the given side of the comparison.static Resource
MergeViewerUtil. getResource(Comparison comparison, IMergeViewer.MergeViewerSide side, Diff diff)
Returns the current resource on the given side of the given comparison.static List<EObject>
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 Object
MergeViewerUtil. getValueFromResourceAttachmentChange(ResourceAttachmentChange diff, Comparison comparison, IMergeViewer.MergeViewerSide side)
static Object
MergeViewerUtil. matchingValue(Object value, Comparison comparison, List<?> in)
static Object
MergeViewerUtil. matchingValue(Object object, Comparison comparison, IMergeViewer.MergeViewerSide side)
-
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.mergeviewer.item.provider
Methods in org.eclipse.emf.compare.rcp.ui.mergeviewer.item.provider that return Comparison Modifier and Type Method Description Comparison
IMergeViewerItemProviderConfiguration. getComparison()
Get theComparison
. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.structuremergeviewer.filters
Methods in org.eclipse.emf.compare.rcp.ui.structuremergeviewer.filters with parameters of type Comparison Modifier and Type Method Description Collection<IDifferenceFilter>
IDifferenceFilter.Registry. getFilters(IComparisonScope scope, Comparison comparison)
Returns the list ofIDifferenceFilter
contained in the registry.boolean
AbstractDifferenceFilter. isEnabled(IComparisonScope scope, Comparison comparison)
Returns the activation condition based on the scope and comparison objects.boolean
IDifferenceFilter. isEnabled(IComparisonScope scope, Comparison comparison)
Returns the activation condition based on the scope and comparison objects. -
Uses of Comparison in org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups
Methods in org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups that return Comparison Modifier and Type Method Description protected Comparison
AbstractDifferenceGroupProvider. getComparison()
Methods in org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups with parameters of type Comparison Modifier and Type Method Description protected Collection<? extends IDifferenceGroup>
AbstractDifferenceGroupProvider. buildGroups(Comparison aComparison)
Builds the groups for this comparison.IDifferenceGroupProvider.Descriptor
IDifferenceGroupProvider.Descriptor.Registry. getDefaultGroupProvider(IComparisonScope scope, Comparison comparison)
Returns the default group provider.Collection<IDifferenceGroupProvider.Descriptor>
IDifferenceGroupProvider.Descriptor.Registry. getGroupProviders(IComparisonScope scope, Comparison comparison)
Returns the list ofIDifferenceGroupProvider
contained in the registry.Collection<? extends IDifferenceGroup>
AbstractDifferenceGroupProvider. getGroups(Comparison aComparison)
This will be called internally by the grouping actions in order to determine how the differences should be grouped in the structural view.Collection<? extends IDifferenceGroup>
IDifferenceGroupProvider. getGroups(Comparison comparison)
This will be called internally by the grouping actions in order to determine how the differences should be grouped in the structural view.boolean
AbstractDifferenceGroupProvider. isEnabled(IComparisonScope scope, Comparison comparison)
Returns the activation condition based on the scope and comparison objects.boolean
IDifferenceGroupProvider. isEnabled(IComparisonScope scope, Comparison comparison)
Returns the activation condition based on the scope and comparison objects. -
Uses of Comparison in org.eclipse.emf.compare.req
Methods in org.eclipse.emf.compare.req with parameters of type Comparison Modifier and Type Method Description protected void
DefaultReqEngine. checkForRequiredDifferences(Comparison comparison, Diff difference)
Checks the potential required differences from the givendifference
.void
DefaultReqEngine. computeRequirements(Comparison comparison, Monitor monitor)
This is the entry point of the requirements computing process.void
IReqEngine. computeRequirements(Comparison comparison, Monitor monitor)
This is the entry point of the requirements computing process. -
Uses of Comparison in org.eclipse.emf.compare.util
Methods in org.eclipse.emf.compare.util with parameters of type Comparison Modifier and Type Method Description T
CompareSwitch. caseComparison(Comparison object)
Returns the result of interpreting the object as an instance of 'Comparison'. -
Uses of Comparison in org.eclipse.emf.compare.utils
Methods in org.eclipse.emf.compare.utils that return Comparison Modifier and Type Method Description Comparison
EqualityHelper. getTarget()
Comparison
IEqualityHelper. getTarget()
Methods in org.eclipse.emf.compare.utils with parameters of type Comparison Modifier and Type Method Description static <E> int
DiffUtil. findInsertionIndex(Comparison comparison, Iterable<E> ignoredElements, List<E> source, List<E> target, E newElement)
Deprecated.This will try and determine the index at which a given element from thesource
list should be inserted in thetarget
list.static <E> int
DiffUtil. findInsertionIndex(Comparison comparison, List<E> source, List<E> target, E newElement)
Deprecated.This will try and determine the index at which a given element from thesource
list should be inserted in thetarget
list.static int
DiffUtil. findInsertionIndex(Comparison comparison, Diff diff, boolean rightToLeft)
Deprecated.This is the main entry point for#findInsertionIndex(Comparison, EqualityHelper, Iterable, List, List, Object)
.static EObject
MatchUtil. getContainer(Comparison comparison, Diff difference)
Get the business model object containing the givendifference
.static EObject
MatchUtil. getOriginContainer(Comparison comparison, Diff difference)
Get the business model object containing the givendifference
in the origin side.static EObject
MatchUtil. getOriginObject(Comparison comparison, EObject object)
Get the object which is the origin value from the given matchingobject
.static EObject
MatchUtil. getOriginValue(Comparison comparison, ReferenceChange difference)
From a given mono-valued reference change, get the origin value.static <E> List<E>
DiffUtil. longestCommonSubsequence(Comparison comparison, Iterable<E> ignoredElements, List<E> sequence1, List<E> sequence2)
Deprecated.This will compute the longest common subsequence between the two given Lists, ignoring any object that is included inignoredElements
.static <E> List<E>
DiffUtil. longestCommonSubsequence(Comparison comparison, List<E> sequence1, List<E> sequence2)
Deprecated.This will compute the longest common subsequence between the two given Lists.boolean
EqualityHelper. matchingValues(Comparison comparison, Object object1, Object object2)
Deprecated.static void
EMFComparePrettyPrinter. printComparison(Comparison comparison, PrintStream stream)
Prints the whole comparison on the given stream (might bestream
).static void
EMFComparePrettyPrinter. printDifferences(Comparison comparison, PrintStream stream)
Prints all differences detected for the givencomparison
on the givenstream
.static void
EMFComparePrettyPrinter. printMatch(Comparison comparison, PrintStream stream)
Prints all the Match elements contained by the givencomparison
.
-