com.ibm.xtools.comparemerge.emf.delta

Class TextChangeConflict

java.lang.Object

com.ibm.xtools.comparemerge.emf.delta.TextChangeConflict

public class TextChangeConflict
extends java.lang.Object

Represents text change conflict

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	TextChangeConflict.MergeKind
static class	TextChangeConflict.ResolutionKind

Field Summary

Fields

Modifier and Type	Field and Description
protected java.lang.String	customResult
protected java.lang.String[]	labels
protected TextChangeDelta	left
protected java.util.Map<java.lang.Object,java.lang.Object>	properties
protected TextChangeConflict.ResolutionKind	resolutionKind
protected java.lang.String	result
protected TextChangeDelta	right
static java.lang.String	TEXT_CONFLICT_PROPERTY

Constructor Summary

Constructors

Constructor and Description
TextChangeConflict()

Method Summary

Modifier and Type	Method and Description
java.lang.String	getAncestorText()
java.lang.String	getCustomResult()
java.lang.String[]	getLabels()
java.lang.String	getLang()
TextChangeDelta	getLeft()
java.lang.String	getLeftText()
<T> T	getProperty(java.lang.Object prop)
TextChangeConflict.ResolutionKind	getResolutionKind()
java.lang.String	getResult()
TextChangeDelta	getRight()
java.lang.String	getRightText()
boolean	isAutoResolved()
TextChangeConflict	setCustomResult(java.lang.String text)
TextChangeConflict	setLabels(java.lang.String[] labels)
TextChangeConflict	setLeft(TextChangeDelta left)
TextChangeConflict	setProperty(java.lang.Object prop, java.lang.Object v)
TextChangeConflict	setResolutionKind(TextChangeConflict.ResolutionKind kind)
TextChangeConflict	setResult(java.lang.String text)
TextChangeConflict	setRight(TextChangeDelta right)

Methods inherited from class java.lang.Object

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

Field Detail

TEXT_CONFLICT_PROPERTY

public static final java.lang.String TEXT_CONFLICT_PROPERTY

See Also:

Constant Field Values

left

protected TextChangeDelta left

right

protected TextChangeDelta right

result

protected java.lang.String result

customResult

protected java.lang.String customResult

labels

protected java.lang.String[] labels

resolutionKind

protected TextChangeConflict.ResolutionKind resolutionKind

properties

protected final java.util.Map<java.lang.Object,java.lang.Object> properties

Constructor Detail

TextChangeConflict

public TextChangeConflict()

Method Detail

setLeft

public TextChangeConflict setLeft(TextChangeDelta left)

setRight

public TextChangeConflict setRight(TextChangeDelta right)

getLeft

public TextChangeDelta getLeft()

getRight

public TextChangeDelta getRight()

getLeftText

public java.lang.String getLeftText()

getRightText

public java.lang.String getRightText()

getAncestorText

public java.lang.String getAncestorText()

getLang

public java.lang.String getLang()

setResult

public TextChangeConflict setResult(java.lang.String text)

setCustomResult

public TextChangeConflict setCustomResult(java.lang.String text)

getCustomResult

public java.lang.String getCustomResult()

getResult

public java.lang.String getResult()

setLabels

public TextChangeConflict setLabels(java.lang.String[] labels)

getLabels

public java.lang.String[] getLabels()

setProperty

public TextChangeConflict setProperty(java.lang.Object prop,
                                      java.lang.Object v)

getProperty

public <T> T getProperty(java.lang.Object prop)

setResolutionKind

public TextChangeConflict setResolutionKind(TextChangeConflict.ResolutionKind kind)

getResolutionKind

public TextChangeConflict.ResolutionKind getResolutionKind()

isAutoResolved

public boolean isAutoResolved()