| Modifier and Type | Method and Description |
|---|---|
DecisionManager |
VisualConflict.getDecisionManager()
Returns the
DecisionManager. |
| Modifier and Type | Method and Description |
|---|---|
void |
ConflictDescription.setDecisionManager(DecisionManager decisionManager)
Sets the decisionManager.
|
| Constructor and Description |
|---|
ConflictContext(DecisionManager manager,
AbstractOperation myOperation,
AbstractOperation theirOperation)
Alternative constructor.
|
VisualConflict(ConflictBucket conflictBucket,
AbstractOperation leftOperation,
AbstractOperation rightOperation,
DecisionManager decisionManager,
boolean leftIsMy,
boolean init)
Construct conflict from given specific left and right operation.
|
VisualConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor.
|
VisualConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean leftIsMy,
boolean init)
Construct conflict from given specific left and right operation.
|
| Constructor and Description |
|---|
AttributeConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager)
Default constructor.
|
CompositeConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean meCausing)
Default constructor.
|
DeletionConflict(ConflictBucket conflictBucket,
boolean meCausingDelete,
DecisionManager decisionManager)
Default constructor.
|
MultiAttributeConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean myAdd) |
MultiAttributeMoveConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean isMyAdd) |
MultiAttributeMoveSetConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean isMySet) |
MultiAttributeSetConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean isMyRemove) |
MultiAttributeSetSetConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager) |
MultiReferenceConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean meAdding)
Default constructor.
|
MultiReferenceConflict(ConflictBucket conflictBucket,
MultiReferenceOperation leftOperation,
MultiReferenceOperation rightOperation,
DecisionManager decisionManager,
boolean meAdding)
Construct conflict from designated left and right operation.
|
MultiReferenceSetConflict(ConflictBucket conf,
DecisionManager decisionManager,
boolean myMultiRef)
Default constructor.
|
MultiReferenceSetSetConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager) |
MultiReferenceSetSingleConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean setLeft)
Default constructor.
|
MultiReferenceSingleConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean multiLeft)
Default constructor.
|
MultiReferenceSingleConflict(MultiReferenceOperation multiReferenceOp,
SingleReferenceOperation singleReferenceOp,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor.
|
ReferenceConflict(MultiReferenceOperation leftMultiRef,
MultiReferenceOperation rightMultiRef,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor for a reference conflict where two
MultiReferenceOperation conflict with each other. |
ReferenceConflict(MultiReferenceOperation leftMultiRef,
SingleReferenceOperation rightSingleRef,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor for a reference conflict where a
MultiReferenceOperation conflicts with a
SingleReferenceOperation. |
ReferenceConflict(SingleReferenceOperation leftSingleRef,
MultiReferenceOperation rightMultiRef,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor for a reference conflict where a
SingleReferenceOperation conflicts with a
MultiReferenceOperation. |
ReferenceConflict(SingleReferenceOperation leftSingleRef,
SingleReferenceOperation rightSingleRef,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor for a reference conflict where two
SingleReferenceOperation conflict with each other. |
SingleReferenceConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager)
Default constructor.
|
SingleReferenceConflict(ConflictBucket conflictBucket,
SingleReferenceOperation leftOperation,
SingleReferenceOperation rightOperation,
DecisionManager decisionManager)
Construct conflict from designated left and right operation.
|
| Constructor and Description |
|---|
MergeWizard(DecisionManager decisionManager)
Default constructor.
|
| Modifier and Type | Method and Description |
|---|---|
DecisionManager |
DecisionBox.getDecisionManager()
Returns the decisionmanager.
|
| Constructor and Description |
|---|
DecisionBox(org.eclipse.swt.widgets.Composite parent,
DecisionManager decisionManager,
org.eclipse.swt.graphics.Color color,
VisualConflict conflict)
Default constructor.
|
| Modifier and Type | Method and Description |
|---|---|
org.eclipse.swt.widgets.Control |
DetailsPart.initialize(DecisionManager manager,
ConflictOption option,
org.eclipse.swt.widgets.Composite parent)
Allows to add a custom merge widget.
|
| Constructor and Description |
|---|
DetailsDialog(org.eclipse.swt.widgets.Shell parentShell,
DecisionManager decisionManager,
ConflictOption option)
Constructor.
|
| Constructor and Description |
|---|
OtherInvolvedWidget(org.eclipse.swt.widgets.Composite parent,
DecisionManager decisionManager,
ConflictOption option)
Default constructor.
|
| Modifier and Type | Method and Description |
|---|---|
static ChangePackageVisualizationHelper |
UIDecisionUtil.getChangePackageVisualizationHelper(DecisionManager decisionManager)
Returns the visualizationhelper.
|
Copyright © 2017. All rights reserved.