com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer

Interface ConflictContainer

All Known Implementing Classes:

ConflictAnalyzer

public interface ConflictContainer

Method Summary

Modifier and Type	Method and Description
void	addConflict(Conflict conflict)
boolean	canCreateConflict(Delta delta1, Delta delta2) Provides a way to apply veto on conflict
void	deleteConflict(Conflict conflict)

Method Detail

addConflict

void addConflict(Conflict conflict)

deleteConflict

void deleteConflict(Conflict conflict)

canCreateConflict

boolean canCreateConflict(Delta delta1,
                          Delta delta2)

Provides a way to apply veto on conflict

Parameters:

delta1 -

delta2 -