|
|||||||||
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.DecisionManager
public class DecisionManager
DecisionManager is the controller for the merge dialog and therefore it's main component. It calculates the conflicts from incoming changes and can execute resolved conflicts.
Constructor Summary | |
---|---|
DecisionManager(Project project,
ChangeConflictSet changeConflict,
boolean isBranchMerge)
Default constructor. |
Method Summary | |
---|---|
void |
calcResult()
If all conflicts are resolved this method will generate the resulting operations from the conflicts. |
int |
countMyLeafOperations()
Count my leaf operations. |
int |
countMyOperations()
Count my leaf operations. |
int |
countTheirLeafOperations()
Count their leaf operations. |
int |
countTheirOperations()
Count their leaf operations. |
String |
getAuthorForOperation(AbstractOperation theirOperation)
Returns the name of the author for a operation in list of their operations. |
ConflictDetector |
getConflictDetector()
Returns the conflictdetector. |
ArrayList<VisualConflict> |
getConflicts()
Returns the conflicts. |
ModelElementIdToEObjectMapping |
getIdToEObjectMapping()
Returns the mapping that is used to resolve model elements correctly. |
org.eclipse.emf.ecore.EObject |
getModelElement(ModelElementId modelElementId)
Returns the model element. |
String |
getModelElementName(org.eclipse.emf.ecore.EObject modelElement)
Get the Name of an model element. |
String |
getModelElementName(ModelElementId modelElementId)
Get the Name of an model element by modelelement id. |
Project |
getProject()
Returns the project on which the decision manager is working on. |
boolean |
isBranchMerge()
Flat whether branches are merged opposed to versions on the same branch. |
boolean |
isResolved()
Checks whether all conflicts are resolved. |
Methods inherited from class java.lang.Object |
---|
equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public DecisionManager(Project project, ChangeConflictSet changeConflict, boolean isBranchMerge)
project
- the related projectchangeConflict
- the ChangeConflictSet
containing the changes leading to a potential conflictisBranchMerge
- allows to specify whether two branches are merged, opposed to
changes from the same branch. Has an effect on the wording of
conflictsMethod Detail |
---|
public ArrayList<VisualConflict> getConflicts()
public boolean isResolved()
public void calcResult()
public ConflictDetector getConflictDetector()
public boolean isBranchMerge()
public String getModelElementName(ModelElementId modelElementId)
modelElementId
- id of element
public String getModelElementName(org.eclipse.emf.ecore.EObject modelElement)
modelElement
- element
public org.eclipse.emf.ecore.EObject getModelElement(ModelElementId modelElementId)
modelElementId
- the id of an element
null
if no such model element has been foundpublic String getAuthorForOperation(AbstractOperation theirOperation)
theirOperation
- operation
public int countMyLeafOperations()
public int countTheirLeafOperations()
public int countMyOperations()
public int countTheirOperations()
public ModelElementIdToEObjectMapping getIdToEObjectMapping()
EObject
mappingpublic Project getProject()
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |