Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 353107 - ConflictingDiffElement should inherit from DiffGroup
Summary: ConflictingDiffElement should inherit from DiffGroup
Status: CLOSED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: 1.3   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: Kepler   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 373245
Blocks:
  Show dependency tree
 
Reported: 2011-07-26 09:38 EDT by Cedric Notot CLA
Modified: 2013-01-23 07:24 EST (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Cedric Notot CLA 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 CLA 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 CLA 2012-11-20 09:18:54 EST 
I think we're done here. Feel free to reopen.