Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
INDENT |
" " |
Modifier and Type | Constant Field | Value |
---|---|---|
protected static final java.lang.String |
EMF_CONTENT_TYPE_ID |
"com.ibm.xtools.comparemerge.emf.emfContentType" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
RESOLVED_PROPERTY |
"com.ibm.xtools.comparemerge.emf.delta.Conflict.resolved" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final int |
ADD_ADD_CONFLICT |
0 |
public static final int |
ADD_CHANGE_CONFLICT |
2 |
public static final int |
ADD_DELETE_CONFLICT |
1 |
public static final int |
ADD_MOVE_CONFLICT |
3 |
public static final int |
CHANGE_CHANGE_CONFLICT |
4 |
public static final int |
CHANGE_DELETE_CONFLICT |
5 |
public static final int |
CHANGE_MOVE_CONFLICT |
6 |
public static final int |
COMPOSITE_COMPOSITE_CONFLICT |
10 |
public static final int |
DELETE_DELETE_CONFLICT |
7 |
public static final int |
JOIN_ADD_CONFLICT |
15 |
public static final int |
JOIN_DELETE_CONFLICT |
14 |
public static final int |
JOIN_JOIN_CONFLICT |
12 |
public static final int |
JOIN_MOVE_CONFLICT |
19 |
public static final int |
MORPH_ADD_CONFLICT |
23 |
public static final int |
MORPH_CHANGE_CONFLICT |
22 |
public static final int |
MORPH_DELETE_CONFLICT |
21 |
public static final int |
MORPH_MORPH_CONFLICT |
20 |
public static final int |
MOVE_DELETE_CONFLICT |
8 |
public static final int |
MOVE_MOVE_CONFLICT |
9 |
public static final int |
SEPARATION_ADD_CONFLICT |
16 |
public static final int |
SEPARATION_DELETE_CONFLICT |
13 |
public static final int |
SEPARATION_JOIN_CONFLICT |
17 |
public static final int |
SEPARATION_MOVE_CONFLICT |
18 |
public static final int |
SEPARATION_SEPARATION_CONFLICT |
11 |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
RESOLUTION_PROPERTY |
"com.ibm.xtools.comparemerge.emf.delta.Delta.resolution" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final int |
ADD_DELTA |
4 |
public static final int |
ADD_DELTA__CHANGE_DELTA |
2 |
public static final int |
ADD_DELTA__CONFLICTS |
0 |
public static final int |
ADD_DELTA__MOVE |
1 |
public static final int |
ADD_DELTA_FEATURE_COUNT |
3 |
public static final int |
CHANGE_DELTA |
7 |
public static final int |
CHANGE_DELTA__CONFLICTS |
0 |
public static final int |
CHANGE_DELTA__LIST_DELTAS |
3 |
public static final int |
CHANGE_DELTA__NEW_SET |
2 |
public static final int |
CHANGE_DELTA__OLD_SET |
1 |
public static final int |
CHANGE_DELTA_FEATURE_COUNT |
4 |
public static final int |
COMPOSITE_DELTA |
8 |
public static final int |
COMPOSITE_DELTA__CONFLICTS |
0 |
public static final int |
COMPOSITE_DELTA_FEATURE_COUNT |
1 |
public static final int |
CONFLICT |
3 |
public static final int |
CONFLICT__DELTAS |
0 |
public static final int |
CONFLICT_FEATURE_COUNT |
1 |
public static final int |
CROSS_RESOURCE_EOBJECT_LOCATION |
16 |
public static final int |
CROSS_RESOURCE_EOBJECT_LOCATION_FEATURE_COUNT |
0 |
public static final int |
DELETE_DELTA |
5 |
public static final int |
DELETE_DELTA__CHANGE_DELTA |
2 |
public static final int |
DELETE_DELTA__CONFLICTS |
0 |
public static final int |
DELETE_DELTA__MOVE |
1 |
public static final int |
DELETE_DELTA_FEATURE_COUNT |
3 |
public static final int |
DELTA |
1 |
public static final int |
DELTA__CONFLICTS |
0 |
public static final int |
DELTA_CONTAINER |
0 |
public static final int |
DELTA_CONTAINER_FEATURE_COUNT |
0 |
public static final int |
DELTA_FEATURE_COUNT |
1 |
public static final int |
EANNOTATION_LOCATION |
9 |
public static final int |
EANNOTATION_LOCATION_FEATURE_COUNT |
0 |
public static final java.lang.String |
eNAME |
"delta" |
public static final java.lang.String |
eNS_PREFIX |
"com.ibm.xtools.comparemerge.emf.delta" |
public static final java.lang.String |
eNS_URI |
"http://com/ibm/xtools/comparemerge/emf/delta.ecore" |
public static final int |
EOBJECT_LOCATION |
12 |
public static final int |
EOBJECT_LOCATION_FEATURE_COUNT |
0 |
public static final int |
JOIN_DELTA |
15 |
public static final int |
JOIN_DELTA__CHANGE_DELTA |
2 |
public static final int |
JOIN_DELTA__CONFLICTS |
0 |
public static final int |
JOIN_DELTA__MOVE |
1 |
public static final int |
JOIN_DELTA_FEATURE_COUNT |
3 |
public static final int |
LIST_DELTA |
11 |
public static final int |
LIST_DELTA__CHANGE_DELTA |
2 |
public static final int |
LIST_DELTA__CONFLICTS |
0 |
public static final int |
LIST_DELTA__MOVE |
1 |
public static final int |
LIST_DELTA_FEATURE_COUNT |
3 |
public static final int |
LOCATION |
2 |
public static final int |
LOCATION_FEATURE_COUNT |
0 |
public static final int |
MORPH_DELTA |
17 |
public static final int |
MORPH_DELTA__CONFLICTS |
0 |
public static final int |
MORPH_DELTA_FEATURE_COUNT |
1 |
public static final int |
MOVE_DELTA |
6 |
public static final int |
MOVE_DELTA__ADD |
2 |
public static final int |
MOVE_DELTA__CONFLICTS |
0 |
public static final int |
MOVE_DELTA__DELETE |
1 |
public static final int |
MOVE_DELTA_FEATURE_COUNT |
3 |
public static final int |
RESOLUTION |
10 |
public static final int |
RESOLUTION_FEATURE_COUNT |
0 |
public static final int |
RESOURCE_LOCATION |
13 |
public static final int |
RESOURCE_LOCATION_FEATURE_COUNT |
0 |
public static final int |
SEPARATION_DELTA |
14 |
public static final int |
SEPARATION_DELTA__CHANGE_DELTA |
2 |
public static final int |
SEPARATION_DELTA__CONFLICTS |
0 |
public static final int |
SEPARATION_DELTA__MOVE |
1 |
public static final int |
SEPARATION_DELTA_FEATURE_COUNT |
3 |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final int |
ADD_DELTA |
0 |
public static final int |
CHANGE_DELTA |
2 |
public static final int |
COMPOSITE_DELTA |
4 |
public static final int |
DELETE_DELTA |
1 |
public static final int |
JOIN_DELTA |
5 |
public static final int |
MORPH_DELTA |
7 |
public static final int |
MOVE_DELTA |
3 |
public static final int |
SEPARATION_DELTA |
6 |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final int |
EANNOTATION_LOCATION |
2 |
public static final int |
EOBJECT_LOCATION |
0 |
public static final int |
RESOURCE_LOCATION |
1 |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final int |
ACCEPT_RESOLUTION |
0 |
public static final int |
REJECT_RESOLUTION |
1 |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
TEXT_CONFLICT_PROPERTY |
"TextChangeConflict" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
LANG_PROPERTY |
"lang" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final boolean |
TRACE_INDEX_OUT_OF_BOUNDS |
false |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final int |
IGNORE_CONFLICTS |
1 |
public static final int |
KEEP_CONFLICTING_RESOURCES |
2 |
public static final java.lang.String |
PROPERTY |
"SilentMergeOptions" |
Modifier and Type | Constant Field | Value |
---|---|---|
protected static final boolean |
NEW_SET_EDEFAULT |
false |
protected static final boolean |
OLD_SET_EDEFAULT |
false |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
CLOSURE_EXTENSION |
"ecx" |
public static final java.lang.String |
CLOSURE_MANIFEST_CONTENT_TYPE |
"com.ibm.xtools.comparemerge.emf.emfClosureManifestType" |
public static final java.lang.String |
INPUT_PROP |
"input" |
public static final java.lang.String |
IS_CLOSURE_ROOT_PROP |
"closureRoot" |
public static final java.lang.String |
ROOT_RESOURCES_PROP |
"rootResources" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
COUNTER_PROPERTY |
"conflict.counter" |
public static final java.lang.String |
DETAILS_PROPERTY |
"conflict.details" |
public static final java.lang.String |
EOBJECT_COMPARATOR |
"eObjectComparator" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
COMPOSITE_LABEL_DELEGATE |
"compositeLabelDelegate" |
public static final int |
CONFLICTING |
1 |
public static final java.lang.String |
CONSIDER_FOR_ATOMIC_COMPOSITE_CONFLICT |
"forceAtomicCompositeConflict" |
public static final java.lang.String |
DIAGRAM_COMPOSITE |
"diagramComposite" |
public static final java.lang.String |
EXTRA_KIND |
"extraKind" |
public static final java.lang.String |
IGNORE_CHILD_SYSTEM_DELTAS |
"Ignore Child System Deltas" |
public static final java.lang.String |
LIST_CHANGE_DELTA_TYPE |
"typeOfListChangeDelta" |
public static final java.lang.String |
NON_SYSTEM_DELTA_SELECTOR |
"nonSystemDeltaSelector" |
public static final int |
NONCONFLICTING |
2 |
public static final java.lang.String |
OVERRIDE_LONG_NAME |
"overrideLongName" |
public static final java.lang.String |
OVERRIDE_SHORT_NAME |
"overrideShortName" |
public static final java.lang.String |
PRIMARY_COMPOSITE |
"primaryComposite" |
public static final java.lang.String |
PRIMARY_CONTAINER_SELECTOR |
"primaryContainerSelector" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
ADD_DELTA_FILTER_ID |
"AddDeltaFilter" |
public static final java.lang.String |
AFFECTED_OBJECT_NAME_SORTER_ID |
"SortByAffectedObjectName" |
public static final java.lang.String |
CHANGE_DELTA_FILTER_ID |
"ChangeDeltaFilter" |
public static final java.lang.String |
COMMENT_DELTA_FILTER_ID |
"CommentDeltaFilter" |
public static final java.lang.String |
CONFLICT_AND_NOCONFLICT_GROUPS_STRUCURE_ID |
"ConflictAndNoConflictGroups" |
public static final java.lang.String |
CONFLICTING_DELTA_FILTER_ID |
"ConflictingDeltaFilter" |
public static final java.lang.String |
DEFAULT_FILTER_SET_ID |
"DefaultFilterSet" |
public static final java.lang.String |
DELETE_DELTA_FILTER_ID |
"DeleteDeltaFilter" |
public static final java.lang.String |
DELTA_NODE_LABEL_SORTER_ID |
"SortByDeltaNodeLabel" |
public static final java.lang.String |
DEPENDENT_DELTAS_SORTER_ID_ASCENDING |
"SortByDependentDeltasASCENDING" |
public static final java.lang.String |
DEPENDENT_DELTAS_SORTER_ID_DESCENDING |
"SortByDependentDeltasDESCENDING" |
public static final java.lang.String |
DIAGRAM_DELTA_FILTER_ID |
"DiagramDeltaFilter" |
public static final java.lang.String |
DIAGRAM_DRAG_RESIZE_DELTA_FILTER_ID |
"DiagramDragAndSizeDeltaFilter" |
public static final java.lang.String |
EXCLUSION_SET_DELTA_FILTER_ID |
"ExclusionSetDeltaFilter" |
public static final java.lang.String |
FLAT_STRUCTURE_ID |
"FlatStructure" |
public static final java.lang.String |
GROUP_BY_DELTATYPE_STRUCURE_ID |
"GroupByDeltaType" |
public static final java.lang.String |
GROUP_BY_ECLASS_STRUCURE_ID |
"GroupByEClass" |
public static final java.lang.String |
GROUP_BY_FILE_STRUCURE_ID |
"GroupByFile" |
public static final java.lang.String |
HIERARCHY_STRUCTURE_ID |
"HierachyStructure" |
public static final java.lang.String |
JOIN_DELTA_FILTER_ID |
"JoinDeltaFilter" |
public static final java.lang.String |
MOVE_DELTA_FILTER_ID |
"MoveDeltaFilter" |
public static final java.lang.String |
NO_SORT_ID |
"NoSorting" |
public static final java.lang.String |
NON_CONFLICTING_DELTA_FILTER_ID |
"NonConflictingDeltaFilter" |
public static final java.lang.String |
SEPARATION_DELTA_FILTER_ID |
"SeparationDeltaFilter" |
public static final java.lang.String |
STEREOTYPE_DELTA_FILTER_ID |
"StereotypeDeltaFilter" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final int |
DELTA_OBJECT_CLASS_TYPE |
1 |
public static final int |
ECLASS_TYPE |
2 |
public static final int |
EPACKAGE_TYPE |
3 |
public static final int |
NOT_APPLICABLE |
0 |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
VISIBLE_DELTA_CHANGED |
"Visible Delta Changed" |
Modifier and Type | Constant Field | Value |
---|---|---|
public static final java.lang.String |
PROPERTY_DIRTY |
"Dirty" |
public static final java.lang.String |
PROPERTY_FILTER_DIFFS |
"Filter Diffs" |
public static final java.lang.String |
PROPERTY_FILTER_ELEMENTS |
"Filter Model Elements" |
public static final java.lang.String |
PROPERTY_SESSION_ERROR |
"Session Error" |
public static final java.lang.String |
PROPERTY_SESSION_OPEN |
"Session Open" |
public static final java.lang.String |
PROPERTY_SHOW_DIFFERENCES |
"Show Differeces" |
public static final java.lang.String |
PROPERTY_SHOW_MATCHES |
"Show Matches" |
public static final java.lang.String |
PROPERTY_SHOW_RELATED_DIFFS |
"Show Related Diffs" |