Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 361344 - Duplication of model root in the difference view
Summary: Duplication of model root in the difference view
Status: CLOSED FIXED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: 1.3   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-19 03:30 EDT by Arthur Daussy CLA
Modified: 2013-01-17 08:32 EST (History)
1 user (show)

See Also:

Attachments
Models and sreenchot of the problem (81.56 KB, application/zip)
2011-10-19 03:30 EDT, Arthur Daussy CLA 		no flags Details
Fix (1.73 MB, application/x-gzip)
2011-10-28 12:51 EDT, Cedric Notot CLA 		laurent.goubet: iplog+
Details
View All 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 Arthur Daussy CLA 2011-10-19 03:30:28 EDT 
Created attachment 205478 [details]
Models and sreenchot of the problem

There is a duplication of model root in the diff view when trying to compare the models in attachment. 
Nothing appear in the "Error Log" view.
I have put as attachment models to reproduce and a screenshot of the problem.

Regards,
Comment 1 Cedric Notot CLA 2011-10-28 12:51:51 EDT 
Created attachment 206142 [details]
Fix

I have just fixed this issue.

The model root was duplicated because the add of the stereotype application (out of the root of the UML model) has created a difference on the same level than the DiffModel whereas this one should be located under the DiffGroup related to the element on which it applies.

Besides, this difference should be hidden by the add of the UML stereotyped element.

This last behavior had been fixed on 351593 (by the way, see the comment 18).
But, in the fix, I forgot to request, from the deleted or added UML element, the stereotype applications on itself. I was looking for only the embedded UML elements.

For the location of the hidden difference (related to stereotype application), I modified the method AbstractDiffExtensionFactory.findOrCreateDiffGroup() to correctly locate the difference under the right DiffGroup.
Comment 2 Laurent Goubet CLA 2011-11-03 04:10:35 EDT 
Thanks Cedric, patch applied on master.
Comment 3 Laurent Goubet CLA 2011-11-03 05:00:49 EDT 
Arthur, a build containing this fix is available from http://download.eclipse.org/modeling/emf/compare/updates/nightly/1.3 (build ID : N201111030432). Could you verify that this fixes the issue on your side?
Comment 4 Arthur Daussy CLA 2011-11-04 10:00:02 EDT 
Working perfectly fine.

Thanks for your help.
Comment 5 Laurent Goubet CLA 2013-01-17 08:32:44 EST 
batch-closing a bunch of "RESOLVED" bugs.