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

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.AttributeConflict

public class AttributeConflict
extends VisualConflict

Conflict for two attribute operations.

Author:

wesendon, emueller

Constructor Summary

AttributeConflict(ConflictBucket conflictBucket, 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

AttributeConflict

public AttributeConflict(ConflictBucket conflictBucket,
                         DecisionManager decisionManager)

Default constructor.

Parameters:

conflictBucket - the conflict

decisionManager - decisionmanager