| Modifier and Type | Method and Description | 
|---|---|
| Conflict | CompareFactory. createConflict()Returns a new object of class 'Conflict' | 
| Conflict | Diff. getConflict()Returns the value of the 'Conflict' reference. | 
| Modifier and Type | Method and Description | 
|---|---|
| EList<Conflict> | Comparison. getConflicts()Returns the value of the 'Conflicts' containment reference list. | 
| Modifier and Type | Method and Description | 
|---|---|
| void | Diff. setConflict(Conflict value)Sets the value of the ' Conflict' reference | 
| Modifier and Type | Class and Description | 
|---|---|
| class  | ConflictImplAn implementation of the model object 'Conflict' | 
| Modifier and Type | Field and Description | 
|---|---|
| protected Conflict | DiffImpl. conflictThe cached value of the ' Conflict' reference | 
| Modifier and Type | Field and Description | 
|---|---|
| protected EList<Conflict> | ComparisonImpl. conflictsThe cached value of the ' Conflicts' containment reference list. | 
| Modifier and Type | Method and Description | 
|---|---|
| Conflict | DiffImpl. basicGetConflict() | 
| Conflict | CompareFactoryImpl. createConflict() | 
| Conflict | DiffImpl. getConflict() | 
| Modifier and Type | Method and Description | 
|---|---|
| EList<Conflict> | ComparisonImpl. getConflicts() | 
| Modifier and Type | Method and Description | 
|---|---|
| NotificationChain | DiffImpl. basicSetConflict(Conflict newConflict,
                NotificationChain msgs) | 
| void | DiffImpl. setConflict(Conflict newConflict) | 
| Modifier and Type | Class and Description | 
|---|---|
| class  | ConflictSpecThis specialization of the  ConflictImplclass allows us to define the derived features and
 operations implementations. | 
| Modifier and Type | Method and Description | 
|---|---|
| ComputeDiffsToMerge | ComputeDiffsToMerge. failOnRealConflictUnless(com.google.common.base.Predicate<? super Conflict> predicate)Set the failOnConflict flag. | 
| Modifier and Type | Class and Description | 
|---|---|
| static class  | ThreeWayComparisonGroupProvider.CompositeConflict | 
| Modifier and Type | Method and Description | 
|---|---|
| Set<Conflict> | ThreeWayComparisonGroupProvider.CompositeConflict. getConflicts()Returns an unmodifiable view of the joined conflicts. | 
| Modifier and Type | Method and Description | 
|---|---|
| protected ConflictNode | BasicDifferenceGroupImpl. createConflictNode(Conflict conflict)Create a conflict node. | 
| Constructor and Description | 
|---|
| CompositeConflict(Conflict conflict)Creates a new composite conflict for the given conflict. | 
| ConflictNodeBuilder(Conflict conflict,
                   ThreeWayComparisonGroupProvider.ConflictsGroupImpl group) | 
| Modifier and Type | Method and Description | 
|---|---|
| Conflict | ConflictNode. getConflict()Getter for the conflict represented by this TreeNode. | 
| Constructor and Description | 
|---|
| ConflictNode(Conflict conflict)Constructor. | 
| Modifier and Type | Method and Description | 
|---|---|
| T | CompareSwitch. caseConflict(Conflict object)Returns the result of interpreting the object as an instance of 'Conflict' | 
| Modifier and Type | Method and Description | 
|---|---|
| static com.google.common.base.Predicate<? super Conflict> | EMFComparePredicates. containsConflictOfTypes(ConflictKind... kinds)This can be used to check whether a given Conflict is of one of the given kind. | 
| static com.google.common.base.Predicate<Conflict> | EMFComparePredicates. isAdditiveConflict()Predicate to test whether a conflict is additive or not. | 
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.