Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 353107

Summary:	ConflictingDiffElement should inherit from DiffGroup
Product:	[Modeling] EMFCompare	Reporter:	Cedric Notot <cedric.notot>
Component:	Core	Assignee:	EMF Compare <emf.compare-inbox>
Status:	CLOSED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	cedric.brun, laurent.goubet
Version:	1.3
Target Milestone:	Kepler
Hardware:	PC
OS:	Windows 7
Whiteboard:
Bug Depends on:	373245
Bug Blocks:

Description Cedric Notot

2011-07-26 09:38:31 EDT

The ConflictingDiffElement meta-class should inherit from DiffGroup to get the same behavior for the hiding mechanism. Indeed, the "getSubchanges()" method should be available on the ConflictingDiffElement to hide it when it is empty.

Comment 1 Laurent Goubet

2012-03-06 04:40:22 EST

The Diffgroups will disappear as part of the restructuration effort. Conflicts will be represented as an association between two diffs.

Comment 2 Cedric Brun

2012-11-20 09:18:54 EST

I think we're done here. Feel free to reopen.