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

Bug 481119

Summary: BorderSizeComputationExpression migration is done only on top level containers mapping
Product: [Modeling] Sirius Reporter: Yann Mortier <yann.mortier>
Component: DiagramAssignee: Maxime Porhel <maxime.porhel>
Status: CLOSED FIXED QA Contact: Florian Barbin <florian.barbin>
Severity: major    
Priority: P3 CC: florian.barbin, maxime.porhel, pierre-charles.david
Version: 3.1.0Keywords: triaged
Target Milestone: 3.1.3   
Hardware: PC   
OS: Windows 7   
See Also: https://git.eclipse.org/r/60189
https://git.eclipse.org/r/60231
https://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=70248c1648a9c4367b3f9956f54c07c458ae1cf1
https://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=4e986b0f814f421ee6183bba32f7371e11269624
Whiteboard:
Bug Depends on: 465211    
Bug Blocks: 481836    

Description Yann Mortier CLA 2015-10-30 10:49:11 EDT
BorderSizeComputionExpression migration is done only on top level containers mapping

Steps to reproduce
 * Open an odesign that have at least one container mapping contained into another container mapping made with Sirius 3.0.0 with a Sirius 3.1.0
 * Do a modification in order to save the migrated odesign.
 * Check the style of the container mapping contained into another container mapping
 * See that Border Size Computation is 0 but it should be 1 because 0 means no border since Sirius 3.1.0
Comment 1 Maxime Porhel CLA 2015-10-30 10:59:50 EDT
A test is required to check that the migration is correctly done on aird and odesign. 

The test data must contain several levels of container mappings and containers.




The VSM migration seems ok

The aird migration should be recursive: diagramDescription.getAllContainerMappings() is not recursive, it only takes mappings and reused mappings. The code should also be reviewed as it seems it sees several times the same mapping (line 56 and 57).
Comment 2 Maxime Porhel CLA 2015-11-12 03:57:25 EST
(In reply to Maxime Porhel from comment #1)
> A test is required to check that the migration is correctly done on aird and
> odesign. 
> 
> The test data must contain several levels of container mappings and
> containers.
> 
> 
> 
> 
> The VSM migration seems ok

The Aird migration is ok: dDiagram.getContainers() is recursive

> 
> The aird migration should be recursive:

The VSM migration should be recursive: layer.getContainerMappings() only return the directly contained mappings and diagramDescription.getAllContainerMappings() return the contained and reused mapping (by the diagram description, "without layer mode")

> diagramDescription.getAllContainerMappings() is not recursive, it only takes
> mappings and reused mappings. The code should also be reviewed as it seems
> it sees several times the same mapping (line 56 and 57).
Comment 3 Eclipse Genie CLA 2015-11-12 05:35:39 EST
New Gerrit change created: https://git.eclipse.org/r/60189
Comment 4 Eclipse Genie CLA 2015-11-12 10:52:05 EST
New Gerrit change created: https://git.eclipse.org/r/60231
Comment 7 Maxime Porhel CLA 2015-11-13 10:08:29 EST
Corrected on branch v3.1.x for 3.1.3
Comment 8 Florian Barbin CLA 2015-11-20 11:15:36 EST
Verified on Sirius 3.1.3.201511201007 by using the automatic test use case
Comment 9 Pierre-Charles David CLA 2015-12-15 05:26:34 EST
Available in Sirius 3.1.3 released on 2015-12-08.