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 |
ConflictImpl
An implementation of the model object 'Conflict'
|
Modifier and Type | Field and Description |
---|---|
protected Conflict |
DiffImpl.conflict
The cached value of the ' Conflict ' reference.
|
Modifier and Type | Field and Description |
---|---|
protected EList<Conflict> |
ComparisonImpl.conflicts
The 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 |
ConflictSpec
This specialization of the
ConflictImpl class allows us to define the derived features and
operations implementations. |
Modifier and Type | Method and Description |
---|---|
protected TreeNode |
ThreeWayComparisonGroupProvider.ConflictsGroupImpl.buildSubTree(Conflict conflict)
Build sub tree for the given Conflict.
|
protected void |
ThreeWayComparisonGroupProvider.ConflictsGroupImpl.buildSubTree(TreeNode parentNode,
Conflict conflict,
Match match)
Build sub tree for the given Match.
|
protected boolean |
ThreeWayComparisonGroupProvider.ConflictsGroupImpl.isMatchOfConflictContainmentDiff(Conflict conflict,
Match subMatch)
Checks if the given match is a match of one of the containment diffs of the given Conflict.
|
Modifier and Type | Method and Description |
---|---|
T |
CompareSwitch.caseConflict(Conflict object)
Returns the result of interpreting the object as an instance of 'Conflict'
|
Copyright (c) 2006, 2014 Obeo and others. All rights reserved.