Modifier and Type | Method and Description |
---|---|
Comparison |
EMFCompare.compare(IComparisonScope scope)
Computes and returns a new Comparison object representation the differences between Notifier in the
give
scope . |
Comparison |
EMFCompare.compare(IComparisonScope scope,
Monitor monitor)
Launches the comparison with the given scope and reporting progress to the given
monitor . |
Comparison |
CompareFactory.createComparison()
Returns a new object of class 'Comparison'
|
Comparison |
MatchResource.getComparison()
Returns the value of the 'Comparison' container reference.
|
Comparison |
Match.getComparison()
Finds and return the Comparison containing this Match
|
Modifier and Type | Method and Description |
---|---|
void |
MatchResource.setComparison(Comparison value)
Sets the value of the '
Comparison ' container reference |
Modifier and Type | Method and Description |
---|---|
protected Comparison |
AbstractContextTester.getComparison(Map<Object,Object> context)
Returns the comparison stored under the
IContextTester.CTX_COMPARISON key. |
Constructor and Description |
---|
MergeAllNonConflictingCommand(ChangeRecorder changeRecorder,
Collection<Notifier> notifiers,
Comparison comparison,
boolean leftToRight,
IMerger.Registry mergerRegistry,
IMergeAllNonConflictingRunnable runnable)
Creates a new instance.
|
Modifier and Type | Method and 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,
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.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.checkFeatureAddConflict(Comparison comparison,
Diff diff,
Iterable<Diff> candidates)
This will be called from
DefaultConflictDetector.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 from
DefaultConflictDetector.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 from
DefaultConflictDetector.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 from
DefaultConflictDetector.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 from
DefaultConflictDetector.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 |
MatchBasedConflictDetector.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 |
DefaultConflictDetector.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 given
resource . |
Modifier and Type | Method and Description |
---|---|
protected <E> boolean |
DefaultDiffEngine.contains(Comparison comparison,
Iterable<E> iterable,
E element)
Checks whether the given
iterable contains the given element according to the semantics
of IEqualityHelper#matchingValues(Comparison, Object, Object) . |
void |
IDiffEngine.diff(Comparison comparison,
Monitor monitor)
This is the entry point of the differencing process.
|
void |
DefaultDiffEngine.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.
|
Modifier and Type | Method and 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.
|
Modifier and Type | Method and Description |
---|---|
protected void |
DefaultEquiEngine.checkForEquivalences(Comparison comparison,
Diff difference)
Checks the potential equivalence from the given
difference . |
protected void |
DefaultEquiEngine.checkForEquivalences(Comparison comparison,
FeatureMapChange featureMapChange)
Checks the potential equivalence from the given
difference . |
protected void |
DefaultEquiEngine.checkForEquivalences(Comparison comparison,
ReferenceChange referenceChange)
Checks the potential equivalence from the given
difference . |
void |
IEquiEngine.computeEquivalences(Comparison comparison,
Monitor monitor)
This is the entry point of the equivalence computing process.
|
void |
DefaultEquiEngine.computeEquivalences(Comparison comparison,
Monitor monitor)
This is the entry point of the equivalence computing process.
|
Modifier and Type | Method and Description |
---|---|
Comparison |
EMFCompareConfiguration.getComparison() |
Modifier and Type | Method and Description |
---|---|
protected void |
EMFCompareConfiguration.initStructureMergeViewerFilter(Comparison comparison,
IComparisonScope comparisonScope) |
protected void |
EMFCompareConfiguration.initStructureMergeViewerGroupProvider(Comparison comparison,
IComparisonScope comparisonScope) |
void |
EMFCompareConfiguration.setComparisonAndScope(Comparison newComparison,
IComparisonScope newComparisonScope) |
Modifier and Type | Method and Description |
---|---|
Comparison |
MergeViewerItemProviderConfiguration.getComparison()
Get the
Comparison . |
protected Comparison |
DelegatingTreeMergeViewerItemContentProvider.getComparison()
Get the
Comparison . |
Modifier and Type | Method and Description |
---|---|
protected IMergeViewerItem |
TreeMergeViewerItemContentProvider.createMergeViewerItem(Comparison comparison,
Diff diff,
Match match,
IMergeViewer.MergeViewerSide side,
AdapterFactory adapterFactory)
Creates the
IMergeViewerItem from the given data. |
protected IMergeViewerItem |
TreeMergeViewerItemContentProvider.createMergeViewerItem(Comparison comparison,
Diff diff,
Object left,
Object right,
Object ancestor,
IMergeViewer.MergeViewerSide side,
AdapterFactory adapterFactory)
Creates the
IMergeViewerItem from the given data. |
protected boolean |
TreeMergeViewerItemContentProvider.yieldsMergeViewerItem(Comparison comparison,
Diff diff,
Collection<?> values)
Indicates whether for the given values at least one
IMergeViewerItem should be created. |
Constructor and 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.
|
Constructor and Description |
---|
ComparisonEditorInput(EMFCompareConfiguration configuration,
Comparison comparison,
ICompareEditingDomain editingDomain,
AdapterFactory adapterFactory) |
Modifier and Type | Method and Description |
---|---|
void |
MergeResolutionListenerRegistry.mergeResolutionCompleted(Comparison comparison)
Notifies all registered extension point clients of the completed merge resolution.
|
Modifier and Type | Method and Description |
---|---|
protected ComposedAdapterFactory |
EMFCompareStructureMergeViewer.initAdapterFactory(Comparison comparison)
Creates a new adapter factory based on the current compare configuration.
|
Modifier and Type | Method and 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) |
Constructor and Description |
---|
MergeAllNonConflictingAction(IEMFCompareConfiguration compareConfiguration,
Comparison comparison,
IMerger.Registry mergerRegistry,
MergeMode mode)
Constructor.
|
Modifier and Type | Method and Description |
---|---|
void |
IMergeResolutionListener.mergeResolutionCompleted(Comparison comparison)
Fired when a merge is resolved entirely (no more unresolved conflicts) and the user saves the merge
result.
|
Modifier and Type | Class and Description |
---|---|
class |
ComparisonImpl
An implementation of the model object 'Comparison'.
|
Modifier and Type | Method and Description |
---|---|
Comparison |
CompareFactoryImpl.createComparison() |
Comparison |
MatchResourceImpl.getComparison() |
Comparison |
MatchImpl.getComparison() |
Modifier and Type | Method and Description |
---|---|
NotificationChain |
MatchResourceImpl.basicSetComparison(Comparison newComparison,
NotificationChain msgs) |
void |
MatchResourceImpl.setComparison(Comparison newComparison) |
Modifier and Type | Field and Description |
---|---|
protected Comparison |
AbstractConflictSearch.comparison
The comparison that contains diff.
|
Modifier and Type | Method and Description |
---|---|
static ComparisonIndex |
ComparisonIndex.index(Comparison comparison,
Monitor monitor)
Utility method to index a comparison.
|
Constructor and Description |
---|
ConflictSearchFactory(Comparison comparison,
Monitor monitor)
Constructor.
|
Modifier and Type | Method and Description |
---|---|
Iterable<Diff> |
IMergeAllNonConflictingRunnable.merge(Comparison comparison,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Merges all non-conflicting differences from the given comparison in either direction.
|
Modifier and Type | Method and Description |
---|---|
void |
IChangeFactory.fillRequiredDifferences(Comparison comparison,
Diff extension)
Sets the required link of the difference extension created by the related factory.
|
void |
AbstractChangeFactory.fillRequiredDifferences(Comparison comparison,
Diff extension)
Sets the required link of the difference extension created by the related factory.
|
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.
|
Modifier and Type | Class and Description |
---|---|
class |
ComparisonSpec
This specialization of the
ComparisonImpl class allows us to define the derived features and
operations implementations. |
Modifier and Type | Method and Description |
---|---|
Comparison |
MatchSpec.getComparison()
Finds and return the Comparison containing this Match
|
Modifier and Type | Method and 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.
|
Modifier and Type | Method and Description |
---|---|
static int |
DiffUtil.findInsertionIndex(Comparison comparison,
Diff diff,
boolean rightToLeft)
This is the main entry point for
DiffUtil.findInsertionIndex(Comparison, Iterable, List, List, Object) . |
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 the
source list should be
inserted in the target 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 the
source list should be
inserted in the target 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 in
ignoredElements . |
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.
|
Modifier and Type | Method and Description |
---|---|
Comparison |
IComparisonFactory.createComparison()
Returns a new
Comparison . |
Comparison |
DefaultComparisonFactory.createComparison()
Returns a new
Comparison . |
Comparison |
IMatchEngine.match(IComparisonScope scope,
Monitor monitor)
This is the entry point of a Comparison process.
|
Comparison |
DefaultMatchEngine.match(IComparisonScope scope,
Monitor monitor)
This is the entry point of a Comparison process.
|
Modifier and Type | Method and Description |
---|---|
protected void |
DefaultMatchEngine.match(Comparison comparison,
IComparisonScope scope,
EObject left,
EObject right,
EObject origin,
Monitor monitor)
This will query the scope for the given
EObject s' children, then delegate to an
IEObjectMatcher to compute the Matches. |
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 of
left , right and origin . |
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 an
IEObjectMatcher 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 given
ResourceSet s. |
Modifier and Type | Method and Description |
---|---|
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.
|
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 |
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.
|
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.
|
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.
|
double |
ProximityEObjectMatcher.DistanceFunction.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 |
CachingDistance.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.
|
Modifier and Type | Method and Description |
---|---|
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.
|
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.
|
Modifier and Type | Method and Description |
---|---|
Comparison |
NotLoadedFragmentMatch.getComparison()
Finds and return the Comparison containing this Match
|
Modifier and Type | Method and Description |
---|---|
protected void |
ResourceAttachmentChangeMerger.deleteFormerResourceIfNecessary(Comparison comparison,
Resource oldResource,
boolean rightToLeft)
Deprecated.
Use
ResourceAttachmentChangeMerger#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 |
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 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 |
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 <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 given
element 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 given
resource . |
Constructor and Description |
---|
ResourceChangeAdapter(Comparison comparison,
IComparisonScope scope)
Constructor.
|
Modifier and Type | Method and 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
a
comparison . |
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 a
comparison . |
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 a
comparison . |
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 a
comparison . |
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 a
comparison . |
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 a
comparison . |
Modifier and Type | Method and Description |
---|---|
Comparison |
ICompareAccessor.getComparison()
Returns the comparison object used by this accessor.
|
Modifier and Type | Method and Description |
---|---|
Comparison |
IEMFCompareConfiguration.getComparison() |
Comparison |
IComparisonAndScopeChange.getNewComparison() |
Comparison |
IComparisonAndScopeChange.getOldComparison() |
Modifier and Type | Method and Description |
---|---|
void |
IEMFCompareConfiguration.setComparisonAndScope(Comparison comparison,
IComparisonScope comparisonScope) |
Modifier and Type | Method and Description |
---|---|
Comparison |
ComparisonAndScopeChange.getNewComparison() |
Comparison |
ComparisonAndScopeChange.getOldComparison() |
Constructor and Description |
---|
ComparisonAndScopeChange(Comparison oldComparison,
Comparison newComparison,
IComparisonScope oldPredicate,
IComparisonScope newScope) |
Modifier and Type | Method and Description |
---|---|
Comparison |
ResourceContentsAccessorImpl.getComparison()
Returns the comparison object used by this accessor.
|
Comparison |
MatchAccessor.getComparison()
Returns the comparison object used by this accessor.
|
Comparison |
AbstractStructuralFeatureAccessor.getComparison()
Returns the comparison object used by this accessor.
|
Modifier and Type | Method and Description |
---|---|
IMergeViewerItemContentProvider |
ContentMergeViewerCustomizationRegistry.getBestFittingMergeViewerItemContentProvider(Comparison comparison,
Object object)
Returns the best fitting
IMergeViewerItemContentProvider . |
IMergeViewerItemProvider |
ContentMergeViewerCustomizationRegistry.getBestFittingMergeViewerItemProvider(Comparison comparison,
Object object)
Returns the best fitting
IMergeViewerItemProvider . |
Modifier and Type | Method and Description |
---|---|
Comparison |
MergeViewerItem.getComparison() |
Modifier and Type | Method and Description |
---|---|
protected List<IMergeViewerItem> |
MergeViewerItem.createInsertionPoints(Comparison comparison,
EStructuralFeature eStructuralFeature,
List<? extends IMergeViewerItem> values,
List<? extends Diff> differences)
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
void |
GroupActionMenu.updateMenu(IComparisonScope scope,
Comparison comparison)
Create the grouping action in the given menu.
|
void |
FilterActionMenu.updateMenu(IComparisonScope newScope,
Comparison newComparison)
Create all of our filtering actions into the given menu.
|
Modifier and Type | Method and Description |
---|---|
List<IDifferenceFilter> |
DifferenceFilterRegistryImpl.getFilters(IComparisonScope scope,
Comparison comparison)
Returns the list of
IDifferenceFilter contained in the registry. |
Modifier and Type | Method and Description |
---|---|
protected Comparison |
BasicDifferenceGroupImpl.getComparison()
Returns the comparison object.
|
Modifier and Type | Method and Description |
---|---|
protected Collection<? extends IDifferenceGroup> |
ThreeWayComparisonGroupProvider.buildGroups(Comparison comparison2) |
protected Collection<? extends IDifferenceGroup> |
KindGroupProvider.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> |
ByResourceGroupProvider.buildGroups(Comparison comparison2)
Builds the groups for this comparison.
|
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 of
IDifferenceGroupProvider contained in the registry. |
boolean |
ThreeWayComparisonGroupProvider.isEnabled(IComparisonScope scope,
Comparison comparison)
Returns the activation condition based on the scope and comparison objects.
|
Constructor and Description |
---|
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.
|
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.
|
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)
.
|
Modifier and Type | Method and Description |
---|---|
void |
MatchOfContainmentReferenceChangeProcessor.execute(Comparison comp)
Check for the given
Comparison , if Match es are related to a containment
ReferenceChange. |
Modifier and Type | Method and 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 a
NotLoadedFragmentMatch from the given
Match and then return the
IMergeViewerItem 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 object,
Comparison comparison,
IMergeViewer.MergeViewerSide side) |
static Object |
MergeViewerUtil.matchingValue(Object value,
Comparison comparison,
List<?> in) |
Modifier and Type | Method and Description |
---|---|
Comparison |
IMergeViewerItemProviderConfiguration.getComparison()
Get the
Comparison . |
Modifier and Type | Method and Description |
---|---|
Collection<IDifferenceFilter> |
IDifferenceFilter.Registry.getFilters(IComparisonScope scope,
Comparison comparison)
Returns the list of
IDifferenceFilter contained in the registry. |
boolean |
IDifferenceFilter.isEnabled(IComparisonScope scope,
Comparison comparison)
Returns the activation condition based on the scope and comparison objects.
|
boolean |
AbstractDifferenceFilter.isEnabled(IComparisonScope scope,
Comparison comparison)
Returns the activation condition based on the scope and comparison objects.
|
Modifier and Type | Method and Description |
---|---|
protected Comparison |
AbstractDifferenceGroupProvider.getComparison() |
Modifier and Type | Method and 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 of
IDifferenceGroupProvider contained in the registry. |
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.
|
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.
|
boolean |
IDifferenceGroupProvider.isEnabled(IComparisonScope scope,
Comparison comparison)
Returns the activation condition based on the scope and comparison objects.
|
boolean |
AbstractDifferenceGroupProvider.isEnabled(IComparisonScope scope,
Comparison comparison)
Returns the activation condition based on the scope and comparison objects.
|
Modifier and Type | Method and Description |
---|---|
protected void |
DefaultReqEngine.checkForRequiredDifferences(Comparison comparison,
Diff difference)
Checks the potential required differences from the given
difference . |
void |
IReqEngine.computeRequirements(Comparison comparison,
Monitor monitor)
This is the entry point of the requirements computing process.
|
void |
DefaultReqEngine.computeRequirements(Comparison comparison,
Monitor monitor)
This is the entry point of the requirements computing process.
|
Modifier and Type | Method and Description |
---|---|
T |
CompareSwitch.caseComparison(Comparison object)
Returns the result of interpreting the object as an instance of 'Comparison'
|
Modifier and Type | Method and Description |
---|---|
Comparison |
IEqualityHelper.getTarget() |
Comparison |
EqualityHelper.getTarget() |
Modifier and Type | Method and Description |
---|---|
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 <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 the
source list should be
inserted in the target 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 the
source list should be
inserted in the target list. |
static EObject |
MatchUtil.getContainer(Comparison comparison,
Diff difference)
Get the business model object containing the given
difference . |
static EObject |
MatchUtil.getOriginContainer(Comparison comparison,
Diff difference)
Get the business model object containing the given
difference in the origin side. |
static EObject |
MatchUtil.getOriginObject(Comparison comparison,
EObject object)
Get the object which is the origin value from the given matching
object . |
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 in
ignoredElements . |
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 be
stream ). |
static void |
EMFComparePrettyPrinter.printDifferences(Comparison comparison,
PrintStream stream)
Prints all differences detected for the given
comparison on the given stream . |
static void |
EMFComparePrettyPrinter.printMatch(Comparison comparison,
PrintStream stream)
Prints all the Match elements contained by the given
comparison . |
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.