|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object java.util.Observable org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.VisualConflict
public abstract class VisualConflict
Main class representing a conflict. It offers all kind of convenience methods and organizes the conflicts initialization.
Constructor Summary | |
---|---|
VisualConflict(ConflictBucket conflictBucket,
AbstractOperation leftOperation,
AbstractOperation rightOperation,
DecisionManager decisionManager,
boolean leftIsMy,
boolean init)
Construct conflict from given specific left and right operation. |
|
VisualConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor. |
|
VisualConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean leftIsMy,
boolean init)
Construct conflict from given specific left and right operation. |
Method Summary | ||
---|---|---|
Set<AbstractOperation> |
getAcceptedMine()
This method is used by DecisionManager in order to create the
resulting operations. |
|
ConflictContext |
getConflictContext()
Returns the conflict context. |
|
ConflictDescription |
getConflictDescription()
Returns the conflict description. |
|
DecisionManager |
getDecisionManager()
Returns the DecisionManager . |
|
AbstractOperation |
getLeftOperation()
Get first left operation. |
|
Set<AbstractOperation> |
getLeftOperations()
Get left operations. |
|
AbstractOperation |
getMyOperation()
Get my operation. |
|
|
getMyOperation(Class<T> clazz)
Get my operation and cast. |
|
Set<AbstractOperation> |
getMyOperations()
Get my operations. |
|
ConflictOption |
getOptionOfType(ConflictOption.OptionType type)
Get an option by its type. |
|
List<ConflictOption> |
getOptions()
Returns the list of options. |
|
Set<AbstractOperation> |
getRejectedTheirs()
This method is used by DecisionManager in order to create the
resulting operations. |
|
AbstractOperation |
getRightOperation()
get first right operation. |
|
Set<AbstractOperation> |
getRightOperations()
get right operations. |
|
ConflictOption |
getSolution()
Returns the solution. |
|
AbstractOperation |
getTheirOperation()
Get their operation. |
|
|
getTheirOperation(Class<T> clazz)
Get their operation and cast. |
|
Set<AbstractOperation> |
getTheirOperations()
Get their operations. |
|
boolean |
hasDetails()
Checks whether the related options have details. |
|
boolean |
isLeftMy()
Determines whether left operations are my. |
|
boolean |
isResolved()
Returns whether this conflict is resolved. |
|
void |
resolve()
Resolves this conflict. |
|
void |
setLeftIsMy(boolean leftIsMy)
Whether the left operations is mine operation. |
|
void |
setSolution(ConflictOption conflictOption)
Sets an options as solution for this conflict. |
Methods inherited from class java.util.Observable |
---|
addObserver, countObservers, deleteObserver, deleteObservers, hasChanged, notifyObservers, notifyObservers |
Methods inherited from class java.lang.Object |
---|
equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public VisualConflict(ConflictBucket conflictBucket, AbstractOperation leftOperation, AbstractOperation rightOperation, DecisionManager decisionManager, boolean leftIsMy, boolean init)
conflictBucket
- the underlying conflictleftOperation
- the left operationrightOperation
- the right operationdecisionManager
- the decision managerleftIsMy
- true if left operation is my operationinit
- true if conflict should be initialized on constructionpublic VisualConflict(ConflictBucket conflictBucket, DecisionManager decisionManager, boolean leftIsMy, boolean init)
conflictBucket
- the underlying conflictdecisionManager
- the decision managerleftIsMy
- true if left operation is my operationinit
- true if conflict should be initialized on constructionpublic VisualConflict(ConflictBucket conflictBucket, DecisionManager decisionManager)
conflictBucket
- the underlying conflictdecisionManager
- the decision managerMethod Detail |
---|
public boolean isLeftMy()
public ConflictContext getConflictContext()
public ConflictDescription getConflictDescription()
public List<ConflictOption> getOptions()
public boolean isResolved()
public boolean hasDetails()
public void setSolution(ConflictOption conflictOption)
conflictOption
- optionpublic DecisionManager getDecisionManager()
DecisionManager
.
public ConflictOption getSolution()
public Set<AbstractOperation> getRejectedTheirs()
DecisionManager
in order to create the
resulting operations.
public Set<AbstractOperation> getAcceptedMine()
DecisionManager
in order to create the
resulting operations.
public ConflictOption getOptionOfType(ConflictOption.OptionType type)
type
- type
public Set<AbstractOperation> getMyOperations()
public Set<AbstractOperation> getTheirOperations()
public Set<AbstractOperation> getLeftOperations()
public Set<AbstractOperation> getRightOperations()
public AbstractOperation getLeftOperation()
public AbstractOperation getRightOperation()
public AbstractOperation getMyOperation()
public AbstractOperation getTheirOperation()
public <T> T getMyOperation(Class<T> clazz)
T
- cast typeclazz
- AbstractOperation
class to which will be casted
public <T> T getTheirOperation(Class<T> clazz)
T
- cast typeclazz
- AbstractOperation
class to which will be casted
public void resolve()
public void setLeftIsMy(boolean leftIsMy)
leftIsMy
- should be true
, if the left operation belongs to me, false
otherwise
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |