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

Packages that use ConflictOption

org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict
org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.options
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
org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.widgets

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

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

class

CustomConflictOption Abstract superclass for custom options.

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

ConflictOption	VisualConflict.getOptionOfType(ConflictOption.OptionType type) Get an option by its type.
ConflictOption	VisualConflict.getSolution() Returns the solution.

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

List<ConflictOption>

VisualConflict.getOptions() Returns the list of options.

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

void	VisualConflict.setSolution(ConflictOption conflictOption) Sets an options as solution for this conflict.

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

Subclasses of ConflictOption in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.options

class

MergeTextOption Special option to merge longer texts.

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

void	MergeTextOption.add(ConflictOption option) Add options which should be merged.

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

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

static ConflictOption

DecisionUtil.getConflictOptionByType(List<ConflictOption> options, ConflictOption.OptionType type) Get Option by is type.

Method parameters in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.util with type arguments of type ConflictOption

static ConflictOption

DecisionUtil.getConflictOptionByType(List<ConflictOption> options, ConflictOption.OptionType type) Get Option by is type.

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

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

void	DecisionBox.setSolution(ConflictOption option) Set the solution of this conflict.

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

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

org.eclipse.swt.widgets.Control

DetailsPart.initialize(DecisionManager manager, ConflictOption option, org.eclipse.swt.widgets.Composite parent) Allows to add a custom merge widget.

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

DetailsDialog(org.eclipse.swt.widgets.Shell parentShell, DecisionManager decisionManager, ConflictOption option)
Constructor.

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

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

void	MergeTextWidget.addOption(ConflictOption option) Add involved ConflictOptions.

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

OtherInvolvedWidget(org.eclipse.swt.widgets.Composite parent, DecisionManager decisionManager, ConflictOption option)
Default constructor.