public class ConflictAnalyzer extends java.lang.Object implements ConflictContainer
Modifier and Type | Field and Description |
---|---|
protected java.util.Set<Conflict> |
conflicts |
protected java.util.List<ConflictStrategy> |
conflictStrategies |
protected org.eclipse.emf.ecore.resource.Resource[] |
contributors |
protected DeltaContainer[] |
deltaContainers |
protected com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher |
matcher |
protected java.lang.String |
resourceType |
protected java.util.Map<ConflictType,java.util.List<Conflict>> |
typeToListOfConflicts |
Constructor and Description |
---|
ConflictAnalyzer() |
Modifier and Type | Method and Description |
---|---|
void |
addAllConflictStrategies(java.util.Collection newConflictStrategies) |
void |
addConflict(Conflict conflict) |
boolean |
addConflictStrategy(ConflictStrategy strategy) |
boolean |
canCreateConflict(Delta delta1,
Delta delta2)
Provides a way to apply veto on conflict
|
void |
deleteConflict(Conflict conflict) |
java.util.List |
getConflicts()
Returns the generated list of conflicts.
|
void |
init(java.lang.String newResourceType,
com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher newMatcher,
org.eclipse.emf.ecore.resource.Resource[] newContributors,
DeltaContainer[] newDeltaContainers)
Initialize this conflict analyzer with a new base and contributor
resources.
|
protected boolean |
isConsiderForAtomicCompositeConflict(Delta delta) |
protected boolean |
isEnabled(ConflictStrategy strategy) |
void |
run()
Run this conflict analyzer.
|
protected java.lang.String resourceType
protected com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher
protected org.eclipse.emf.ecore.resource.Resource[] contributors
protected DeltaContainer[] deltaContainers
protected java.util.Set<Conflict> conflicts
protected java.util.Map<ConflictType,java.util.List<Conflict>> typeToListOfConflicts
protected java.util.List<ConflictStrategy> conflictStrategies
public void init(java.lang.String newResourceType, com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher newMatcher, org.eclipse.emf.ecore.resource.Resource[] newContributors, DeltaContainer[] newDeltaContainers)
newResourceType
- type of resourcesnewMatcher
- a matchernewContributors
- array of contributor resourcesnewDeltaContainers
- array of delta containerspublic void run()
protected boolean isEnabled(ConflictStrategy strategy)
public void addConflict(Conflict conflict)
addConflict
in interface ConflictContainer
public void deleteConflict(Conflict conflict)
deleteConflict
in interface ConflictContainer
public boolean addConflictStrategy(ConflictStrategy strategy)
public void addAllConflictStrategies(java.util.Collection newConflictStrategies)
public java.util.List getConflicts()
protected boolean isConsiderForAtomicCompositeConflict(Delta delta)
public boolean canCreateConflict(Delta delta1, Delta delta2)
ConflictContainer
canCreateConflict
in interface ConflictContainer