diff options
| author | Jessy Mallet | 2016-06-21 09:39:19 +0000 |
|---|---|---|
| committer | Laurent Redor | 2016-07-06 14:00:22 +0000 |
| commit | 78b1b4122e280143143e3f59da0fb9e36e831441 (patch) | |
| tree | b78e04b7c89ad76576f1915b879f759439375aba | |
| parent | 9809db17095bc93475f818679ff2d632ca914293 (diff) | |
| download | org.eclipse.sirius-78b1b4122e280143143e3f59da0fb9e36e831441.tar.gz org.eclipse.sirius-78b1b4122e280143143e3f59da0fb9e36e831441.tar.xz org.eclipse.sirius-78b1b4122e280143143e3f59da0fb9e36e831441.zip | |
[495119] Change Font used for data test case of compartments tests.
This commit replaces the fonts used for data test case of compartments
tests by "Commic Sans MS". This font has similar size on different OS
(Windows, Linux, Mac). This allows to have reliable results on
DDiagramElements size when they are based on the label size.
Even with this font, there are some differences. For example, delta of
one pixel in height between a local Windows 10 and Eclipse Hipp on
Linux. So the test is adapted to not really checks height.
Bug: 495119
Change-Id: Ide681715a2f12d834281d2ff9585c737586260ac
Signed-off-by: Jessy Mallet <jessy.mallet@obeo.fr>
4 files changed, 504 insertions, 181 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/compartments/My.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/compartments/My.aird index c1643a2d4c..242c28d470 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/compartments/My.aird +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/compartments/My.aird @@ -16,66 +16,66 @@ <children xmi:type="notation:Node" xmi:id="_x1tyQEgKEeWO8ekbzmZQXg" type="5004"/> <children xmi:type="notation:Node" xmi:id="_x1tyQUgKEeWO8ekbzmZQXg" type="7003"> <children xmi:type="notation:Node" xmi:id="_x1yqxUgKEeWO8ekbzmZQXg" type="3010" element="_x04EwUgKEeWO8ekbzmZQXg"> - <styles xmi:type="notation:FontStyle" xmi:id="_x1yqxkgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_x1yqxkgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_x1yqx0gKEeWO8ekbzmZQXg"/> </children> <children xmi:type="notation:Node" xmi:id="_x1zR0EgKEeWO8ekbzmZQXg" type="3010" element="_x0558EgKEeWO8ekbzmZQXg"> - <styles xmi:type="notation:FontStyle" xmi:id="_x1zR0UgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_x1zR0UgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_x1zR0kgKEeWO8ekbzmZQXg"/> </children> <children xmi:type="notation:Node" xmi:id="_x1zR00gKEeWO8ekbzmZQXg" type="3010" element="_x07vIUgKEeWO8ekbzmZQXg"> - <styles xmi:type="notation:FontStyle" xmi:id="_x1zR1EgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_x1zR1EgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_x1zR1UgKEeWO8ekbzmZQXg"/> </children> <children xmi:type="notation:Node" xmi:id="_x1z44EgKEeWO8ekbzmZQXg" type="3010" element="_x0-ycEgKEeWO8ekbzmZQXg"> - <styles xmi:type="notation:FontStyle" xmi:id="_x1z44UgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_x1z44UgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_x1z44kgKEeWO8ekbzmZQXg"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_x1tyQkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x1tyQ0gKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_x1tyREgKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x1skJEgKEeWO8ekbzmZQXg" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x1skJEgKEeWO8ekbzmZQXg" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x1skJUgKEeWO8ekbzmZQXg"/> </children> <children xmi:type="notation:Node" xmi:id="_x1uZUEgKEeWO8ekbzmZQXg" type="3009" element="_x0u60EgKEeWO8ekbzmZQXg"> <children xmi:type="notation:Node" xmi:id="_x1uZU0gKEeWO8ekbzmZQXg" type="5004"/> <children xmi:type="notation:Node" xmi:id="_x1uZVEgKEeWO8ekbzmZQXg" type="7003"> <children xmi:type="notation:Node" xmi:id="_HXIpIHGIEeWC_YQiieS2Ig" type="3010" element="_HWwOoHGIEeWC_YQiieS2Ig"> - <styles xmi:type="notation:FontStyle" xmi:id="_HXIpIXGIEeWC_YQiieS2Ig" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HXIpIXGIEeWC_YQiieS2Ig" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_HXIpInGIEeWC_YQiieS2Ig"/> </children> <children xmi:type="notation:Node" xmi:id="_HXIpI3GIEeWC_YQiieS2Ig" type="3010" element="_HWxcwHGIEeWC_YQiieS2Ig"> - <styles xmi:type="notation:FontStyle" xmi:id="_HXIpJHGIEeWC_YQiieS2Ig" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HXIpJHGIEeWC_YQiieS2Ig" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_HXIpJXGIEeWC_YQiieS2Ig"/> </children> <children xmi:type="notation:Node" xmi:id="_HXJQMHGIEeWC_YQiieS2Ig" type="3010" element="_HWyD0HGIEeWC_YQiieS2Ig"> - <styles xmi:type="notation:FontStyle" xmi:id="_HXJQMXGIEeWC_YQiieS2Ig" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HXJQMXGIEeWC_YQiieS2Ig" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_HXJQMnGIEeWC_YQiieS2Ig"/> </children> <children xmi:type="notation:Node" xmi:id="_HXJQM3GIEeWC_YQiieS2Ig" type="3010" element="_HWyq4XGIEeWC_YQiieS2Ig"> - <styles xmi:type="notation:FontStyle" xmi:id="_HXJQNHGIEeWC_YQiieS2Ig" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HXJQNHGIEeWC_YQiieS2Ig" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_HXJQNXGIEeWC_YQiieS2Ig"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_x1uZVUgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x1uZVkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_x1uZV0gKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x1uZUUgKEeWO8ekbzmZQXg" fontColor="2697711" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x1uZUUgKEeWO8ekbzmZQXg" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x1uZUkgKEeWO8ekbzmZQXg" y="91"/> </children> <children xmi:type="notation:Node" xmi:id="_x1uZWEgKEeWO8ekbzmZQXg" type="3009" element="_x0wwAEgKEeWO8ekbzmZQXg"> <children xmi:type="notation:Node" xmi:id="_x1vAYEgKEeWO8ekbzmZQXg" type="5004"/> <children xmi:type="notation:Node" xmi:id="_x1vAYUgKEeWO8ekbzmZQXg" type="7003"> <children xmi:type="notation:Node" xmi:id="_x11HA0gKEeWO8ekbzmZQXg" type="3010" element="_x1FgIEgKEeWO8ekbzmZQXg"> - <styles xmi:type="notation:FontStyle" xmi:id="_x11HBEgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_x11HBEgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_x11HBUgKEeWO8ekbzmZQXg"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_x1vAYkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x1vAY0gKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_x1vAZEgKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x1uZWUgKEeWO8ekbzmZQXg" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x1uZWUgKEeWO8ekbzmZQXg" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x1uZWkgKEeWO8ekbzmZQXg" y="183"/> </children> <children xmi:type="notation:Node" xmi:id="_x1wOhEgKEeWO8ekbzmZQXg" type="3008" element="_x1H8YEgKEeWO8ekbzmZQXg"> @@ -86,10 +86,10 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_x11uFEgKEeWO8ekbzmZQXg" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_x12VJUgKEeWO8ekbzmZQXg" type="3003" element="_x1RGUEgKEeWO8ekbzmZQXg"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x12VJkgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x12VJkgKEeWO8ekbzmZQXg" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x12VJ0gKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x11uEUgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x11uEUgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x11uEkgKEeWO8ekbzmZQXg" width="30" height="30"/> </children> <children xmi:type="notation:Node" xmi:id="_x12VIEgKEeWO8ekbzmZQXg" type="3007" element="_x1SUcEgKEeWO8ekbzmZQXg"> @@ -97,17 +97,17 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_x12VJEgKEeWO8ekbzmZQXg" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_x13jQEgKEeWO8ekbzmZQXg" type="3003" element="_x1SUcUgKEeWO8ekbzmZQXg"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x13jQUgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x13jQUgKEeWO8ekbzmZQXg" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x13jQkgKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x12VIUgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x12VIUgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x12VIkgKEeWO8ekbzmZQXg" x="90" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_x1w1kUgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x1w1kkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_x1w1k0gKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x1wOhUgKEeWO8ekbzmZQXg" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x1wOhUgKEeWO8ekbzmZQXg" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x1wOhkgKEeWO8ekbzmZQXg" y="227"/> </children> <children xmi:type="notation:Node" xmi:id="_x1w1lEgKEeWO8ekbzmZQXg" type="3008" element="_x1JKgEgKEeWO8ekbzmZQXg"> @@ -118,17 +118,17 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_x14KVEgKEeWO8ekbzmZQXg" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_x14KVUgKEeWO8ekbzmZQXg" type="3003" element="_x1S7gUgKEeWO8ekbzmZQXg"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x14KVkgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x14KVkgKEeWO8ekbzmZQXg" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x14KV0gKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x14KUUgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x14KUUgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x14KUkgKEeWO8ekbzmZQXg" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_x1w1mUgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x1w1mkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_x1xcoEgKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x1w1lUgKEeWO8ekbzmZQXg" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x1w1lUgKEeWO8ekbzmZQXg" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x1w1lkgKEeWO8ekbzmZQXg" y="268"/> </children> <children xmi:type="notation:Node" xmi:id="_x1xcoUgKEeWO8ekbzmZQXg" type="3008" element="_x1K_sEgKEeWO8ekbzmZQXg"> @@ -139,23 +139,23 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_50vPRFWoEeWed_P9Y9XnRA" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_50v2UFWoEeWed_P9Y9XnRA" type="3003" element="_50msYVWoEeWed_P9Y9XnRA"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_50v2UVWoEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_50v2UVWoEeWed_P9Y9XnRA" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_50v2UlWoEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_50vPQVWoEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_50vPQVWoEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_50vPQlWoEeWed_P9Y9XnRA" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_x1xcpkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x1xcp0gKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_x1xcqEgKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x1xcokgKEeWO8ekbzmZQXg" fontColor="4108284" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x1xcokgKEeWO8ekbzmZQXg" fontColor="4108284" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x1xco0gKEeWO8ekbzmZQXg" y="335"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_x1rWBUgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x1rWBkgKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x1rWAUgKEeWO8ekbzmZQXg" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x1rWAUgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x1rWAkgKEeWO8ekbzmZQXg" x="64" y="16"/> </children> <children xmi:type="notation:Node" xmi:id="_x1rWB0gKEeWO8ekbzmZQXg" type="2002" element="_x0r3gEgKEeWO8ekbzmZQXg"> @@ -168,7 +168,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_x16mlkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_x16ml0gKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x16mkUgKEeWO8ekbzmZQXg" fontColor="4108284" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x16mkUgKEeWO8ekbzmZQXg" fontColor="4108284" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x16mkkgKEeWO8ekbzmZQXg" y="80" width="154" height="40"/> </children> <children xmi:type="notation:Node" xmi:id="_x17NoEgKEeWO8ekbzmZQXg" type="3008" element="_x1ehsEgKEeWO8ekbzmZQXg"> @@ -178,7 +178,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_x17NpkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_x17Np0gKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x17NoUgKEeWO8ekbzmZQXg" fontColor="4108284" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x17NoUgKEeWO8ekbzmZQXg" fontColor="4108284" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x17NokgKEeWO8ekbzmZQXg" y="120" width="154" height="40"/> </children> <children xmi:type="notation:Node" xmi:id="_1BaWkFuwEeWZQLQxIrHbCA" type="3009" element="_1A3kAFuwEeWZQLQxIrHbCA"> @@ -188,7 +188,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_1Ba9o1uwEeWZQLQxIrHbCA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_1Ba9pFuwEeWZQLQxIrHbCA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_1BaWkVuwEeWZQLQxIrHbCA" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_1BaWkVuwEeWZQLQxIrHbCA" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1BaWkluwEeWZQLQxIrHbCA" width="154" height="40"/> </children> <children xmi:type="notation:Node" xmi:id="_1Ba9pVuwEeWZQLQxIrHbCA" type="3009" element="_1A6AQVuwEeWZQLQxIrHbCA"> @@ -198,13 +198,13 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_1Bbks1uwEeWZQLQxIrHbCA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_1BbktFuwEeWZQLQxIrHbCA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_1Ba9pluwEeWZQLQxIrHbCA" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_1Ba9pluwEeWZQLQxIrHbCA" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Ba9p1uwEeWZQLQxIrHbCA" y="40" width="154" height="40"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_x1r9EkgKEeWO8ekbzmZQXg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_x1r9E0gKEeWO8ekbzmZQXg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_x1rWCEgKEeWO8ekbzmZQXg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_x1rWCEgKEeWO8ekbzmZQXg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x1rWCUgKEeWO8ekbzmZQXg" x="338" y="66" width="166"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_xGlbYkgKEeWO8ekbzmZQXg"/> @@ -431,66 +431,66 @@ <children xmi:type="notation:Node" xmi:id="_RkTIwEvNEeWf576mnYm4XQ" type="5004"/> <children xmi:type="notation:Node" xmi:id="_RkUW4EvNEeWf576mnYm4XQ" type="7003"> <children xmi:type="notation:Node" xmi:id="_YUfWQFWpEeWed_P9Y9XnRA" type="3010" element="_YTnMgFWpEeWed_P9Y9XnRA"> - <styles xmi:type="notation:FontStyle" xmi:id="_YUfWQVWpEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_YUfWQVWpEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_YUfWQlWpEeWed_P9Y9XnRA"/> </children> <children xmi:type="notation:Node" xmi:id="_YUf9UFWpEeWed_P9Y9XnRA" type="3010" element="_YT3EIVWpEeWed_P9Y9XnRA"> - <styles xmi:type="notation:FontStyle" xmi:id="_YUf9UVWpEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_YUf9UVWpEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_YUf9UlWpEeWed_P9Y9XnRA"/> </children> <children xmi:type="notation:Node" xmi:id="_YUf9U1WpEeWed_P9Y9XnRA" type="3010" element="_YT4SQVWpEeWed_P9Y9XnRA"> - <styles xmi:type="notation:FontStyle" xmi:id="_YUf9VFWpEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_YUf9VFWpEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_YUf9VVWpEeWed_P9Y9XnRA"/> </children> <children xmi:type="notation:Node" xmi:id="_YUgkYFWpEeWed_P9Y9XnRA" type="3010" element="_YT6ugFWpEeWed_P9Y9XnRA"> - <styles xmi:type="notation:FontStyle" xmi:id="_YUgkYVWpEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_YUgkYVWpEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_YUgkYlWpEeWed_P9Y9XnRA"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RkUW4UvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RkUW4kvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RkUW40vNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RkShsUvNEeWf576mnYm4XQ" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RkShsUvNEeWf576mnYm4XQ" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RkShskvNEeWf576mnYm4XQ" width="165" height="211"/> </children> <children xmi:type="notation:Node" xmi:id="_RkUW5EvNEeWf576mnYm4XQ" type="3009" element="_YTbmUFWpEeWed_P9Y9XnRA"> <children xmi:type="notation:Node" xmi:id="_RkU98EvNEeWf576mnYm4XQ" type="5004"/> <children xmi:type="notation:Node" xmi:id="_RkU98UvNEeWf576mnYm4XQ" type="7003"> <children xmi:type="notation:Node" xmi:id="_HXGz8HGIEeWC_YQiieS2Ig" type="3010" element="_HWESIHGIEeWC_YQiieS2Ig"> - <styles xmi:type="notation:FontStyle" xmi:id="_HXGz8XGIEeWC_YQiieS2Ig" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HXGz8XGIEeWC_YQiieS2Ig" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGz8nGIEeWC_YQiieS2Ig"/> </children> <children xmi:type="notation:Node" xmi:id="_HXGz83GIEeWC_YQiieS2Ig" type="3010" element="_HWESInGIEeWC_YQiieS2Ig"> - <styles xmi:type="notation:FontStyle" xmi:id="_HXGz9HGIEeWC_YQiieS2Ig" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HXGz9HGIEeWC_YQiieS2Ig" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGz9XGIEeWC_YQiieS2Ig"/> </children> <children xmi:type="notation:Node" xmi:id="_HXGz9nGIEeWC_YQiieS2Ig" type="3010" element="_HWE5MXGIEeWC_YQiieS2Ig"> - <styles xmi:type="notation:FontStyle" xmi:id="_HXGz93GIEeWC_YQiieS2Ig" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HXGz93GIEeWC_YQiieS2Ig" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_HXGz-HGIEeWC_YQiieS2Ig"/> </children> <children xmi:type="notation:Node" xmi:id="_HXHbAHGIEeWC_YQiieS2Ig" type="3010" element="_HWFgQXGIEeWC_YQiieS2Ig"> - <styles xmi:type="notation:FontStyle" xmi:id="_HXHbAXGIEeWC_YQiieS2Ig" fontName=".SF NS Text" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_HXHbAXGIEeWC_YQiieS2Ig" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_HXHbAnGIEeWC_YQiieS2Ig"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RkU98kvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RkU980vNEeWf576mnYm4XQ"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RkU99EvNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RkUW5UvNEeWf576mnYm4XQ" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RkUW5UvNEeWf576mnYm4XQ" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RkUW5kvNEeWf576mnYm4XQ" x="165" width="136" height="211"/> </children> <children xmi:type="notation:Node" xmi:id="_RkVlAEvNEeWf576mnYm4XQ" type="3009" element="_YTkwQFWpEeWed_P9Y9XnRA"> <children xmi:type="notation:Node" xmi:id="_RkVlA0vNEeWf576mnYm4XQ" type="5004"/> <children xmi:type="notation:Node" xmi:id="_RkVlBEvNEeWf576mnYm4XQ" type="7003"> <children xmi:type="notation:Node" xmi:id="_YUiZkFWpEeWed_P9Y9XnRA" type="3010" element="_YT-_8FWpEeWed_P9Y9XnRA"> - <styles xmi:type="notation:FontStyle" xmi:id="_YUiZkVWpEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_YUiZkVWpEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_YUiZklWpEeWed_P9Y9XnRA"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RkVlBUvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RkVlBkvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RkVlB0vNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RkVlAUvNEeWf576mnYm4XQ" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RkVlAUvNEeWf576mnYm4XQ" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RkVlAkvNEeWf576mnYm4XQ" x="301" width="130" height="211"/> </children> <children xmi:type="notation:Node" xmi:id="_RkXaNEvNEeWf576mnYm4XQ" type="3008" element="_Ri6BoEvNEeWf576mnYm4XQ"> @@ -501,10 +501,10 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_Rkq8MUvNEeWf576mnYm4XQ" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_RksKVUvNEeWf576mnYm4XQ" type="3003" element="_RjAvUUvNEeWf576mnYm4XQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RksKVkvNEeWf576mnYm4XQ" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RksKVkvNEeWf576mnYm4XQ" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RksKV0vNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RkqVIUvNEeWf576mnYm4XQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RkqVIUvNEeWf576mnYm4XQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RkqVIkvNEeWf576mnYm4XQ" x="39" y="43" width="30" height="30"/> </children> <children xmi:type="notation:Node" xmi:id="_RksKUEvNEeWf576mnYm4XQ" type="3007" element="_RjB9cEvNEeWf576mnYm4XQ"> @@ -512,17 +512,17 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_RksKVEvNEeWf576mnYm4XQ" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_RksxY0vNEeWf576mnYm4XQ" type="3003" element="_RjB9cUvNEeWf576mnYm4XQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RksxZEvNEeWf576mnYm4XQ" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RksxZEvNEeWf576mnYm4XQ" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RksxZUvNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RksKUUvNEeWf576mnYm4XQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RksKUUvNEeWf576mnYm4XQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RksKUkvNEeWf576mnYm4XQ" x="39" y="107" width="30" height="29"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RkYBQkvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RkYBQ0vNEeWf576mnYm4XQ"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RkYBREvNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RkXaNUvNEeWf576mnYm4XQ" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RkXaNUvNEeWf576mnYm4XQ" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RkXaNkvNEeWf576mnYm4XQ" x="431" width="122" height="211"/> </children> <children xmi:type="notation:Node" xmi:id="_RkYBRUvNEeWf576mnYm4XQ" type="3008" element="_Ri7PwEvNEeWf576mnYm4XQ"> @@ -533,17 +533,17 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_Rkt_gUvNEeWf576mnYm4XQ" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_Rkt_gkvNEeWf576mnYm4XQ" type="3003" element="_RjDLkEvNEeWf576mnYm4XQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_Rkt_g0vNEeWf576mnYm4XQ" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_Rkt_g0vNEeWf576mnYm4XQ" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rkt_hEvNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RktYcUvNEeWf576mnYm4XQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RktYcUvNEeWf576mnYm4XQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RktYckvNEeWf576mnYm4XQ" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RkYoUkvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RkYoU0vNEeWf576mnYm4XQ"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RkYoVEvNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RkYBRkvNEeWf576mnYm4XQ" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RkYBRkvNEeWf576mnYm4XQ" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RkYBR0vNEeWf576mnYm4XQ" x="553" width="156" height="211"/> </children> <children xmi:type="notation:Node" xmi:id="_RkYoVUvNEeWf576mnYm4XQ" type="3008" element="_Ri720UvNEeWf576mnYm4XQ"> @@ -554,23 +554,23 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_ALhLIVWpEeWed_P9Y9XnRA" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_ALhLIlWpEeWed_P9Y9XnRA" type="3003" element="_ALYBMVWpEeWed_P9Y9XnRA"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_ALhLI1WpEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_ALhLI1WpEeWed_P9Y9XnRA" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ALhLJFWpEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_ALgkEVWpEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_ALgkEVWpEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ALgkElWpEeWed_P9Y9XnRA" x="13" y="51" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RkZPYUvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RkZPYkvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RkZPY0vNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RkYoVkvNEeWf576mnYm4XQ" fontColor="4108284" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RkYoVkvNEeWf576mnYm4XQ" fontColor="4108284" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RkYoV0vNEeWf576mnYm4XQ" x="709" width="112" height="211"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RkQsgUvNEeWf576mnYm4XQ"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RkQsgkvNEeWf576mnYm4XQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RkNpMUvNEeWf576mnYm4XQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RkNpMUvNEeWf576mnYm4XQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RkNpMkvNEeWf576mnYm4XQ"/> </children> <children xmi:type="notation:Node" xmi:id="_BCggoDIrEeaYYdAEhPAPlw" type="2002" element="_Rh24wEvNEeWf576mnYm4XQ"> @@ -583,7 +583,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_Fqjp0zIrEeaYYdAEhPAPlw"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_Fqjp1DIrEeaYYdAEhPAPlw"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_FqjCwTIrEeaYYdAEhPAPlw" fontColor="4108284" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_FqjCwTIrEeaYYdAEhPAPlw" fontColor="4108284" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FqjCwjIrEeaYYdAEhPAPlw" x="80" width="40" height="222"/> </children> <children xmi:type="notation:Node" xmi:id="_Fqjp1TIrEeaYYdAEhPAPlw" type="3008" element="_Rj11wEvNEeWf576mnYm4XQ"> @@ -593,7 +593,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_FqkQ4zIrEeaYYdAEhPAPlw"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_FqkQ5DIrEeaYYdAEhPAPlw"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_Fqjp1jIrEeaYYdAEhPAPlw" fontColor="4108284" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_Fqjp1jIrEeaYYdAEhPAPlw" fontColor="4108284" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fqjp1zIrEeaYYdAEhPAPlw" x="120" width="103" height="222"/> </children> <children xmi:type="notation:Node" xmi:id="_Fqh0oDIrEeaYYdAEhPAPlw" type="3009" element="_1ALAcFuwEeWZQLQxIrHbCA"> @@ -603,7 +603,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_Fqh0pjIrEeaYYdAEhPAPlw"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_FqibsDIrEeaYYdAEhPAPlw"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_Fqh0oTIrEeaYYdAEhPAPlw" fontColor="2697711" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_Fqh0oTIrEeaYYdAEhPAPlw" fontColor="2697711" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fqh0ojIrEeaYYdAEhPAPlw" width="40" height="222"/> </children> <children xmi:type="notation:Node" xmi:id="_FqibsTIrEeaYYdAEhPAPlw" type="3009" element="_1AMOkFuwEeWZQLQxIrHbCA"> @@ -613,13 +613,13 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_FqibtzIrEeaYYdAEhPAPlw"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_FqibuDIrEeaYYdAEhPAPlw"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_FqibsjIrEeaYYdAEhPAPlw" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_FqibsjIrEeaYYdAEhPAPlw" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FqibszIrEeaYYdAEhPAPlw" x="40" width="40" height="222"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_BCggpTIrEeaYYdAEhPAPlw"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_BCggpjIrEeaYYdAEhPAPlw"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_BCggoTIrEeaYYdAEhPAPlw" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_BCggoTIrEeaYYdAEhPAPlw" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BCggojIrEeaYYdAEhPAPlw" x="940" y="125"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_Qj9tIkvNEeWf576mnYm4XQ"/> @@ -856,10 +856,10 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_XGv94VYDEeWPqujGg6x2EQ" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_XG0PUFYDEeWPqujGg6x2EQ" type="3004" element="_XGSq4VYDEeWPqujGg6x2EQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XG02YFYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XG02YFYDEeWPqujGg6x2EQ" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XG02YVYDEeWPqujGg6x2EQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XGuvwVYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XGuvwVYDEeWPqujGg6x2EQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XGuvwlYDEeWPqujGg6x2EQ" width="30" height="30"/> </children> <children xmi:type="notation:Node" xmi:id="_XGyaIFYDEeWPqujGg6x2EQ" visible="false" type="3007" element="_XGTR8FYDEeWPqujGg6x2EQ"> @@ -867,10 +867,10 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_XGyaJFYDEeWPqujGg6x2EQ" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_XG1dcFYDEeWPqujGg6x2EQ" type="3004" element="_XGTR8VYDEeWPqujGg6x2EQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XG1dcVYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XG1dcVYDEeWPqujGg6x2EQ" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XG1dclYDEeWPqujGg6x2EQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XGyaIVYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XGyaIVYDEeWPqujGg6x2EQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XGyaIlYDEeWPqujGg6x2EQ" width="30" height="30"/> </children> <children xmi:type="notation:Node" xmi:id="_XGzBMFYDEeWPqujGg6x2EQ" visible="false" type="3007" element="_XGTR8lYDEeWPqujGg6x2EQ"> @@ -878,17 +878,17 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_XGzoQVYDEeWPqujGg6x2EQ" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_XG2rkFYDEeWPqujGg6x2EQ" type="3004" element="_XGT5AFYDEeWPqujGg6x2EQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XG2rkVYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XG2rkVYDEeWPqujGg6x2EQ" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XG2rklYDEeWPqujGg6x2EQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XGzBMVYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XGzBMVYDEeWPqujGg6x2EQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XGzBMlYDEeWPqujGg6x2EQ" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_epeJEkvqEeWy2_k8Xc-0ww"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_epeJE0vqEeWy2_k8Xc-0ww"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_epeJFEvqEeWy2_k8Xc-0ww"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_epdiCEvqEeWy2_k8Xc-0ww" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_epdiCEvqEeWy2_k8Xc-0ww" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_epdiCUvqEeWy2_k8Xc-0ww"/> </children> <children xmi:type="notation:Node" xmi:id="_epeJFUvqEeWy2_k8Xc-0ww" visible="false" type="3008" element="_eovwUEvqEeWy2_k8Xc-0ww"> @@ -898,7 +898,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_epeJG0vqEeWy2_k8Xc-0ww"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_epeJHEvqEeWy2_k8Xc-0ww"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_epeJFkvqEeWy2_k8Xc-0ww" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_epeJFkvqEeWy2_k8Xc-0ww" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_epeJF0vqEeWy2_k8Xc-0ww" x="40"/> </children> <children xmi:type="notation:Node" xmi:id="_epewIEvqEeWy2_k8Xc-0ww" visible="false" type="3008" element="_eowXYEvqEeWy2_k8Xc-0ww"> @@ -911,7 +911,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_8LP0dlV4EeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_8LP0d1V4EeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_8LP0cVV4EeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_8LP0cVV4EeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8LP0clV4EeWed_P9Y9XnRA"/> </children> <children xmi:type="notation:Node" xmi:id="_HJI9MFWsEeWed_P9Y9XnRA" visible="false" type="3009" element="_XGVuMFYDEeWPqujGg6x2EQ"> @@ -921,14 +921,14 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_HJI9NlWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_HJI9N1WsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_HJI9MVWsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_HJI9MVWsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HJI9MlWsEeWed_P9Y9XnRA" y="40"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_epewJUvqEeWy2_k8Xc-0ww"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_epewJkvqEeWy2_k8Xc-0ww"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_epewJ0vqEeWy2_k8Xc-0ww"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_epewIUvqEeWy2_k8Xc-0ww" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_epewIUvqEeWy2_k8Xc-0ww" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_epewIkvqEeWy2_k8Xc-0ww" x="80"/> </children> <children xmi:type="notation:Node" xmi:id="_epewKEvqEeWy2_k8Xc-0ww" visible="false" type="3008" element="_eowXYkvqEeWy2_k8Xc-0ww"> @@ -938,13 +938,13 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_epfXM0vqEeWy2_k8Xc-0ww"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_epfXNEvqEeWy2_k8Xc-0ww"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_epewKUvqEeWy2_k8Xc-0ww" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_epewKUvqEeWy2_k8Xc-0ww" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_epewKkvqEeWy2_k8Xc-0ww" x="120"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_epc68kvqEeWy2_k8Xc-0ww"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_epc680vqEeWy2_k8Xc-0ww"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_epcT4UvqEeWy2_k8Xc-0ww" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_epcT4UvqEeWy2_k8Xc-0ww" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_epcT4kvqEeWy2_k8Xc-0ww" x="128" y="300"/> </children> <children xmi:type="notation:Node" xmi:id="_RtDA0FWsEeWed_P9Y9XnRA" type="2002" element="_RsyiIFWsEeWed_P9Y9XnRA"> @@ -958,10 +958,10 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_XG35sVYDEeWPqujGg6x2EQ" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_XG5H0FYDEeWPqujGg6x2EQ" type="3004" element="_XGYxgVYDEeWPqujGg6x2EQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XG5H0VYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XG5H0VYDEeWPqujGg6x2EQ" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XG5H0lYDEeWPqujGg6x2EQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XG3SoVYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XG3SoVYDEeWPqujGg6x2EQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XG3SolYDEeWPqujGg6x2EQ" width="30" height="30"/> </children> <children xmi:type="notation:Node" xmi:id="_XG35slYDEeWPqujGg6x2EQ" type="3007" element="_XGZYkFYDEeWPqujGg6x2EQ"> @@ -969,17 +969,17 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_XG4gwVYDEeWPqujGg6x2EQ" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_XG5u4FYDEeWPqujGg6x2EQ" type="3004" element="_XGZYkVYDEeWPqujGg6x2EQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XG5u4VYDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XG5u4VYDEeWPqujGg6x2EQ" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XG5u4lYDEeWPqujGg6x2EQ"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_XG35s1YDEeWPqujGg6x2EQ" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_XG35s1YDEeWPqujGg6x2EQ" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XG35tFYDEeWPqujGg6x2EQ" x="90" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RtDn5VWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RtDn5lWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RtEO8FWsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RtDn4VWsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8" italic="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RtDn4VWsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8" italic="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RtDn4lWsEeWed_P9Y9XnRA" width="83" height="265"/> </children> <children xmi:type="notation:Node" xmi:id="_RtEO8VWsEeWed_P9Y9XnRA" type="3008" element="_RszwQlWsEeWed_P9Y9XnRA"> @@ -992,28 +992,28 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_RtGrM1WsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RtGrNFWsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RtGEJFWsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RtGEJFWsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RtGEJVWsEeWed_P9Y9XnRA" width="127" height="115"/> </children> <children xmi:type="notation:Node" xmi:id="_RtGrNVWsEeWed_P9Y9XnRA" type="3009" element="_XGb00FYDEeWPqujGg6x2EQ"> <children xmi:type="notation:Node" xmi:id="_RtHSQFWsEeWed_P9Y9XnRA" type="5004"/> <children xmi:type="notation:Node" xmi:id="_RtHSQVWsEeWed_P9Y9XnRA" type="7003"> <children xmi:type="notation:Node" xmi:id="_1BhEQFuwEeWZQLQxIrHbCA" type="3010" element="_1BNiQFuwEeWZQLQxIrHbCA"> - <styles xmi:type="notation:FontStyle" xmi:id="_1BhEQVuwEeWZQLQxIrHbCA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_1BhEQVuwEeWZQLQxIrHbCA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_1BhEQluwEeWZQLQxIrHbCA"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RtHSQlWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RtHSQ1WsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RtHSRFWsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RtGrNlWsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RtGrNlWsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RtGrN1WsEeWed_P9Y9XnRA" y="115" width="127" height="123"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RtE2AVWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RtE2AlWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RtE2A1WsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RtEO8lWsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RtEO8lWsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RtEO81WsEeWed_P9Y9XnRA" x="83" width="128"/> </children> <children xmi:type="notation:Node" xmi:id="_RtE2BFWsEeWed_P9Y9XnRA" type="3008" element="_Rs0XUFWsEeWed_P9Y9XnRA"> @@ -1023,14 +1023,14 @@ <children xmi:type="notation:Node" xmi:id="_RtJHcFWsEeWed_P9Y9XnRA" type="5004"/> <children xmi:type="notation:Node" xmi:id="_RtJHcVWsEeWed_P9Y9XnRA" type="7003"> <children xmi:type="notation:Node" xmi:id="_1BhrUFuwEeWZQLQxIrHbCA" type="3010" element="_1BOwYFuwEeWZQLQxIrHbCA"> - <styles xmi:type="notation:FontStyle" xmi:id="_1BhrUVuwEeWZQLQxIrHbCA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:FontStyle" xmi:id="_1BhrUVuwEeWZQLQxIrHbCA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Location" xmi:id="_1BhrUluwEeWZQLQxIrHbCA"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RtJHclWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RtJHc1WsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RtJHdFWsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RtIgZ1WsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RtIgZ1WsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RtIgaFWsEeWed_P9Y9XnRA" width="171" height="130"/> </children> <children xmi:type="notation:Node" xmi:id="_RtJHdVWsEeWed_P9Y9XnRA" type="3009" element="_XGffMFYDEeWPqujGg6x2EQ"> @@ -1040,20 +1040,20 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_RtJHe1WsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RtJHfFWsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RtJHdlWsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RtJHdlWsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RtJHd1WsEeWed_P9Y9XnRA" y="130" width="171" height="106"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RtFdEVWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RtFdElWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_RtFdE1WsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RtE2BVWsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RtE2BVWsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RtE2BlWsEeWed_P9Y9XnRA" x="211" width="172"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_RtDA1VWsEeWed_P9Y9XnRA"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_RtDA1lWsEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_RtDA0VWsEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8" bold="true"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_RtDA0VWsEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8" bold="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RtDA0lWsEeWed_P9Y9XnRA" x="48" y="24"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_G0QAYkvqEeWy2_k8Xc-0ww"/> @@ -1268,10 +1268,10 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_VQv_cVVcEeWPBvASMVA0xg" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_VQ0Q4FVcEeWPBvASMVA0xg" type="3003" element="_VQC00FVcEeWPBvASMVA0xg"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ0Q4VVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ0Q4VVcEeWPBvASMVA0xg" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQ0Q4lVcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQuKQVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQuKQVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQuKQlVcEeWPBvASMVA0xg" width="30" height="30"/> </children> <children xmi:type="notation:Node" xmi:id="_VQybsFVcEeWPBvASMVA0xg" type="3007" element="_VQEC8FVcEeWPBvASMVA0xg"> @@ -1279,17 +1279,17 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_VQybtFVcEeWPBvASMVA0xg" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_VQ1fA1VcEeWPBvASMVA0xg" type="3003" element="_VQEqAFVcEeWPBvASMVA0xg"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ1fBFVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ1fBFVcEeWPBvASMVA0xg" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQ1fBVVcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQybsVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQybsVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQybslVcEeWPBvASMVA0xg" x="90" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_VQqf4VVcEeWPBvASMVA0xg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_VQqf4lVcEeWPBvASMVA0xg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_VQrG8FVcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQpRwVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQpRwVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQpRwlVcEeWPBvASMVA0xg"/> </children> <children xmi:type="notation:Node" xmi:id="_VQruAFVcEeWPBvASMVA0xg" type="3008" element="_VQAYkFVcEeWPBvASMVA0xg"> @@ -1300,17 +1300,17 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_VQ2tIVVcEeWPBvASMVA0xg" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_VQ2tIlVcEeWPBvASMVA0xg" type="3003" element="_VQFREVVcEeWPBvASMVA0xg"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ2tI1VcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ2tI1VcEeWPBvASMVA0xg" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQ2tJFVcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ2GEVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ2GEVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQ2GElVcEeWPBvASMVA0xg" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_VQsVEVVcEeWPBvASMVA0xg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_VQsVElVcEeWPBvASMVA0xg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_VQsVE1VcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQruAVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQruAVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQruAlVcEeWPBvASMVA0xg" y="40"/> </children> <children xmi:type="notation:Node" xmi:id="_VQsVFFVcEeWPBvASMVA0xg" type="3008" element="_VQBmsFVcEeWPBvASMVA0xg"> @@ -1321,23 +1321,23 @@ <layoutConstraint xmi:type="notation:Location" xmi:id="_i8m7kVWVEeWed_P9Y9XnRA" y="5"/> </children> <children xmi:type="notation:Node" xmi:id="_i8rNAFWVEeWed_P9Y9XnRA" type="3003" element="_VQDb4VVcEeWPBvASMVA0xg"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_i8rNAVWVEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_i8rNAVWVEeWed_P9Y9XnRA" fontName="Comic Sans MS"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i8rNAlWVEeWed_P9Y9XnRA"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_i8mUgVWVEeWed_P9Y9XnRA" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_i8mUgVWVEeWed_P9Y9XnRA" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i8mUglWVEeWed_P9Y9XnRA" width="30" height="30"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_VQs8IlVcEeWPBvASMVA0xg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_VQs8I1VcEeWPBvASMVA0xg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_VQs8JFVcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQsVFVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQsVFVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQsVFlVcEeWPBvASMVA0xg" y="80"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_VQgH0VVcEeWPBvASMVA0xg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_VQgH0lVcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQT6kVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQT6kVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQT6klVcEeWPBvASMVA0xg" x="16" y="24"/> </children> <children xmi:type="notation:Node" xmi:id="_VQlnYFVcEeWPBvASMVA0xg" visible="false" type="2002" element="_VP-jYFVcEeWPBvASMVA0xg"> @@ -1350,7 +1350,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_VQ37QlVcEeWPBvASMVA0xg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_VQ37Q1VcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ3UMVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ3UMVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQ3UMlVcEeWPBvASMVA0xg"/> </children> <children xmi:type="notation:Node" xmi:id="_VQ37RFVcEeWPBvASMVA0xg" visible="false" type="3008" element="_VQHGQFVcEeWPBvASMVA0xg"> @@ -1360,13 +1360,13 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_VQ4iU1VcEeWPBvASMVA0xg"/> <styles xmi:type="notation:DrawerStyle" xmi:id="_VQ4iVFVcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ37RVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQ37RVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQ37RlVcEeWPBvASMVA0xg" y="40"/> </children> <styles xmi:type="notation:SortingStyle" xmi:id="_VQmOclVcEeWPBvASMVA0xg"/> <styles xmi:type="notation:FilteringStyle" xmi:id="_VQmOc1VcEeWPBvASMVA0xg"/> </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_VQlnYVVcEeWPBvASMVA0xg" fontName=".Helvetica Neue DeskInterface" fontHeight="8"/> + <styles xmi:type="notation:ShapeStyle" xmi:id="_VQlnYVVcEeWPBvASMVA0xg" fontName="Comic Sans MS" fontHeight="8"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VQlnYlVcEeWPBvASMVA0xg" x="608" y="116"/> </children> <styles xmi:type="notation:DiagramStyle" xmi:id="_HdGwJkvqEeWy2_k8Xc-0ww"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsLayoutTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsLayoutTest.java index 6a0a56abd1..a9adc4c10d 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsLayoutTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsLayoutTest.java @@ -37,6 +37,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart; import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure; import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor; +import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants; import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.draw2d.ui.figures.OneLineBorder; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; @@ -45,6 +46,8 @@ import org.eclipse.gmf.runtime.notation.Location; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.Size; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys; import org.eclipse.sirius.business.api.session.SessionStatus; import org.eclipse.sirius.common.tools.api.util.ReflectionHelper; @@ -67,10 +70,12 @@ import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramListEditPart; import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDNodeContainerCompartmentEditPart; import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDiagramElementContainerNameEditPart; +import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin; import org.eclipse.sirius.diagram.ui.tools.api.figure.AlphaDropShadowBorder; import org.eclipse.sirius.diagram.ui.tools.api.figure.GradientRoundedRectangle; import org.eclipse.sirius.diagram.ui.tools.api.figure.SiriusWrapLabel; import org.eclipse.sirius.diagram.ui.tools.api.figure.ViewNodeContainerFigureDesc; +import org.eclipse.sirius.diagram.ui.tools.api.layout.LayoutUtils; import org.eclipse.sirius.diagram.ui.tools.internal.figure.LabelBorderStyleIds; import org.eclipse.sirius.diagram.ui.tools.internal.figure.RegionRoundedGradientRectangle; import org.eclipse.sirius.diagram.ui.tools.internal.figure.RoundedCornerMarginBorder; @@ -82,6 +87,7 @@ import org.eclipse.sirius.viewpoint.LabelAlignment; import org.eclipse.sirius.viewpoint.ViewpointPackage; import org.eclipse.sirius.viewpoint.description.style.LabelBorderStyleDescription; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.FontData; import org.junit.Assert; import com.google.common.collect.Iterables; @@ -112,6 +118,8 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo private DiagramEditor editor; + private String oldFont; + @Override protected void setUp() throws Exception { super.setUp(); @@ -119,12 +127,15 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo TestsUtil.synchronizationWithUIThread(); changeSiriusPreference(SiriusPreferencesKeys.PREF_AUTO_REFRESH.name(), true); + oldFont = changeDefaultFontName("Comic Sans MS"); } @Override protected void tearDown() throws Exception { DialectUIManager.INSTANCE.closeEditor(editor, false); - + if (oldFont != null) { + changeDefaultFontName(oldFont); + } super.tearDown(); } @@ -206,13 +217,13 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo assertEquals("Session should not be dirty.", SessionStatus.SYNC, session.getStatus()); - checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(0, 0, -1, -1), new Rectangle(0, 0, 831, 247)); - checkBounds(LEFT_CLASS_NAME, new Rectangle(0, 0, 165, 211), new Rectangle(0, 0, 165, 211)); - checkBounds(CENTER_CLASS_NAME, new Rectangle(165, 0, 136, 211), new Rectangle(165, 0, 136, 211)); - checkBounds(RIGHT_CLASS_NAME, new Rectangle(301, 0, 130, 211), new Rectangle(301, 0, 130, 211)); - checkBounds(LEFT_PKG_NAME, new Rectangle(431, 0, 122, 211), new Rectangle(431, 0, 122, 211)); - checkBounds(CENTER_PKG_NAME, new Rectangle(553, 0, 156, 211), new Rectangle(553, 0, 156, 211)); - checkBounds(RIGHT_PKG_NAME, new Rectangle(709, 0, 112, 211), new Rectangle(709, 0, 112, 211)); + checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(0, 0, -1, -1), INITIAL_HORIZONTAL_FIRST_REGION_CONTAINER_BOUNDS, 0, 1); + checkBounds(LEFT_CLASS_NAME, INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS, INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS); + checkBounds(CENTER_CLASS_NAME, INITIAL_HORIZONTAL_CENTER_CLASS_BOUNDS, INITIAL_HORIZONTAL_CENTER_CLASS_BOUNDS); + checkBounds(RIGHT_CLASS_NAME, INITIAL_HORIZONTAL_RIGHT_CLASS_BOUNDS, INITIAL_HORIZONTAL_RIGHT_CLASS_BOUNDS); + checkBounds(LEFT_PKG_NAME, INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS, INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS); + checkBounds(CENTER_PKG_NAME, INITIAL_HORIZONTAL_CENTER_PKG_BOUNDS, INITIAL_HORIZONTAL_CENTER_PKG_BOUNDS); + checkBounds(RIGHT_PKG_NAME, INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS, INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS); doTestInitialLayout(ContainerLayout.HORIZONTAL_STACK, 4, 20, 2); } @@ -227,20 +238,45 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo assertEquals("Session should not be dirty.", SessionStatus.SYNC, session.getStatus()); - checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(64, 16, -1, -1), new Rectangle(64, 16, 141, 414)); - checkBounds(LEFT_CLASS_NAME, new Rectangle(0, 0, -1, -1), new Rectangle(0, 0, 129, 91)); - checkBounds(CENTER_CLASS_NAME, new Rectangle(0, 91, -1, -1), new Rectangle(0, 91, 129, 92)); - checkBounds(RIGHT_CLASS_NAME, new Rectangle(0, 183, -1, -1), new Rectangle(0, 183, 129, 44)); - checkBounds(LEFT_PKG_NAME, new Rectangle(0, 227, -1, -1), new Rectangle(0, 227, 129, 41)); - checkBounds(CENTER_PKG_NAME, new Rectangle(0, 268, -1, -1), new Rectangle(0, 268, 129, 67)); - checkBounds(RIGHT_PKG_NAME, new Rectangle(0, 335, -1, -1), new Rectangle(0, 335, 129, 41)); + // Each vertical region can have a delta according to what is expected + // because of font height on each OS. Height deltas of each region have + // an incidence on the global container height. We must cumulate them to + // make a reasonable assert at the end. + int heightDeltas = 0; + + // Delta of 5 pixels because there are 5 lines (with potential 1 delta + // pixel) + Rectangle leftClassBounds = checkBounds(LEFT_CLASS_NAME, new Rectangle(0, 0, -1, -1), INITIAL_VERTICAL_LEFT_CLASS_BOUNDS, 0, 5); + heightDeltas += leftClassBounds.height - INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.height; + // Delta of 5 pixels because there are 5 lines (with potential 1 delta + // pixel) + Rectangle centerClassBounds = checkBounds(CENTER_CLASS_NAME, new Rectangle(0, INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.y, -1, -1), + INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.getTranslated(0, heightDeltas), 0, 5); + heightDeltas += centerClassBounds.height - INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.height; + // Delta of 2 pixels because there are 2 lines (with potential 1 delta + // pixel) + Rectangle rightClassBounds = checkBounds(RIGHT_CLASS_NAME, new Rectangle(0, INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.y, -1, -1), INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.getTranslated(0, heightDeltas), + 0, 2); + heightDeltas += rightClassBounds.height - INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.height; + Rectangle leftPkgBounds = checkBounds(LEFT_PKG_NAME, new Rectangle(0, INITIAL_VERTICAL_LEFT_PKG_BOUNDS.y, -1, -1), INITIAL_VERTICAL_LEFT_PKG_BOUNDS.getTranslated(0, heightDeltas)); + heightDeltas += leftPkgBounds.height - INITIAL_VERTICAL_LEFT_PKG_BOUNDS.height; + // Delta of 1 pixel because there is 1 line (with potential 1 delta + // pixel) + Rectangle centerPkgBounds = checkBounds(CENTER_PKG_NAME, new Rectangle(0, INITIAL_VERTICAL_CENTER_PKG_BOUNDS.y, -1, -1), INITIAL_VERTICAL_CENTER_PKG_BOUNDS.getTranslated(0, heightDeltas), 0, + 1); + heightDeltas += centerPkgBounds.height - INITIAL_VERTICAL_CENTER_PKG_BOUNDS.height; + Rectangle rightPkgBounds = checkBounds(RIGHT_PKG_NAME, new Rectangle(0, INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.y, -1, -1), INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.getTranslated(0, heightDeltas)); + heightDeltas += rightPkgBounds.height - INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.height; + Rectangle firstRegionBounds = checkBounds(FIRST_REGION_CONTAINER_NAME, + new Rectangle(INITIAL_VERTICAL_FIRST_REGION_CONTAINER_BOUNDS.x, INITIAL_VERTICAL_FIRST_REGION_CONTAINER_BOUNDS.y, -1, -1), new Rectangle(64, 16, 141, -1)); + assertEquals("Wrong Draw2D height for " + FIRST_REGION_CONTAINER_NAME, INITIAL_VERTICAL_FIRST_REGION_CONTAINER_BOUNDS.height + heightDeltas, firstRegionBounds.height(), 1); doTestInitialLayout(ContainerLayout.VERTICAL_STACK, 5, 10, 1); } /** * Check that the bounds (GMF and Draw2D) are as expected. - * + * * @param label * Label of the container to check. * @param expectedGmfBounds @@ -250,15 +286,46 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo * this bounds is equal to -1, we don't check it. This is useful * in case of size that depends on Font (with different result * according to OS). + * @return the current DrawD2 bounds */ - private void checkBounds(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds) { + private Rectangle checkBounds(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds) { + return checkBounds(label, expectedGmfBounds, expectedFigureBounds, 0, 0); + } + + /** + * Check that the bounds (GMF and Draw2D) are as expected. + * + * @param label + * Label of the container to check. + * @param expectedGmfBounds + * The GMF expected bounds + * @param expectedFigureBounds + * The draw2d expected bounds. If the x, y , width or height in + * this bounds is equal to -1, we don't check it. This is useful + * in case of size that depends on Font (with different result + * according to OS). + * @param widthDelta + * The width delta to consider the width as equal (because of + * font size that can be slightly different on each OS). + * @param heightDelta + * The height delta to consider the height as equal (because of + * font size that can be slightly different on each OS). + * @return the current DrawD2 bounds + */ + private Rectangle checkBounds(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds, int widthDelta, int heightDelta) { DDiagramElementContainer region = getDiagramElementsFromLabel(diagram, label, DDiagramElementContainer.class).get(0); AbstractDiagramElementContainerEditPart editPart = (AbstractDiagramElementContainerEditPart) getEditPart(region); IFigure mainFigure = editPart.getMainFigure(); assertEquals("Wrong GMF bounds for " + label, expectedGmfBounds, getBounds((Node) editPart.getNotationView())); if (expectedFigureBounds.x() != -1 && expectedFigureBounds.y() != -1 && expectedFigureBounds.width() != -1 && expectedFigureBounds.height() != -1) { - assertEquals("Wrong Draw2D bounds for " + label, expectedFigureBounds, mainFigure.getBounds()); + if (widthDelta == 0 && heightDelta == 0) { + assertEquals("Wrong Draw2D bounds for " + label, expectedFigureBounds, mainFigure.getBounds()); + } else { + assertEquals("Wrong Draw2D location for " + label, expectedFigureBounds.getLocation(), mainFigure.getBounds().getLocation()); + assertEquals("Wrong Draw2D width for " + label, expectedFigureBounds.width(), mainFigure.getBounds().width(), widthDelta); + assertEquals("Wrong Draw2D height for " + label, expectedFigureBounds.height(), mainFigure.getBounds().height(), heightDelta); + } } else { if (expectedFigureBounds.x() != -1) { assertEquals("Wrong Draw2D x for " + label, expectedFigureBounds.x(), mainFigure.getBounds().x()); @@ -267,10 +334,10 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo assertEquals("Wrong Draw2D y for " + label, expectedFigureBounds.y(), mainFigure.getBounds().y()); } if (expectedFigureBounds.width() != -1) { - assertEquals("Wrong Draw2D width for " + label, expectedFigureBounds.width(), mainFigure.getBounds().width()); + assertEquals("Wrong Draw2D width for " + label, expectedFigureBounds.width(), mainFigure.getBounds().width(), widthDelta); } if (expectedFigureBounds.height() != -1) { - assertEquals("Wrong Draw2D height for " + label, expectedFigureBounds.height(), mainFigure.getBounds().height()); + assertEquals("Wrong Draw2D height for " + label, expectedFigureBounds.height(), mainFigure.getBounds().height(), heightDelta); } } @@ -282,6 +349,8 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo } else if (editPart instanceof IDiagramContainerEditPart) { assertNull("Wrong border for " + label + ": the BorderItemsAwareFreeFormLayer used as content pane of a freeform region should not have a border.", border); } + + return mainFigure.getBounds(); } private Rectangle getBounds(Node notationView) { @@ -565,13 +634,24 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo doTestReorderedLayout(ContainerLayout.HORIZONTAL_STACK, 4, 20, 2); - checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(0, 0, -1, -1), new Rectangle(0, 0, 831, 247)); - checkBounds(LEFT_CLASS_NAME, new Rectangle(136, 0, 165, 211), new Rectangle(136, 0, 165, 211)); - checkBounds(CENTER_CLASS_NAME, new Rectangle(0, 0, 136, 211), new Rectangle(0, 0, 136, 211)); - checkBounds(RIGHT_CLASS_NAME, new Rectangle(301, 0, 130, 211), new Rectangle(301, 0, 130, 211)); - checkBounds(LEFT_PKG_NAME, new Rectangle(543, 0, 122, 211), new Rectangle(543, 0, 122, 211)); - checkBounds(CENTER_PKG_NAME, new Rectangle(665, 0, 156, 211), new Rectangle(665, 0, 156, 211)); - checkBounds(RIGHT_PKG_NAME, new Rectangle(431, 0, 112, 211), new Rectangle(431, 0, 112, 211)); + checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(0, 0, -1, -1), INITIAL_HORIZONTAL_FIRST_REGION_CONTAINER_BOUNDS, 0, 1); + Rectangle centerClassBoundsExpectedAfterReorder = new Rectangle(INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS.x, INITIAL_HORIZONTAL_CENTER_CLASS_BOUNDS.y, INITIAL_HORIZONTAL_CENTER_CLASS_BOUNDS.width, + INITIAL_HORIZONTAL_CENTER_CLASS_BOUNDS.height); + checkBounds(CENTER_CLASS_NAME, centerClassBoundsExpectedAfterReorder, centerClassBoundsExpectedAfterReorder); + Rectangle leftClassBoundsExpectedAfterReorder = new Rectangle(INITIAL_HORIZONTAL_CENTER_CLASS_BOUNDS.width, INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS.y, INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS.width, + INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS.height); + checkBounds(LEFT_CLASS_NAME, leftClassBoundsExpectedAfterReorder, leftClassBoundsExpectedAfterReorder); + checkBounds(RIGHT_CLASS_NAME, INITIAL_HORIZONTAL_RIGHT_CLASS_BOUNDS, INITIAL_HORIZONTAL_RIGHT_CLASS_BOUNDS); + Rectangle rightPackageBoundsExpectedAfterReorder = new Rectangle(INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS.x, INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS.y, INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS.width, + INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS.height); + checkBounds(RIGHT_PKG_NAME, rightPackageBoundsExpectedAfterReorder, rightPackageBoundsExpectedAfterReorder); + Rectangle leftPackageBoundsExpectedAfterReorder = new Rectangle(INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS.x + INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS.width, INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS.y, + INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS.width, INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS.height); + checkBounds(LEFT_PKG_NAME, leftPackageBoundsExpectedAfterReorder, leftPackageBoundsExpectedAfterReorder); + Rectangle centerPackageBoundsExpectedAfterReorder = new Rectangle(INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS.x + INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS.width + INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS.width, + INITIAL_HORIZONTAL_CENTER_PKG_BOUNDS.y, INITIAL_HORIZONTAL_CENTER_PKG_BOUNDS.width, INITIAL_HORIZONTAL_CENTER_PKG_BOUNDS.height); + checkBounds(CENTER_PKG_NAME, centerPackageBoundsExpectedAfterReorder, centerPackageBoundsExpectedAfterReorder); + } /** @@ -589,13 +669,43 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo doTestReorderedLayout(ContainerLayout.VERTICAL_STACK, 5, 10, 1); - checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(64, 16, -1, -1), new Rectangle(64, 16, 141, 414)); - checkBounds(LEFT_CLASS_NAME, new Rectangle(0, 92, -1, -1), new Rectangle(0, 91, 129, 92)); - checkBounds(CENTER_CLASS_NAME, new Rectangle(0, 0, -1, -1), new Rectangle(0, 0, 129, 91)); - checkBounds(RIGHT_CLASS_NAME, new Rectangle(0, 183, -1, -1), new Rectangle(0, 183, 129, 44)); - checkBounds(LEFT_PKG_NAME, new Rectangle(0, 268, -1, -1), new Rectangle(0, 268, 129, 41)); - checkBounds(CENTER_PKG_NAME, new Rectangle(0, 309, -1, -1), new Rectangle(0, 309, 129, 67)); - checkBounds(RIGHT_PKG_NAME, new Rectangle(0, 227, -1, -1), new Rectangle(0, 227, 129, 41)); + // Each vertical region can have a delta according to what is expected + // because of font height on each OS. Height deltas of each region have + // an incidence on the global container height. We must cumulate them to + // make a reasonable assert at the end. + int heightDeltas = 0; + + // Delta of 5 pixels because there are 5 lines (with potential 1 delta + // pixel) + // 1 is removed to the INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.height as + // this region is now the first one. This is because of bug 496742 that + // will be fixed later. + Rectangle centerClassBounds = checkBounds(CENTER_CLASS_NAME, new Rectangle(0, 0, -1, -1), + new Rectangle(0, 0, INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.width, INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.height - 1), 0, 5); + heightDeltas += centerClassBounds.height - INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.height - 1; + // Delta of 5 pixels because there are 5 lines (with potential 1 delta + // pixel) + Rectangle leftClassBounds = checkBounds(LEFT_CLASS_NAME, new Rectangle(0, centerClassBounds.y + centerClassBounds.height + 1, -1, -1), + INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.getTranslated(0, centerClassBounds.height).getResized(0, 1), 0, 5); + heightDeltas += leftClassBounds.height - INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.height + 1; + // Delta of 2 pixels because there are 2 lines (with potential 1 delta + // pixel) + Rectangle rightClassBounds = checkBounds(RIGHT_CLASS_NAME, new Rectangle(0, leftClassBounds.y + leftClassBounds.height, -1, -1), + INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.getTranslated(0, heightDeltas), 0, 2); + heightDeltas += rightClassBounds.height - INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.height; + Rectangle rightPkgBounds = checkBounds(RIGHT_PKG_NAME, new Rectangle(0, rightClassBounds.y + rightClassBounds.height, -1, -1), + INITIAL_VERTICAL_LEFT_PKG_BOUNDS.getTranslated(0, heightDeltas).setSize(INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.width, INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.height)); + heightDeltas += rightPkgBounds.height - INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.height; + Rectangle leftPkgBounds = checkBounds(LEFT_PKG_NAME, new Rectangle(0, rightPkgBounds.y + rightPkgBounds.height, -1, -1), + INITIAL_VERTICAL_LEFT_PKG_BOUNDS.getCopy().setLocation(0, rightPkgBounds.y + rightPkgBounds.height)); + heightDeltas += leftPkgBounds.height - INITIAL_VERTICAL_LEFT_PKG_BOUNDS.height; + // Delta of 1 pixel because there is 1 line (with potential 1 delta + // pixel) + Rectangle centerPkgBounds = checkBounds(CENTER_PKG_NAME, new Rectangle(0, leftPkgBounds.y + leftPkgBounds.height, -1, -1), + INITIAL_VERTICAL_CENTER_PKG_BOUNDS.getCopy().setLocation(0, leftPkgBounds.y + leftPkgBounds.height), 0, 1); + heightDeltas += centerPkgBounds.height - INITIAL_VERTICAL_CENTER_PKG_BOUNDS.height; + Rectangle firstRegionBounds = checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(64, 16, -1, -1), new Rectangle(64, 16, 141, -1)); + assertEquals("Wrong Draw2D height for " + FIRST_REGION_CONTAINER_NAME, INITIAL_VERTICAL_FIRST_REGION_CONTAINER_BOUNDS.height + heightDeltas, firstRegionBounds.height(), 1); } /** @@ -611,7 +721,7 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo doTestRemoveSemantic(ContainerLayout.HORIZONTAL_STACK, 4, 20, 2); - checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(0, 0, -1, -1), new Rectangle(0, 0, 666, 247)); + checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(0, 0, -1, -1), INITIAL_HORIZONTAL_FIRST_REGION_CONTAINER_BOUNDS.getResized(-INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS.width, 0), 0, 1); checkBounds(CENTER_CLASS_NAME, new Rectangle(0, 0, 136, 211), new Rectangle(0, 0, 136, 211)); checkBounds(RIGHT_CLASS_NAME, new Rectangle(136, 0, 130, 211), new Rectangle(136, 0, 130, 211)); checkBounds(LEFT_PKG_NAME, new Rectangle(266, 0, 122, 211), new Rectangle(266, 0, 122, 211)); @@ -632,12 +742,35 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo doTestRemoveSemantic(ContainerLayout.VERTICAL_STACK, 5, 10, 1); - checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(64, 16, -1, -1), new Rectangle(64, 16, 141, 322)); - checkBounds(CENTER_CLASS_NAME, new Rectangle(0, 0, -1, -1), new Rectangle(0, 0, 129, 91)); - checkBounds(RIGHT_CLASS_NAME, new Rectangle(0, 92, -1, -1), new Rectangle(0, 91, 129, 44)); - checkBounds(LEFT_PKG_NAME, new Rectangle(0, 136, -1, -1), new Rectangle(0, 135, 129, 41)); - checkBounds(CENTER_PKG_NAME, new Rectangle(0, 177, -1, -1), new Rectangle(0, 176, 129, 67)); - checkBounds(RIGHT_PKG_NAME, new Rectangle(0, 244, -1, -1), new Rectangle(0, 243, 129, 41)); + // Each vertical region can have a delta according to what is expected + // because of font height on each OS. Height deltas of each region have + // an incidence on the global container height. We must cumulate them to + // make a reasonable assert at the end. + int heightDeltas = 0; + + // Delta of 5 pixels because there are 5 lines (with potential 1 delta + // pixel) + Rectangle centerClassBounds = checkBounds(CENTER_CLASS_NAME, new Rectangle(0, 0, -1, -1), INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.getCopy().setLocation(0, 0).getResized(0, -1), 0, 5); + heightDeltas += centerClassBounds.height - INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.height; + // Delta of 2 pixels because there are 2 lines (with potential 1 delta + // pixel) + Rectangle rightClassBounds = checkBounds(RIGHT_CLASS_NAME, new Rectangle(0, centerClassBounds.y + centerClassBounds.height + 1, -1, -1), + INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.getTranslated(0, heightDeltas - INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.height), 0, 2); + heightDeltas += rightClassBounds.height - INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.height; + Rectangle leftPkgBounds = checkBounds(LEFT_PKG_NAME, new Rectangle(0, rightClassBounds.y + rightClassBounds.height + 1, -1, -1), + INITIAL_VERTICAL_LEFT_PKG_BOUNDS.getTranslated(0, heightDeltas - INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.height)); + heightDeltas += leftPkgBounds.height - INITIAL_VERTICAL_LEFT_PKG_BOUNDS.height; + // Delta of 1 pixel because there is 1 line (with potential 1 delta + // pixel) + Rectangle centerPkgBounds = checkBounds(CENTER_PKG_NAME, new Rectangle(0, leftPkgBounds.y + leftPkgBounds.height + 1, -1, -1), + INITIAL_VERTICAL_CENTER_PKG_BOUNDS.getTranslated(0, heightDeltas - INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.height), 0, 1); + heightDeltas += centerPkgBounds.height - INITIAL_VERTICAL_CENTER_PKG_BOUNDS.height; + Rectangle rightPkgBounds = checkBounds(RIGHT_PKG_NAME, new Rectangle(0, centerPkgBounds.y + centerPkgBounds.height + 1, -1, -1), + INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.getTranslated(0, heightDeltas - INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.height)); + heightDeltas += rightPkgBounds.height - INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.height; + Rectangle firstRegionBounds = checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(64, 16, -1, -1), new Rectangle(64, 16, 141, -1)); + assertEquals("Wrong Draw2D height for " + FIRST_REGION_CONTAINER_NAME, INITIAL_VERTICAL_FIRST_REGION_CONTAINER_BOUNDS.height + heightDeltas - INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.height, + firstRegionBounds.height(), 1); } /** @@ -653,14 +786,22 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo doTestAddSemantic(ContainerLayout.HORIZONTAL_STACK, 4, 20, 2); - checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(0, 0, -1, -1), new Rectangle(0, 0, -1, 247)); - checkBounds(LEFT_CLASS_NAME, new Rectangle(0, 0, 165, 211), new Rectangle(0, 0, 165, 211)); - checkBounds(LEFT_CLASS2_NAME, new Rectangle(165, 0, -1, -1), new Rectangle(165, 0, -1, 211)); - checkBounds(CENTER_CLASS_NAME, new Rectangle(330, 0, 136, 211), new Rectangle(-1, 0, 136, 211)); - checkBounds(RIGHT_CLASS_NAME, new Rectangle(466, 0, 130, 211), new Rectangle(-1, 0, 130, 211)); - checkBounds(LEFT_PKG_NAME, new Rectangle(596, 0, 122, 211), new Rectangle(-1, 0, 122, 211)); - checkBounds(CENTER_PKG_NAME, new Rectangle(718, 0, 156, 211), new Rectangle(-1, 0, 156, 211)); - checkBounds(RIGHT_PKG_NAME, new Rectangle(874, 0, 112, 211), new Rectangle(-1, 0, 112, 211)); + // We add 40 pixels (default region size for a new list) at each x GMF + // location after inserted element. + checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(0, 0, -1, -1), + INITIAL_HORIZONTAL_FIRST_REGION_CONTAINER_BOUNDS.getResized(-INITIAL_HORIZONTAL_FIRST_REGION_CONTAINER_BOUNDS.width() - 1, 0), 0, 1); + Rectangle leftClassBounds = checkBounds(LEFT_CLASS_NAME, INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS, INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS); + Rectangle leftClass2Bounds = checkBounds(LEFT_CLASS2_NAME, new Rectangle(leftClassBounds.width, 0, -1, -1), new Rectangle(leftClassBounds.width, 0, -1, 211)); + Rectangle centerClassBounds = checkBounds(CENTER_CLASS_NAME, new Rectangle(INITIAL_HORIZONTAL_CENTER_CLASS_BOUNDS.x + LayoutUtils.NEW_DEFAULT_CONTAINER_DIMENSION.width, 0, 136, 211), + new Rectangle(leftClass2Bounds.x + leftClass2Bounds.width, 0, 136, 211)); + Rectangle rightClassBounds = checkBounds(RIGHT_CLASS_NAME, new Rectangle(INITIAL_HORIZONTAL_RIGHT_CLASS_BOUNDS.x + LayoutUtils.NEW_DEFAULT_CONTAINER_DIMENSION.width, 0, 130, 211), + new Rectangle(centerClassBounds.x + centerClassBounds.width, 0, 130, 211)); + Rectangle leftPkgBounds = checkBounds(LEFT_PKG_NAME, new Rectangle(INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS.x + LayoutUtils.NEW_DEFAULT_CONTAINER_DIMENSION.width, 0, 122, 211), + new Rectangle(rightClassBounds.x + rightClassBounds.width, 0, 122, 211)); + Rectangle centerPkgBounds = checkBounds(CENTER_PKG_NAME, new Rectangle(INITIAL_HORIZONTAL_CENTER_PKG_BOUNDS.x + LayoutUtils.NEW_DEFAULT_CONTAINER_DIMENSION.width, 0, 156, 211), + new Rectangle(leftPkgBounds.x + leftPkgBounds.width, 0, 156, 211)); + checkBounds(RIGHT_PKG_NAME, new Rectangle(INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS.x + LayoutUtils.NEW_DEFAULT_CONTAINER_DIMENSION.width, 0, 112, 211), + new Rectangle(centerPkgBounds.x + centerPkgBounds.width, 0, 112, 211)); } /** @@ -676,14 +817,44 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo doTestAddSemantic(ContainerLayout.VERTICAL_STACK, 5, 10, 1); - checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(64, 16, -1, -1), new Rectangle(64, 16, 141, 454)); - checkBounds(LEFT_CLASS_NAME, new Rectangle(0, 0, -1, -1), new Rectangle(0, 0, 129, 91)); - checkBounds(LEFT_CLASS2_NAME, new Rectangle(0, 91, -1, -1), new Rectangle(0, 91, 129, 40)); - checkBounds(CENTER_CLASS_NAME, new Rectangle(0, 182, -1, -1), new Rectangle(0, 131, 129, 92)); - checkBounds(RIGHT_CLASS_NAME, new Rectangle(0, 274, -1, -1), new Rectangle(0, 223, 129, 44)); - checkBounds(LEFT_PKG_NAME, new Rectangle(0, 318, -1, -1), new Rectangle(0, 267, 129, 41)); - checkBounds(CENTER_PKG_NAME, new Rectangle(0, 359, -1, -1), new Rectangle(0, 308, 129, 67)); - checkBounds(RIGHT_PKG_NAME, new Rectangle(0, 426, -1, -1), new Rectangle(0, 375, 129, 41)); + // Each vertical region can have a delta according to what is expected + // because of font height on each OS. Height deltas of each region have + // an incidence on the global container height. We must cumulate them to + // make a reasonable assert at the end. + int heightDeltas = 0; + + // Delta of 5 pixels because there are 5 lines (with potential 1 delta + // pixel) + Rectangle leftClassBounds = checkBounds(LEFT_CLASS_NAME, new Rectangle(0, 0, -1, -1), INITIAL_VERTICAL_LEFT_CLASS_BOUNDS, 0, 5); + heightDeltas += leftClassBounds.height - INITIAL_VERTICAL_LEFT_CLASS_BOUNDS.height; + // Delta of 1 pixel because there is 1 line (with potential 1 delta + // pixel) + Rectangle leftClass2Bounds = checkBounds(LEFT_CLASS2_NAME, new Rectangle(0, leftClassBounds.height, -1, -1), INITIAL_VERTICAL_LEFT_CLASS2_BOUNDS.getTranslated(0, heightDeltas), 0, 1); + heightDeltas += leftClass2Bounds.height - INITIAL_VERTICAL_LEFT_CLASS2_BOUNDS.height; + // Delta of 5 pixels because there are 5 lines (with potential 1 delta + // pixel) + Rectangle centerClassBounds = checkBounds(CENTER_CLASS_NAME, new Rectangle(0, leftClass2Bounds.y + leftClass2Bounds.height, -1, -1), + INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.getTranslated(0, heightDeltas + leftClass2Bounds.height), 0, 5); + heightDeltas += centerClassBounds.height - INITIAL_VERTICAL_CENTER_CLASS_BOUNDS.height; + // Delta of 2 pixels because there are 2 lines (with potential 1 delta + // pixel) + Rectangle rightClassBounds = checkBounds(RIGHT_CLASS_NAME, new Rectangle(0, centerClassBounds.y + centerClassBounds.height, -1, -1), + INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.getTranslated(0, heightDeltas + leftClass2Bounds.height), 0, 2); + heightDeltas += rightClassBounds.height - INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS.height; + Rectangle leftPkgBounds = checkBounds(LEFT_PKG_NAME, new Rectangle(0, rightClassBounds.y + rightClassBounds.height, -1, -1), + INITIAL_VERTICAL_LEFT_PKG_BOUNDS.getTranslated(0, heightDeltas + leftClass2Bounds.height)); + heightDeltas += leftPkgBounds.height - INITIAL_VERTICAL_LEFT_PKG_BOUNDS.height; + // Delta of 1 pixel because there is 1 line (with potential 1 delta + // pixel) + Rectangle centerPkgBounds = checkBounds(CENTER_PKG_NAME, new Rectangle(0, leftPkgBounds.y + leftPkgBounds.height, -1, -1), + INITIAL_VERTICAL_CENTER_PKG_BOUNDS.getTranslated(0, heightDeltas + leftClass2Bounds.height), 0, 1); + heightDeltas += centerPkgBounds.height - INITIAL_VERTICAL_CENTER_PKG_BOUNDS.height; + Rectangle rightPkgBounds = checkBounds(RIGHT_PKG_NAME, new Rectangle(0, centerPkgBounds.y + centerPkgBounds.height, -1, -1), + INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.getTranslated(0, heightDeltas + leftClass2Bounds.height)); + heightDeltas += rightPkgBounds.height - INITIAL_VERTICAL_RIGHT_PKG_BOUNDS.height; + Rectangle firstRegionBounds = checkBounds(FIRST_REGION_CONTAINER_NAME, new Rectangle(64, 16, -1, -1), new Rectangle(64, 16, 141, -1)); + assertEquals("Wrong Draw2D height for " + FIRST_REGION_CONTAINER_NAME, INITIAL_VERTICAL_FIRST_REGION_CONTAINER_BOUNDS.height + heightDeltas + leftClass2Bounds.height, + firstRegionBounds.height(), 1); } private void changeSemanticOrder() { @@ -1056,4 +1227,24 @@ public class CompartmentsLayoutTest extends SiriusDiagramTestCase implements ICo } return effectiveExpectedSWTValue; } + + /** + * Change the default font. + * + * @param fontName + * the font name to set as default. + * @return the previous default font name. + */ + protected String changeDefaultFontName(String fontName) { + IPreferenceStore preferenceStore = (IPreferenceStore) DiagramUIPlugin.DIAGRAM_PREFERENCES_HINT.getPreferenceStore(); + FontData fontData = PreferenceConverter.getFontData(preferenceStore, IPreferenceConstants.PREF_DEFAULT_FONT); + + // Get the actual font. + String oldName = fontData.getName(); + + // Change the font. + fontData.setName(fontName); + PreferenceConverter.setDefault(preferenceStore, IPreferenceConstants.PREF_DEFAULT_FONT, fontData); + return oldName; + } } diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/ICompartmentTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/ICompartmentTests.java index 4d7874d47c..413d20ace9 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/ICompartmentTests.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/ICompartmentTests.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.sirius.tests.unit.diagram.compartment; +import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.sirius.tests.SiriusTestsPlugin; /** @@ -77,4 +78,37 @@ public interface ICompartmentTests { public static final String NEW_PACKAGE_1_NAME = "p1"; public static final String NEW_ATTRIBUTE_NAME = "attr2"; + + // The expected bounds can be slightly different according to the size of + // Font, so the tests must consider this and not use these bounds as + // strictly expected. + public static final Rectangle INITIAL_VERTICAL_FIRST_REGION_CONTAINER_BOUNDS = new Rectangle(64, 16, 141, 414); + + public static final Rectangle INITIAL_VERTICAL_LEFT_CLASS_BOUNDS = new Rectangle(0, 0, 129, 91); + + public static final Rectangle INITIAL_VERTICAL_LEFT_CLASS2_BOUNDS = new Rectangle(0, 91, 129, 40); + + public static final Rectangle INITIAL_VERTICAL_CENTER_CLASS_BOUNDS = new Rectangle(0, 91, 129, 92); + + public static final Rectangle INITIAL_VERTICAL_RIGHT_CLASS_BOUNDS = new Rectangle(0, 183, 129, 44); + + public static final Rectangle INITIAL_VERTICAL_LEFT_PKG_BOUNDS = new Rectangle(0, 227, 129, 41); + + public static final Rectangle INITIAL_VERTICAL_CENTER_PKG_BOUNDS = new Rectangle(0, 268, 129, 67); + + public static final Rectangle INITIAL_VERTICAL_RIGHT_PKG_BOUNDS = new Rectangle(0, 335, 129, 41); + + public static final Rectangle INITIAL_HORIZONTAL_FIRST_REGION_CONTAINER_BOUNDS = new Rectangle(0, 0, 831, 247); + + public static final Rectangle INITIAL_HORIZONTAL_LEFT_CLASS_BOUNDS = new Rectangle(0, 0, 165, 211); + + public static final Rectangle INITIAL_HORIZONTAL_CENTER_CLASS_BOUNDS = new Rectangle(165, 0, 136, 211); + + public static final Rectangle INITIAL_HORIZONTAL_RIGHT_CLASS_BOUNDS = new Rectangle(301, 0, 130, 211); + + public static final Rectangle INITIAL_HORIZONTAL_LEFT_PKG_BOUNDS = new Rectangle(431, 0, 122, 211); + + public static final Rectangle INITIAL_HORIZONTAL_CENTER_PKG_BOUNDS = new Rectangle(553, 0, 156, 211); + + public static final Rectangle INITIAL_HORIZONTAL_RIGHT_PKG_BOUNDS = new Rectangle(709, 0, 112, 211); } diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/compartment/CompartmentsCreationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/compartment/CompartmentsCreationTest.java index 807da88bfd..d4da9a1971 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/compartment/CompartmentsCreationTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/compartment/CompartmentsCreationTest.java @@ -16,10 +16,8 @@ import java.util.Collections; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.draw2d.Border; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Insets; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.emf.ecore.EObject; @@ -31,7 +29,6 @@ import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart; import org.eclipse.gmf.runtime.notation.LayoutConstraint; import org.eclipse.gmf.runtime.notation.Location; import org.eclipse.gmf.runtime.notation.Node; @@ -46,9 +43,7 @@ import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNodeEditPart; -import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramElementEditPart; -import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramListEditPart; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeListElementEditPart; import org.eclipse.sirius.ecore.extender.tool.api.ModelUtils; import org.eclipse.swt.widgets.Display; @@ -64,6 +59,28 @@ import org.eclipse.ui.PlatformUI; */ public class CompartmentsCreationTest extends AbstractCompartmentTest { + private String oldFont; + + /** + * {@inheritDoc} + */ + @Override + protected void onSetUpAfterOpeningDesignerPerspective() throws Exception { + super.onSetUpAfterOpeningDesignerPerspective(); + oldFont = changeDefaultFontName("Comic Sans MS"); + } + + /** + * {@inheritDoc} + */ + @Override + protected void tearDown() throws Exception { + if (oldFont != null) { + changeDefaultFontName(oldFont); + } + super.tearDown(); + } + /** * Ensures that containers displays correctly its children in a horizontal * stack. @@ -365,8 +382,9 @@ public class CompartmentsCreationTest extends AbstractCompartmentTest { assertEquals("Session should not be dirty.", SessionStatus.SYNC, localSession.getOpenedSession().getStatus()); - // Check that the existing container is as expected - checkBounds(SECOND_REGION_CONTAINER_NAME, new Rectangle(940, 125, -1, -1), new Rectangle(940, 125, 233, 258)); + // Check that the existing container is as expected (a delta of 1 is + // tolerate for height because of font problem in such OS) + Rectangle currentDraw2DBounds = checkBounds(SECOND_REGION_CONTAINER_NAME, new Rectangle(940, 125, -1, -1), new Rectangle(940, 125, 233, 258), false, 0, 1); // Create a new ePackage (that causes creation of new region container // region at refresh) outside of the current session (as from an @@ -374,7 +392,7 @@ public class CompartmentsCreationTest extends AbstractCompartmentTest { modifySemanticModelOutsideDiagram(); // Check that the existing container has not changed - checkBounds(SECOND_REGION_CONTAINER_NAME, new Rectangle(940, 125, -1, -1), new Rectangle(940, 125, 233, 258)); + checkBounds(SECOND_REGION_CONTAINER_NAME, new Rectangle(940, 125, -1, -1), currentDraw2DBounds); } /** @@ -392,7 +410,7 @@ public class CompartmentsCreationTest extends AbstractCompartmentTest { assertEquals("Session should not be dirty.", SessionStatus.SYNC, localSession.getOpenedSession().getStatus()); // Check that the existing region is as expected - checkBounds("aaa", new Rectangle(0, 80, 154, 40), new Rectangle(0, 80, 154, 40)); + Rectangle currentDraw2DBounds = checkBounds("aaa", new Rectangle(0, 80, 154, 40), new Rectangle(0, 80, 154, 40)); // Create a new ePackage (that causes creation of new region container // region at refresh) outside of the current session (as from an @@ -401,18 +419,75 @@ public class CompartmentsCreationTest extends AbstractCompartmentTest { // Check that the existing container has not changed (or at least one of // its region in current case) - checkBounds("aaa", new Rectangle(0, 80, 154, 40), new Rectangle(0, 80, 154, 40)); + checkBounds("aaa", new Rectangle(0, 80, 154, 40), currentDraw2DBounds); } private void checkSize(String label, Dimension expectedGmfSize, Dimension expectedFigureSize) { checkBounds(label, new Rectangle(0, 0, expectedGmfSize.width(), expectedGmfSize.height()), new Rectangle(0, 0, expectedFigureSize.width(), expectedFigureSize.height()), true); } - private void checkBounds(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds) { - checkBounds(label, expectedGmfBounds, expectedFigureBounds, false); + /** + * Check the GMF and Draw2d bounds (or size) of the edit part with given + * <code>label</code>. + * + * @param label + * The label of the edit part to check + * @param expectedGmfBounds + * The expected GMF bounds + * @param expectedFigureBounds + * The expected draw2d bounds, if the width or height is equals + * to -1, we ignore it. + * + * @return The current Draw2d bounds + */ + private Rectangle checkBounds(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds) { + return checkBounds(label, expectedGmfBounds, expectedFigureBounds, false); } - private void checkBounds(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds, boolean onlyCheckSize) { + /** + * Check the GMF and Draw2d bounds (or size) of the edit part with given + * <code>label</code>. + * + * @param label + * The label of the edit part to check + * @param expectedGmfBounds + * The expected GMF bounds + * @param expectedFigureBounds + * The expected draw2d bounds, if the width or height is equals + * to -1, we ignore it. + * @param onlyCheckSize + * true if only the size must be check (and not the location), + * false otherwise. + * + * @return The current Draw2d bounds + */ + private Rectangle checkBounds(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds, boolean onlyCheckSize) { + return checkBounds(label, expectedGmfBounds, expectedFigureBounds, onlyCheckSize, 0, 0); + } + + /** + * Check that the bounds (GMF and Draw2D) are as expected. + * + * @param label + * Label of the container to check. + * @param expectedGmfBounds + * The GMF expected bounds + * @param expectedFigureBounds + * The draw2d expected bounds. If the x, y , width or height in + * this bounds is equal to -1, we don't check it. This is useful + * in case of size that depends on Font (with different result + * according to OS). + * @param onlyCheckSize + * true if only the size must be check (and not the location), + * false otherwise. * @param widthDelta The width delta to + * consider the width as equal (because of font size that can be + * slightly different on each OS). + * @param heightDelta + * The height delta to consider the height as equal (because of + * font size that can be slightly different on each OS). + * @return the current DrawD2 bounds + */ + private Rectangle checkBounds(String label, Rectangle expectedGmfBounds, Rectangle expectedFigureBounds, boolean onlyCheckSize, int widthDelta, int heightDelta) { SWTBotGefEditPart swtBotEditPart = editor.getEditPart(label, AbstractDiagramElementContainerEditPart.class); AbstractDiagramElementContainerEditPart editPart = (AbstractDiagramElementContainerEditPart) swtBotEditPart.part(); @@ -420,20 +495,43 @@ public class CompartmentsCreationTest extends AbstractCompartmentTest { if (onlyCheckSize) { assertEquals("Wrong GMF size for " + label, expectedGmfBounds.getSize(), getBounds((Node) editPart.getNotationView()).getSize()); - assertEquals("Wrong Draw2D size for " + label, expectedFigureBounds.getSize(), mainFigure.getBounds().getSize()); + if (expectedFigureBounds.width() != -1 && expectedFigureBounds.height() != -1) { + if (widthDelta == 0 && heightDelta == 0) { + assertEquals("Wrong Draw2D size for " + label, expectedFigureBounds.getSize(), mainFigure.getBounds().getSize()); + } else { + assertEquals("Wrong Draw2D width for " + label, expectedFigureBounds.width(), mainFigure.getBounds().width(), widthDelta); + assertEquals("Wrong Draw2D height for " + label, expectedFigureBounds.height(), mainFigure.getBounds().height(), heightDelta); + } + } else { + if (expectedFigureBounds.width() != -1) { + assertEquals("Wrong Draw2D width for " + label, expectedFigureBounds.width(), mainFigure.getBounds().width(), widthDelta); + } + if (expectedFigureBounds.height() != -1) { + assertEquals("Wrong Draw2D height for " + label, expectedFigureBounds.height(), mainFigure.getBounds().height(), heightDelta); + } + } } else { assertEquals("Wrong GMF bounds for " + label, expectedGmfBounds, getBounds((Node) editPart.getNotationView())); - assertEquals("Wrong Draw2D bounds for " + label, expectedFigureBounds, mainFigure.getBounds()); - } - - ResizableCompartmentEditPart compartmentEditPart = (ResizableCompartmentEditPart) editPart.getChildren().get(1); - Border border = compartmentEditPart.getContentPane().getBorder(); - - if (editPart instanceof IDiagramListEditPart) { - assertEquals("Wrong border margin for " + label, new Insets(0, 4, editPart.isRegion() ? 0 : 1, 4), border.getInsets(null)); - } else if (editPart instanceof IDiagramContainerEditPart) { - assertNull("Wrong border for " + label + ": the BorderItemsAwareFreeFormLayer used as content pane of a freeform region should not have a border.", border); + if (expectedFigureBounds.width() != -1 && expectedFigureBounds.height() != -1) { + if (widthDelta == 0 && heightDelta == 0) { + assertEquals("Wrong Draw2D bounds for " + label, expectedFigureBounds, mainFigure.getBounds()); + } else { + assertEquals("Wrong Draw2D location for " + label, expectedFigureBounds.getLocation(), mainFigure.getBounds().getLocation()); + assertEquals("Wrong Draw2D width for " + label, expectedFigureBounds.width(), mainFigure.getBounds().width(), widthDelta); + assertEquals("Wrong Draw2D height for " + label, expectedFigureBounds.height(), mainFigure.getBounds().height(), heightDelta); + } + } else { + assertEquals("Wrong Draw2D x for " + label, expectedFigureBounds.x(), mainFigure.getBounds().x()); + assertEquals("Wrong Draw2D y for " + label, expectedFigureBounds.y(), mainFigure.getBounds().y()); + if (expectedFigureBounds.width() != -1) { + assertEquals("Wrong Draw2D width for " + label, expectedFigureBounds.width(), mainFigure.getBounds().width(), widthDelta); + } + if (expectedFigureBounds.height() != -1) { + assertEquals("Wrong Draw2D height for " + label, expectedFigureBounds.height(), mainFigure.getBounds().height(), heightDelta); + } + } } + return (Rectangle) mainFigure.getBounds(); } private Rectangle getBounds(Node notationView) { |