Uses of Class
org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.VisualConflict

Packages that use VisualConflict

org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging
org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict
org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts
org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.util
org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui
org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.components

Uses of VisualConflict in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging

Methods in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging that return VisualConflict

VisualConflict

ConflictHandler.handle(VisualConflict conflict, ModelElementIdToEObjectMapping idToEObjectMapping) Called after a conflict has been created and before it is added to list of all existing conflicts.

Methods in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging that return types with arguments of type VisualConflict

ArrayList<VisualConflict>

DecisionManager.getConflicts() Returns the conflicts.

Methods in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging with parameters of type VisualConflict

VisualConflict

ConflictHandler.handle(VisualConflict conflict, ModelElementIdToEObjectMapping idToEObjectMapping) Called after a conflict has been created and before it is added to list of all existing conflicts.

Uses of VisualConflict in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict

Methods in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict with parameters of type VisualConflict

CustomConflictOption	CustomConflictOptionFactory.createCustomConflictOption(VisualConflict conflict) Creates the custom option.
boolean	CustomConflictOptionFactory.isApplicableConflict(VisualConflict conflict) Check whether custom option is applicable for given conflict.

Uses of VisualConflict in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts

Subclasses of VisualConflict in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts

class	AttributeConflict Conflict for two attribute operations.
class	CompositeConflict Conflict CompositeOperation involved.
class	DeletionConflict Conflict with an CreateDeleteOperation involved.
class	MultiAttributeConflict
class	MultiAttributeMoveConflict
class	MultiAttributeMoveSetConflict
class	MultiAttributeSetConflict
class	MultiAttributeSetSetConflict
class	MultiReferenceConflict Conflict between two MultiReferenceConflict.
class	MultiReferenceSetConflict
class	MultiReferenceSetSetConflict
class	MultiReferenceSetSingleConflict
class	MultiReferenceSingleConflict
class	ReferenceConflict Container for MultiReferenceConflict and SingleReferenceConflict.
class	SingleReferenceConflict Conflict for two SingleReferenceOperation.

Uses of VisualConflict in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.util

Methods in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.util with parameters of type VisualConflict

static boolean

DecisionUtil.detailsNeeded(VisualConflict conflict) Checks whether a conflict needs details.

Uses of VisualConflict in org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui

Methods in org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui that return VisualConflict

VisualConflict

DecisionBox.getConflict() Returns the conflict of the box.

Methods in org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui with parameters of type VisualConflict

void	OptionComponentImpl.init(org.eclipse.swt.widgets.Composite parent, DecisionBox decisionBox, VisualConflict visualConflict) Initializes this component.
void	DescriptionComponentImpl.init(org.eclipse.swt.widgets.Composite parent, DecisionBox decisionBox, VisualConflict visualConflict) Initializes this component.
void	MergeComponent.init(org.eclipse.swt.widgets.Composite parent, DecisionBox decisionBox, VisualConflict visualConflict) Initializes this component.

Constructors in org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui with parameters of type VisualConflict

DecisionBox(org.eclipse.swt.widgets.Composite parent, DecisionManager decisionManager, org.eclipse.swt.graphics.Color color, VisualConflict conflict)
Default constructor.

Uses of VisualConflict in org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.components

Constructors in org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.components with parameters of type VisualConflict

ContextComponent(DecisionBox parent, VisualConflict conflict)
Default constructor.

DetailsComponent(DecisionBox decisionBox, VisualConflict conflict)
Default constructor.