Package | Description |
---|---|
org.eclipse.emf.compare | |
org.eclipse.emf.compare.conflict | |
org.eclipse.emf.compare.impl | |
org.eclipse.emf.compare.utils |
Modifier and Type | Field and Description |
---|---|
static List<ConflictKind> |
ConflictKind.VALUES
A public read-only list of all the 'Conflict Kind' enumerators
|
Modifier and Type | Method and Description |
---|---|
static ConflictKind |
ConflictKind.get(int value)
Returns the 'Conflict Kind' literal with the specified integer value
|
static ConflictKind |
ConflictKind.get(String literal)
Returns the 'Conflict Kind' literal with the specified literal value
|
static ConflictKind |
ConflictKind.getByName(String name)
Returns the 'Conflict Kind' literal with the specified name
|
ConflictKind |
Conflict.getKind()
Returns the value of the 'Kind' attribute.
|
static ConflictKind |
ConflictKind.valueOf(String name)
Returns the enum constant of this type with the specified name.
|
static ConflictKind[] |
ConflictKind.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
Modifier and Type | Method and Description |
---|---|
void |
Conflict.setKind(ConflictKind value)
Sets the value of the '
Kind ' attribute |
Modifier and Type | Method and Description |
---|---|
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.
|
Modifier and Type | Field and Description |
---|---|
protected ConflictKind |
ConflictImpl.kind
The cached value of the '
Kind ' attribute |
protected static ConflictKind |
ConflictImpl.KIND_EDEFAULT
The default value of the '
Kind ' attribute |
Modifier and Type | Method and Description |
---|---|
ConflictKind |
CompareFactoryImpl.createConflictKindFromString(EDataType eDataType,
String initialValue) |
ConflictKind |
ConflictImpl.getKind() |
Modifier and Type | Method and Description |
---|---|
void |
ConflictImpl.setKind(ConflictKind newKind) |
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<? super Diff> |
EMFComparePredicates.hasConflict(ConflictKind... kinds)
This can be used to check whether a given Diff has a conflict of one of the given type.
|
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.