Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[426] Improve GMFHelper.getAbsoluteBounds method #427

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[426] Add tests to reveal the problems
Bug: #426
  • Loading branch information
lredor committed Sep 27, 2024
commit 7106dd644f840320dbe7373cfc8a6807e471ad85
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="root">
<eSubpackages name="p1"/>
<eSubpackages name="p2">
<eSubpackages name="p21"/>
<eSubpackages name="p22"/>
</eSubpackages>
<eSubpackages name="p3">
<eClassifiers xsi:type="ecore:EClass" name="Class1" abstract="true"/>
<eClassifiers xsi:type="ecore:EClass" name="Class2" abstract="true"/>
</eSubpackages>
<eSubpackages name="p4">
<eSubpackages name="p41">
<eClassifiers xsi:type="ecore:EClass" name="Class3"/>
<eClassifiers xsi:type="ecore:EClass" name="Class4"/>
</eSubpackages>
<eSubpackages name="p42"/>
</eSubpackages>
<eSubpackages name="p5">
<eSubpackages name="p51">
<eClassifiers xsi:type="ecore:EClass" name="Class5"/>
<eClassifiers xsi:type="ecore:EClass" name="Class6"/>
</eSubpackages>
<eSubpackages name="p52"/>
<eSubpackages name="p53">
<eClassifiers xsi:type="ecore:EClass" name="Class7"/>
<eClassifiers xsi:type="ecore:EClass" name="Class8"/>
</eSubpackages>
</eSubpackages>
</ecore:EPackage>
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="ASCII"?>
<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="description" version="15.4.0.202401051836">
<ownedViewpoints endUserDocumentation="2262&#xD;&#xA;" name="SampleWithContainers" modelFileExtension="ecore">
<ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithFreeFormContainers" domainClass="ecore::EPackage">
<metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
<defaultLayer name="Default" label="default">
<containerMappings name="EPackageContainerMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="ecore::EPackage">
<borderedNodeMappings name="BorderClass" semanticCandidatesExpression="feature:eClassifiers" domainClass="ecore::EClass">
<style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="2" labelPosition="node">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
</style>
</borderedNodeMappings>
<subContainerMappings name="EPackageContainerMapping2" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="ecore::EPackage">
<borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="feature:eClassifiers" domainClass="ecore::EClass">
<style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="2" labelPosition="node">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
</style>
</borderedNodeMappings>
<style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
<foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
</style>
</subContainerMappings>
<style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
<foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
</style>
</containerMappings>
</defaultLayer>
</ownedRepresentations>
<ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithListContainers" domainClass="ecore::EPackage">
<metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
<defaultLayer name="Default" label="default">
<containerMappings name="EPackageListMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="ecore::EPackage" childrenPresentation="List">
<borderedNodeMappings name="BorderClass" semanticCandidatesExpression="aql:self.eClassifiers + self.eSubpackages.eClassifiers" domainClass="ecore::EClass">
<style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="2" labelPosition="node">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
</style>
</borderedNodeMappings>
<subNodeMappings name="EPackageListItemMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="ecore::EPackage">
<style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" labelPosition="node" resizeKind="NSEW">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
</style>
</subNodeMappings>
<style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
<foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
</style>
</containerMappings>
</defaultLayer>
</ownedRepresentations>
<ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithHStackContainers" domainClass="ecore::EPackage">
<metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
<defaultLayer name="Default" label="default">
<containerMappings name="EPackageHStackMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="ecore::EPackage" childrenPresentation="HorizontalStack">
<borderedNodeMappings name="BorderClass" semanticCandidatesExpression="aql:self.eClassifiers + self.eSubpackages.eClassifiers" domainClass="ecore::EClass">
<style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="2" labelPosition="node">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/>
</style>
</borderedNodeMappings>
<subContainerMappings name="EPackageContainerInHStack" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="ecore::EPackage">
<style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
<foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
</style>
</subContainerMappings>
<style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
<foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
</style>
</containerMappings>
</defaultLayer>
</ownedRepresentations>
<ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithVStackContainers" domainClass="ecore::EPackage">
<metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
<defaultLayer name="Default" label="default">
<containerMappings name="EPackageVStackMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="ecore::EPackage" childrenPresentation="VerticalStack">
<borderedNodeMappings name="BorderClass" semanticCandidatesExpression="aql:self.eClassifiers + self.eSubpackages.eClassifiers" domainClass="ecore::EClass">
<style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="2" labelPosition="node">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
</style>
</borderedNodeMappings>
<subContainerMappings name="EPackageContainerInHStack" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="ecore::EPackage">
<style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
<foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
</style>
</subContainerMappings>
<style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
<foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
</style>
</containerMappings>
</defaultLayer>
</ownedRepresentations>
</ownedViewpoints>
</description:Group>
Loading