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

Class DeletionConflict

java.lang.Object

java.util.Observable

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

org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts.DeletionConflict

public class DeletionConflict
extends VisualConflict

Conflict with an CreateDeleteOperation involved.

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
DeletionConflict(ConflictBucket conflictBucket, boolean meCausingDelete, DecisionManager decisionManager) Default constructor.

Method Summary

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

getAcceptedMine, getConflictContext, getConflictDescription, getDecisionManager, getLeftOperation, getLeftOperations, getMyOperation, getMyOperation, getMyOperations, getOptionOfType, getOptions, getRejectedTheirs, getRightOperation, getRightOperations, getSolution, getTheirOperation, getTheirOperation, getTheirOperations, hasDetails, isLeftMy, isResolved, resolve, setLeftIsMy, setSolution

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

DeletionConflict

public DeletionConflict(ConflictBucket conflictBucket,
                        boolean meCausingDelete,
                        DecisionManager decisionManager)

Default constructor.

Parameters:

conflictBucket - the conflict

meCausingDelete - true, if deleting operation was generated by merging user

decisionManager - decisionmanager