Class FeatureMapChangeConflictSearch.Add
- java.lang.Object
-
- org.eclipse.emf.compare.internal.conflict.AbstractConflictSearch<FeatureMapChange>
-
- org.eclipse.emf.compare.internal.conflict.FeatureMapChangeConflictSearch.Add
-
- Enclosing class:
- FeatureMapChangeConflictSearch
public static class FeatureMapChangeConflictSearch.Add extends AbstractConflictSearch<FeatureMapChange>
Search conflicts forFeatureMapChange
of kindDifferenceKind.ADD
.
-
-
Field Summary
-
Fields inherited from class org.eclipse.emf.compare.internal.conflict.AbstractConflictSearch
comparison, diff, index, monitor
-
-
Constructor Summary
Constructors Constructor Description Add(FeatureMapChange diff, ComparisonIndex index, Monitor monitor)
Constructor.
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description void
detectConflicts()
Detect conflicts withAbstractConflictSearch.diff
in its comparison.-
Methods inherited from class org.eclipse.emf.compare.internal.conflict.AbstractConflictSearch
areMergeableStringAttributeChanges, conflict, getChangedValue, getDiffsInSameMatch, getFeatureFilter, getMatchResource, getRelatedModelElement, getValue, isContainmentDelete, isFeatureMapChange, isFeatureMapChangeOrMergeableStringAttributeChange, isMergeable, isMergeableText, isStringAttributeChange
-
-
-
-
Constructor Detail
-
Add
public Add(FeatureMapChange diff, ComparisonIndex index, Monitor monitor)
Constructor.- Parameters:
diff
- The diff to search for conflictsindex
- Comparison index, must not be nullmonitor
- the monitor to report progress to, must not be null
-
-
Method Detail
-
detectConflicts
public void detectConflicts()
Description copied from class:AbstractConflictSearch
Detect conflicts withAbstractConflictSearch.diff
in its comparison. This will add or update conflicts indiff
's comparison.- Specified by:
detectConflicts
in classAbstractConflictSearch<FeatureMapChange>
-
-