|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
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
Special option to merge longer texts.
Nested Class Summary |
---|
Nested classes/interfaces inherited from class org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.ConflictOption |
---|
ConflictOption.OptionType |
Constructor Summary | |
---|---|
MergeTextOption()
Default constructor. |
Method Summary | |
---|---|
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 |
---|
public MergeTextOption()
Method Detail |
---|
public void add(ConflictOption option)
option
- other optionpublic String getFullOptionLabel()
getFullOptionLabel
in class ConflictOption
public String getMyText()
public String getTheirString()
public Set<AbstractOperation> getOperations()
getOperations
in class ConflictOption
public void setMergedText(String text)
text
- textpublic String getMergedText()
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |