org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.widgets

Class MergeTextWidget

java.lang.Object

org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.widgets.MergeTextWidget

All Implemented Interfaces:

Observer

public class MergeTextWidget
extends Object
implements Observer

Is used to display longer conflicting text and to merge them.

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
MergeTextWidget(DecisionBox decisionBox, DetailsComponent detailsComponent) Default constructor.

Method Summary

Modifier and Type	Method and Description
void	addOption(ConflictOption option) Add involved ConflictOptions.
void	createContent(org.eclipse.swt.widgets.Composite parent) Called by container in order to build gui.
void	update(Observable o, Object arg)

Methods inherited from class java.lang.Object

equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

MergeTextWidget

public MergeTextWidget(DecisionBox decisionBox,
                       DetailsComponent detailsComponent)

Default constructor.

Parameters:

decisionBox - container

detailsComponent - details component

Method Detail

addOption

public void addOption(ConflictOption option)

Add involved ConflictOptions.

Parameters:

option - option

createContent

public void createContent(org.eclipse.swt.widgets.Composite parent)

Called by container in order to build gui.

Parameters:

parent - container

update

public void update(Observable o,
                   Object arg)

Specified by:

update in interface Observer

See Also:

Observer.update(java.util.Observable, java.lang.Object)