org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.options

Class MergeTextOption

java.lang.Object

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

org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.options.MergeTextOption

public class MergeTextOption
extends ConflictOption

Special option to merge longer texts.

Author:

wesendon

Nested Class Summary

Nested classes/interfaces inherited from class org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.ConflictOption

ConflictOption.OptionType

Constructor Summary

Constructors

Constructor and Description
MergeTextOption() Default constructor.

Method Summary

Modifier and Type	Method and Description
void	add(ConflictOption option) Add options which should be merged.
String	getFullOptionLabel() Returns the complete option label.
String	getMergedText() Get merged text.
String	getMyText() Returns "my" text.
Set<AbstractOperation>	getOperations() Returns the operations, stored in this option.
String	getTheirString() Returns "their" text.
void	setMergedText(String text) Set resulted merged text.

Methods inherited from class org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.ConflictOption

addOperations, getDetailProvider, getOptionLabel, getStrippedOptionLabel, getType, hasExtraOptionAction, isDetailsProvider, optionChosen, setDetailProvider, setOptionLabel

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeTextOption

public MergeTextOption()

Default constructor.

Method Detail

add

public void add(ConflictOption option)

Add options which should be merged. ATM: only "my" and "their" are supported

Parameters:

option - other option

getFullOptionLabel

public String getFullOptionLabel()

Returns the complete option label.

Overrides:

getFullOptionLabel in class ConflictOption

Returns:

text

getMyText

public String getMyText()

Returns "my" text.

Returns:

text

getTheirString

public String getTheirString()

Returns "their" text.

Returns:

text

getOperations

public Set<AbstractOperation> getOperations()

Returns the operations, stored in this option.

Overrides:

getOperations in class ConflictOption

Returns:

list of operations

setMergedText

public void setMergedText(String text)

Set resulted merged text.

Parameters:

text - text

getMergedText

public String getMergedText()

Get merged text.

Returns:

text