Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 46371 Details for
Bug 77413
Improved Documentation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
added programatic migration
migrationDocUpdate07172006.patch (text/plain), 478.66 KB, created by
James Bruck
on 2006-07-17 10:17:43 EDT
(
hide
)
Description:
added programatic migration
Filename:
MIME Type:
Creator:
James Bruck
Created:
2006-07-17 10:17:43 EDT
Size:
478.66 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P docs >Index: guides/UML2_2.0_Migration_Guide/guide.html >=================================================================== >RCS file: /cvsroot/org.eclipse/www/uml2/docs/guides/UML2_2.0_Migration_Guide/guide.html,v >retrieving revision 1.2 >diff -u -r1.2 guide.html >--- guides/UML2_2.0_Migration_Guide/guide.html 13 Jun 2006 18:35:50 -0000 1.2 >+++ guides/UML2_2.0_Migration_Guide/guide.html 17 Jul 2006 14:18:13 -0000 >@@ -21,12 +21,13 @@ > <![endif]--> > <title>UML2 migration</title> > <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" >+ name="place"/> >+<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" > name="date"/> > <o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" > name="time"/> > <!--[if gte mso 9]><xml> > <w:WordDocument> >- <w:SpellingState>Clean</w:SpellingState> > <w:GrammarState>Clean</w:GrammarState> > <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> > </w:WordDocument> >@@ -253,6 +254,13 @@ > font-size:12.0pt; > font-family:Tahoma; > mso-fareast-font-family:"Times New Roman";} >+pre >+ {margin:0in; >+ margin-bottom:.0001pt; >+ mso-pagination:widow-orphan; >+ font-size:10.0pt; >+ font-family:"Courier New"; >+ mso-fareast-font-family:"Times New Roman";} > p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject > {margin:0in; > margin-bottom:.0001pt; >@@ -309,9 +317,6 @@ > span.listbulletcharchar > {mso-style-name:listbulletcharchar; > font-weight:bold;} >-span.SpellE >- {mso-style-name:""; >- mso-spl-e:yes;} > span.GramE > {mso-style-name:""; > mso-gram-e:yes;} >@@ -330,7 +335,7 @@ > @list l0 > {mso-list-id:-127; > mso-list-type:simple; >- mso-list-template-ids:1227026600;} >+ mso-list-template-ids:1708296520;} > @list l0:level1 > {mso-level-number-format:bullet; > mso-level-style-link:"List Bullet 4"; >@@ -343,7 +348,7 @@ > @list l1 > {mso-list-id:-126; > mso-list-type:simple; >- mso-list-template-ids:-863739188;} >+ mso-list-template-ids:-1872972728;} > @list l1:level1 > {mso-level-number-format:bullet; > mso-level-style-link:"List Bullet 3"; >@@ -356,7 +361,7 @@ > @list l2 > {mso-list-id:-125; > mso-list-type:simple; >- mso-list-template-ids:-1784015844;} >+ mso-list-template-ids:107497060;} > @list l2:level1 > {mso-level-number-format:bullet; > mso-level-style-link:"List Bullet 2"; >@@ -368,7 +373,7 @@ > @list l3 > {mso-list-id:-119; > mso-list-type:simple; >- mso-list-template-ids:131134226;} >+ mso-list-template-ids:-90152888;} > @list l3:level1 > {mso-level-number-format:bullet; > mso-level-style-link:"List Bullet"; >@@ -434,18 +439,10 @@ > mso-level-number-position:left; > text-indent:-.25in;} > @list l5 >- {mso-list-id:14306131; >- mso-list-template-ids:-656121510;} >-@list l5:level1 >- {mso-level-start-at:3; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l6 > {mso-list-id:23483844; > mso-list-type:hybrid; > mso-list-template-ids:382371220 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l6:level1 >+@list l5:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -456,49 +453,49 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l6:level2 >+@list l5:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l6:level3 >+@list l5:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l6:level4 >+@list l5:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l6:level5 >+@list l5:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l6:level6 >+@list l5:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l6:level7 >+@list l5:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l6:level8 >+@list l5:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l6:level9 >+@list l5:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l7 >+@list l6 > {mso-list-id:34082142; > mso-list-type:hybrid; > mso-list-template-ids:-116357470 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l7:level1 >+@list l6:level1 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; >@@ -506,7 +503,7 @@ > margin-left:1.0in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l7:level2 >+@list l6:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.25in; >@@ -514,52 +511,39 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l7:level3 >+@list l6:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l7:level4 >+@list l6:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l7:level5 >+@list l6:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l7:level6 >+@list l6:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l7:level7 >+@list l6:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l7:level8 >+@list l6:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l7:level9 >+@list l6:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l8 >- {mso-list-id:51075674; >- mso-list-template-ids:-595929966;} >-@list l8:level1 >- {mso-level-start-at:4; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l8:level2 >- {mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l9 >+@list l7 > {mso-list-id:64882587; > mso-list-type:hybrid; > mso-list-template-ids:-547050114 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l9:level1 >+@list l7:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -570,128 +554,125 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l9:level2 >+@list l7:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l9:level3 >+@list l7:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l9:level4 >+@list l7:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l9:level5 >+@list l7:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l9:level6 >+@list l7:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l9:level7 >+@list l7:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l9:level8 >+@list l7:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l9:level9 >+@list l7:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l10 >- {mso-list-id:86191933; >- mso-list-template-ids:-408128414;} >-@list l11 >+@list l8 > {mso-list-id:109328319; > mso-list-template-ids:-1482363534;} >-@list l11:level1 >+@list l8:level1 > {mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l11:level2 >+@list l8:level2 > {mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l11:level3 >+@list l8:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l11:level4 >+@list l8:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l11:level5 >+@list l8:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l11:level6 >+@list l8:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l11:level7 >+@list l8:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l11:level8 >+@list l8:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l11:level9 >+@list l8:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12 >+@list l9 > {mso-list-id:110830503; > mso-list-template-ids:-807907876;} >-@list l12:level1 >+@list l9:level1 > {mso-level-start-at:3; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12:level2 >+@list l9:level2 > {mso-level-start-at:2; > mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12:level3 >+@list l9:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12:level4 >+@list l9:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12:level5 >+@list l9:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12:level6 >+@list l9:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12:level7 >+@list l9:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12:level8 >+@list l9:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l12:level9 >+@list l9:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l13 >+@list l10 > {mso-list-id:124466226; > mso-list-type:hybrid; > mso-list-template-ids:1095686832 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l13:level1 >+@list l10:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -702,43 +683,43 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l13:level2 >+@list l10:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l13:level3 >+@list l10:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l13:level4 >+@list l10:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l13:level5 >+@list l10:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l13:level6 >+@list l10:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l13:level7 >+@list l10:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l13:level8 >+@list l10:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l13:level9 >+@list l10:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l14 >+@list l11 > {mso-list-id:164832413; > mso-list-type:hybrid; > mso-list-template-ids:-1755644038 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l14:level1 >+@list l11:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -749,49 +730,49 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l14:level2 >+@list l11:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l14:level3 >+@list l11:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l14:level4 >+@list l11:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l14:level5 >+@list l11:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l14:level6 >+@list l11:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l14:level7 >+@list l11:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l14:level8 >+@list l11:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l14:level9 >+@list l11:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l15 >+@list l12 > {mso-list-id:177737825; > mso-list-type:hybrid; > mso-list-template-ids:1338136412 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l15:level1 >+@list l12:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -802,7 +783,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l15:level2 >+@list l12:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.75in; >@@ -810,7 +791,7 @@ > margin-left:1.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l15:level3 >+@list l12:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:2.25in; >@@ -818,35 +799,35 @@ > margin-left:2.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l15:level4 >+@list l12:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l15:level5 >+@list l12:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l15:level6 >+@list l12:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l15:level7 >+@list l12:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l15:level8 >+@list l12:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l15:level9 >+@list l12:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l16 >+@list l13 > {mso-list-id:185561617; > mso-list-type:hybrid; > mso-list-template-ids:1994544700 2134686924 808464390 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l16:level1 >+@list l13:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -857,7 +838,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l16:level2 >+@list l13:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0D8; >@@ -869,39 +850,39 @@ > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman"; > mso-ansi-font-weight:normal;} >-@list l16:level3 >+@list l13:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l16:level4 >+@list l13:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l16:level5 >+@list l13:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l16:level6 >+@list l13:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l16:level7 >+@list l13:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l16:level8 >+@list l13:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l16:level9 >+@list l13:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l17 >+@list l14 > {mso-list-id:195124921; > mso-list-type:hybrid; > mso-list-template-ids:769051474 2134686924 808464390 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l17:level1 >+@list l14:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -912,7 +893,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l17:level2 >+@list l14:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0D8; >@@ -924,39 +905,61 @@ > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman"; > mso-ansi-font-weight:normal;} >-@list l17:level3 >+@list l14:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l17:level4 >+@list l14:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l17:level5 >+@list l14:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l17:level6 >+@list l14:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l17:level7 >+@list l14:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l17:level8 >+@list l14:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l17:level9 >+@list l14:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l18 >+@list l15 >+ {mso-list-id:203711403; >+ mso-list-template-ids:-810244182;} >+@list l15:level1 >+ {mso-level-start-at:3; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l16 >+ {mso-list-id:217210841; >+ mso-list-template-ids:-966100640;} >+@list l16:level1 >+ {mso-level-start-at:2; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l16:level2 >+ {mso-level-start-at:2; >+ mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l17 > {mso-list-id:222260846; > mso-list-type:hybrid; > mso-list-template-ids:-1671397104 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l18:level1 >+@list l17:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -967,43 +970,43 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l18:level2 >+@list l17:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l18:level3 >+@list l17:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l18:level4 >+@list l17:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l18:level5 >+@list l17:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l18:level6 >+@list l17:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l18:level7 >+@list l17:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l18:level8 >+@list l17:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l18:level9 >+@list l17:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l19 >+@list l18 > {mso-list-id:244265584; > mso-list-type:hybrid; > mso-list-template-ids:1254936634 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l19:level1 >+@list l18:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1014,7 +1017,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l19:level2 >+@list l18:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.75in; >@@ -1022,7 +1025,7 @@ > margin-left:1.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l19:level3 >+@list l18:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:2.25in; >@@ -1030,35 +1033,35 @@ > margin-left:2.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l19:level4 >+@list l18:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l19:level5 >+@list l18:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l19:level6 >+@list l18:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l19:level7 >+@list l18:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l19:level8 >+@list l18:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l19:level9 >+@list l18:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l20 >+@list l19 > {mso-list-id:245500304; > mso-list-type:hybrid; > mso-list-template-ids:706138356 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l20:level1 >+@list l19:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1069,14 +1072,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l20:level2 >+@list l19:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l20:level3 >+@list l19:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -1084,35 +1087,35 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l20:level4 >+@list l19:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l20:level5 >+@list l19:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l20:level6 >+@list l19:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l20:level7 >+@list l19:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l20:level8 >+@list l19:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l20:level9 >+@list l19:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l21 >+@list l20 > {mso-list-id:251092073; > mso-list-type:hybrid; > mso-list-template-ids:-436821088 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l21:level1 >+@list l20:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1123,14 +1126,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l21:level2 >+@list l20:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l21:level3 >+@list l20:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -1138,35 +1141,35 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l21:level4 >+@list l20:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l21:level5 >+@list l20:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l21:level6 >+@list l20:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l21:level7 >+@list l20:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l21:level8 >+@list l20:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l21:level9 >+@list l20:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l22 >+@list l21 > {mso-list-id:254214792; > mso-list-type:hybrid; > mso-list-template-ids:-1224673124 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l22:level1 >+@list l21:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1177,14 +1180,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l22:level2 >+@list l21:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l22:level3 >+@list l21:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:-.25in; >@@ -1192,7 +1195,7 @@ > margin-left:-.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l22:level4 >+@list l21:level4 > {mso-level-number-format:bullet; > mso-level-text:\F0B7; > mso-level-tab-stop:.25in; >@@ -1200,7 +1203,7 @@ > margin-left:.25in; > text-indent:-.25in; > font-family:Symbol;} >-@list l22:level5 >+@list l21:level5 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:.75in; >@@ -1208,7 +1211,7 @@ > margin-left:.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l22:level6 >+@list l21:level6 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -1216,36 +1219,23 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l22:level7 >+@list l21:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l22:level8 >+@list l21:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l22:level9 >+@list l21:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l23 >- {mso-list-id:263193744; >- mso-list-template-ids:-2033792228;} >-@list l23:level1 >- {mso-level-start-at:2; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l23:level2 >- {mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l24 >+@list l22 > {mso-list-id:279457016; > mso-list-type:hybrid; > mso-list-template-ids:-1636923418 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l24:level1 >+@list l22:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1256,49 +1246,49 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l24:level2 >+@list l22:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l24:level3 >+@list l22:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l24:level4 >+@list l22:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l24:level5 >+@list l22:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l24:level6 >+@list l22:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l24:level7 >+@list l22:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l24:level8 >+@list l22:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l24:level9 >+@list l22:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l25 >+@list l23 > {mso-list-id:300506385; > mso-list-type:hybrid; > mso-list-template-ids:1194592708 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l25:level1 >+@list l23:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1309,92 +1299,92 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l25:level2 >+@list l23:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l25:level3 >+@list l23:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l25:level4 >+@list l23:level4 > {mso-level-number-format:bullet; > mso-level-text:\F0B7; > mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Symbol;} >-@list l25:level5 >+@list l23:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l25:level6 >+@list l23:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l25:level7 >+@list l23:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l25:level8 >+@list l23:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l25:level9 >+@list l23:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26 >+@list l24 > {mso-list-id:306012926; > mso-list-template-ids:-746565372;} >-@list l26:level1 >+@list l24:level1 > {mso-level-start-at:3; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26:level2 >+@list l24:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26:level3 >+@list l24:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26:level4 >+@list l24:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26:level5 >+@list l24:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26:level6 >+@list l24:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26:level7 >+@list l24:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26:level8 >+@list l24:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l26:level9 >+@list l24:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l27 >+@list l25 > {mso-list-id:311299403; > mso-list-type:hybrid; > mso-list-template-ids:1536854458 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l27:level1 >+@list l25:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1405,93 +1395,84 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l27:level2 >+@list l25:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l27:level3 >+@list l25:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l27:level4 >+@list l25:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l27:level5 >+@list l25:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l27:level6 >+@list l25:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l27:level7 >+@list l25:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l27:level8 >+@list l25:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l27:level9 >+@list l25:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28 >+@list l26 > {mso-list-id:318657431; > mso-list-template-ids:161220598;} >-@list l28:level1 >+@list l26:level1 > {mso-level-start-at:2; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28:level2 >+@list l26:level2 > {mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28:level3 >+@list l26:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28:level4 >+@list l26:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28:level5 >+@list l26:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28:level6 >+@list l26:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28:level7 >+@list l26:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28:level8 >+@list l26:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l28:level9 >+@list l26:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l29 >- {mso-list-id:319844057; >- mso-list-template-ids:1953517156;} >-@list l29:level2 >- {mso-level-start-at:2; >- mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l30 >+@list l27 > {mso-list-id:337082932; > mso-list-type:hybrid; > mso-list-template-ids:-1251944048 -994703330 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l30:level1 >+@list l27:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0B7; >@@ -1502,57 +1483,49 @@ > font-family:Symbol; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l30:level2 >+@list l27:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l30:level3 >+@list l27:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l30:level4 >+@list l27:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l30:level5 >+@list l27:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l30:level6 >+@list l27:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l30:level7 >+@list l27:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l30:level8 >+@list l27:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l30:level9 >+@list l27:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l31 >- {mso-list-id:352071990; >- mso-list-template-ids:1630988220;} >-@list l31:level1 >- {mso-level-start-at:4; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l32 >+@list l28 > {mso-list-id:363991057; > mso-list-type:hybrid; > mso-list-template-ids:565237946 2134686924 808464390 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l32:level1 >+@list l28:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1563,7 +1536,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l32:level2 >+@list l28:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0D8; >@@ -1575,39 +1548,39 @@ > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman"; > mso-ansi-font-weight:normal;} >-@list l32:level3 >+@list l28:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l32:level4 >+@list l28:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l32:level5 >+@list l28:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l32:level6 >+@list l28:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l32:level7 >+@list l28:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l32:level8 >+@list l28:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l32:level9 >+@list l28:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l33 >+@list l29 > {mso-list-id:375355401; > mso-list-type:hybrid; > mso-list-template-ids:-1567710564 2134686924 67698691 -726208670 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l33:level1 >+@list l29:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1618,14 +1591,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l33:level2 >+@list l29:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l33:level3 >+@list l29:level3 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:2.25in; >@@ -1634,7 +1607,7 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l33:level4 >+@list l29:level4 > {mso-level-number-format:bullet; > mso-level-text:\F0B7; > mso-level-tab-stop:1.0in; >@@ -1642,7 +1615,7 @@ > margin-left:1.0in; > text-indent:-.25in; > font-family:Symbol;} >-@list l33:level5 >+@list l29:level5 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.5in; >@@ -1650,27 +1623,27 @@ > margin-left:1.5in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l33:level6 >+@list l29:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l33:level7 >+@list l29:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l33:level8 >+@list l29:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l33:level9 >+@list l29:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l34 >+@list l30 > {mso-list-id:390541628; > mso-list-type:hybrid; > mso-list-template-ids:288030246 2134686924 67698691 -726208670 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l34:level1 >+@list l30:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1681,14 +1654,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l34:level2 >+@list l30:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l34:level3 >+@list l30:level3 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:2.25in; >@@ -1697,35 +1670,43 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l34:level4 >+@list l30:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l34:level5 >+@list l30:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l34:level6 >+@list l30:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l34:level7 >+@list l30:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l34:level8 >+@list l30:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l34:level9 >+@list l30:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l35 >+@list l31 >+ {mso-list-id:401217888; >+ mso-list-template-ids:1142323328;} >+@list l31:level1 >+ {mso-level-start-at:4; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l32 > {mso-list-id:409817956; > mso-list-type:hybrid; > mso-list-template-ids:-1264427322 2134686924 808464390 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l35:level1 >+@list l32:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1736,7 +1717,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l35:level2 >+@list l32:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0D8; >@@ -1748,42 +1729,39 @@ > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman"; > mso-ansi-font-weight:normal;} >-@list l35:level3 >+@list l32:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l35:level4 >+@list l32:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l35:level5 >+@list l32:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l35:level6 >+@list l32:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l35:level7 >+@list l32:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l35:level8 >+@list l32:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l35:level9 >+@list l32:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l36 >- {mso-list-id:426271941; >- mso-list-template-ids:1466712974;} >-@list l37 >+@list l33 > {mso-list-id:438916101; > mso-list-type:hybrid; > mso-list-template-ids:277623366 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l37:level1 >+@list l33:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1794,14 +1772,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l37:level2 >+@list l33:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l37:level3 >+@list l33:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -1809,35 +1787,38 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l37:level4 >+@list l33:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l37:level5 >+@list l33:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l37:level6 >+@list l33:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l37:level7 >+@list l33:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l37:level8 >+@list l33:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l37:level9 >+@list l33:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l38 >+@list l34 >+ {mso-list-id:445857639; >+ mso-list-template-ids:47973996;} >+@list l35 > {mso-list-id:448479111; > mso-list-type:hybrid; > mso-list-template-ids:-323034728 2134686924 67698691 -726208670 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l38:level1 >+@list l35:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1848,14 +1829,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l38:level2 >+@list l35:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l38:level3 >+@list l35:level3 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:2.25in; >@@ -1864,78 +1845,78 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l38:level4 >+@list l35:level4 > {mso-level-number-format:bullet; > mso-level-text:\F0B7; > mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Symbol;} >-@list l38:level5 >+@list l35:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l38:level6 >+@list l35:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l38:level7 >+@list l35:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l38:level8 >+@list l35:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l38:level9 >+@list l35:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39 >+@list l36 > {mso-list-id:449667460; > mso-list-template-ids:-1137926800;} >-@list l39:level1 >+@list l36:level1 > {mso-level-start-at:2; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39:level2 >+@list l36:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39:level3 >+@list l36:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39:level4 >+@list l36:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39:level5 >+@list l36:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39:level6 >+@list l36:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39:level7 >+@list l36:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39:level8 >+@list l36:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l39:level9 >+@list l36:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l40 >+@list l37 > {mso-list-id:459080902; > mso-list-type:hybrid; > mso-list-template-ids:-1508351730 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l40:level1 >+@list l37:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1946,43 +1927,43 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l40:level2 >+@list l37:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l40:level3 >+@list l37:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l40:level4 >+@list l37:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l40:level5 >+@list l37:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l40:level6 >+@list l37:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l40:level7 >+@list l37:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l40:level8 >+@list l37:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l40:level9 >+@list l37:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l41 >+@list l38 > {mso-list-id:467893985; > mso-list-type:hybrid; > mso-list-template-ids:-1513593074 2134686924 808464390 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l41:level1 >+@list l38:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -1993,7 +1974,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l41:level2 >+@list l38:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0D8; >@@ -2005,39 +1986,39 @@ > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman"; > mso-ansi-font-weight:normal;} >-@list l41:level3 >+@list l38:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l41:level4 >+@list l38:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l41:level5 >+@list l38:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l41:level6 >+@list l38:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l41:level7 >+@list l38:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l41:level8 >+@list l38:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l41:level9 >+@list l38:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l42 >+@list l39 > {mso-list-id:468789825; > mso-list-type:hybrid; > mso-list-template-ids:-2063297324 -726208670 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l42:level1 >+@list l39:level1 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:1.25in; >@@ -2046,49 +2027,58 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l42:level2 >+@list l39:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l42:level3 >+@list l39:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l42:level4 >+@list l39:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l42:level5 >+@list l39:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l42:level6 >+@list l39:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l42:level7 >+@list l39:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l42:level8 >+@list l39:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l42:level9 >+@list l39:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l43 >+@list l40 >+ {mso-list-id:480393258; >+ mso-list-template-ids:-728754040;} >+@list l40:level2 >+ {mso-level-start-at:2; >+ mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l41 > {mso-list-id:486170383; > mso-list-type:hybrid; > mso-list-template-ids:831657264 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l43:level1 >+@list l41:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2099,46 +2089,54 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l43:level2 >+@list l41:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l43:level3 >+@list l41:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l43:level4 >+@list l41:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l43:level5 >+@list l41:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l43:level6 >+@list l41:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l43:level7 >+@list l41:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l43:level8 >+@list l41:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l43:level9 >+@list l41:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l44 >+@list l42 >+ {mso-list-id:517158025; >+ mso-list-template-ids:1803342320;} >+@list l42:level2 >+ {mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l43 > {mso-list-id:535512324; > mso-list-type:hybrid; > mso-list-template-ids:-1147505934 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l44:level1 >+@list l43:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2149,91 +2147,83 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l44:level2 >+@list l43:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l44:level3 >+@list l43:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l44:level4 >+@list l43:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l44:level5 >+@list l43:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l44:level6 >+@list l43:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l44:level7 >+@list l43:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l44:level8 >+@list l43:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l44:level9 >+@list l43:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45 >+@list l44 > {mso-list-id:546111786; > mso-list-template-ids:-815480924;} >-@list l45:level1 >+@list l44:level1 > {mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45:level2 >+@list l44:level2 > {mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45:level3 >+@list l44:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45:level4 >+@list l44:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45:level5 >+@list l44:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45:level6 >+@list l44:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45:level7 >+@list l44:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45:level8 >+@list l44:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l45:level9 >+@list l44:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l46 >- {mso-list-id:567767416; >- mso-list-template-ids:-1149728972;} >-@list l46:level1 >- {mso-level-start-at:3; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l47 >+@list l45 > {mso-list-id:576088103; > mso-list-type:hybrid; > mso-list-template-ids:-781706566 2134686924 67698691 -726208670 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l47:level1 >+@list l45:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2244,14 +2234,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l47:level2 >+@list l45:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l47:level3 >+@list l45:level3 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:2.25in; >@@ -2260,35 +2250,35 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l47:level4 >+@list l45:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l47:level5 >+@list l45:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l47:level6 >+@list l45:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l47:level7 >+@list l45:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l47:level8 >+@list l45:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l47:level9 >+@list l45:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l48 >+@list l46 > {mso-list-id:576937679; > mso-list-type:hybrid; > mso-list-template-ids:-7826624 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l48:level1 >+@list l46:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2299,7 +2289,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l48:level2 >+@list l46:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.75in; >@@ -2307,7 +2297,7 @@ > margin-left:1.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l48:level3 >+@list l46:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:2.25in; >@@ -2315,35 +2305,49 @@ > margin-left:2.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l48:level4 >+@list l46:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l48:level5 >+@list l46:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l48:level6 >+@list l46:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l48:level7 >+@list l46:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l48:level8 >+@list l46:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l48:level9 >+@list l46:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l49 >+@list l47 >+ {mso-list-id:609747305; >+ mso-list-template-ids:1812763702;} >+@list l47:level1 >+ {mso-level-start-at:3; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l47:level2 >+ {mso-level-start-at:2; >+ mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l48 > {mso-list-id:623586953; > mso-list-type:hybrid; > mso-list-template-ids:-496484536 2134686924 808464390 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l49:level1 >+@list l48:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2354,7 +2358,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l49:level2 >+@list l48:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0D8; >@@ -2366,80 +2370,80 @@ > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman"; > mso-ansi-font-weight:normal;} >-@list l49:level3 >+@list l48:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l49:level4 >+@list l48:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l49:level5 >+@list l48:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l49:level6 >+@list l48:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l49:level7 >+@list l48:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l49:level8 >+@list l48:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l49:level9 >+@list l48:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50 >+@list l49 > {mso-list-id:631252081; > mso-list-template-ids:1790322890;} >-@list l50:level1 >+@list l49:level1 > {mso-level-start-at:2; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50:level2 >+@list l49:level2 > {mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50:level3 >+@list l49:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50:level4 >+@list l49:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50:level5 >+@list l49:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50:level6 >+@list l49:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50:level7 >+@list l49:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50:level8 >+@list l49:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l50:level9 >+@list l49:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l51 >+@list l50 > {mso-list-id:636027512; > mso-list-type:hybrid; > mso-list-template-ids:-1133474774 2134686924 808464390 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l51:level1 >+@list l50:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2450,7 +2454,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l51:level2 >+@list l50:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0D8; >@@ -2462,78 +2466,78 @@ > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman"; > mso-ansi-font-weight:normal;} >-@list l51:level3 >+@list l50:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l51:level4 >+@list l50:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l51:level5 >+@list l50:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l51:level6 >+@list l50:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l51:level7 >+@list l50:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l51:level8 >+@list l50:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l51:level9 >+@list l50:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52 >+@list l51 > {mso-list-id:653801861; > mso-list-template-ids:-369198734;} >-@list l52:level1 >+@list l51:level1 > {mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52:level2 >+@list l51:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52:level3 >+@list l51:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52:level4 >+@list l51:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52:level5 >+@list l51:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52:level6 >+@list l51:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52:level7 >+@list l51:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52:level8 >+@list l51:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l52:level9 >+@list l51:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l53 >+@list l52 > {mso-list-id:675041665; > mso-list-type:hybrid; > mso-list-template-ids:912062646 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l53:level1 >+@list l52:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2544,132 +2548,138 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l53:level2 >+@list l52:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l53:level3 >+@list l52:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l53:level4 >+@list l52:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l53:level5 >+@list l52:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l53:level6 >+@list l52:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l53:level7 >+@list l52:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l53:level8 >+@list l52:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l53:level9 >+@list l52:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54 >+@list l53 > {mso-list-id:684096612; > mso-list-template-ids:-893105768;} >-@list l54:level1 >+@list l53:level1 > {mso-level-start-at:4; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54:level2 >+@list l53:level2 > {mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54:level3 >+@list l53:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54:level4 >+@list l53:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54:level5 >+@list l53:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54:level6 >+@list l53:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54:level7 >+@list l53:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54:level8 >+@list l53:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l54:level9 >+@list l53:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l55 >- {mso-list-id:698093595; >- mso-list-template-ids:126363892;} >-@list l55:level1 >- {mso-level-start-at:2; >+@list l54 >+ {mso-list-id:698316210; >+ mso-list-template-ids:-66316030;} >+@list l54:level1 >+ {mso-level-start-at:3; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56 >+@list l54:level2 >+ {mso-level-start-at:3; >+ mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l55 > {mso-list-id:707606785; > mso-list-template-ids:793795860;} >-@list l56:level1 >+@list l55:level1 > {mso-level-start-at:2; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56:level2 >+@list l55:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56:level3 >+@list l55:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56:level4 >+@list l55:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56:level5 >+@list l55:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56:level6 >+@list l55:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56:level7 >+@list l55:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56:level8 >+@list l55:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l56:level9 >+@list l55:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l57 >+@list l56 > {mso-list-id:716776951; > mso-list-type:hybrid; > mso-list-template-ids:1290407842 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l57:level1 >+@list l56:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2680,43 +2690,43 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l57:level2 >+@list l56:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l57:level3 >+@list l56:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l57:level4 >+@list l56:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l57:level5 >+@list l56:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l57:level6 >+@list l56:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l57:level7 >+@list l56:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l57:level8 >+@list l56:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l57:level9 >+@list l56:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l58 >+@list l57 > {mso-list-id:729228288; > mso-list-type:hybrid; > mso-list-template-ids:-1679260098 2134686924 67698691 2134686924 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l58:level1 >+@list l57:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2727,14 +2737,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l58:level2 >+@list l57:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l58:level3 >+@list l57:level3 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2745,35 +2755,35 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l58:level4 >+@list l57:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l58:level5 >+@list l57:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l58:level6 >+@list l57:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l58:level7 >+@list l57:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l58:level8 >+@list l57:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l58:level9 >+@list l57:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l59 >+@list l58 > {mso-list-id:746920151; > mso-list-type:hybrid; > mso-list-template-ids:1837263886 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l59:level1 >+@list l58:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2784,14 +2794,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l59:level2 >+@list l58:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l59:level3 >+@list l58:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:.5in; >@@ -2799,35 +2809,35 @@ > margin-left:.5in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l59:level4 >+@list l58:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l59:level5 >+@list l58:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l59:level6 >+@list l58:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l59:level7 >+@list l58:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l59:level8 >+@list l58:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l59:level9 >+@list l58:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l60 >+@list l59 > {mso-list-id:773479851; > mso-list-type:hybrid; > mso-list-template-ids:1208093852 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l60:level1 >+@list l59:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -2838,43 +2848,43 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l60:level2 >+@list l59:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l60:level3 >+@list l59:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l60:level4 >+@list l59:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l60:level5 >+@list l59:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l60:level6 >+@list l59:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l60:level7 >+@list l59:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l60:level8 >+@list l59:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l60:level9 >+@list l59:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l61 >+@list l60 > {mso-list-id:776363803; > mso-list-type:hybrid; > mso-list-template-ids:-1309383962 -726208670 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l61:level1 >+@list l60:level1 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:.75in; >@@ -2883,54 +2893,46 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l61:level2 >+@list l60:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l61:level3 >+@list l60:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l61:level4 >+@list l60:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l61:level5 >+@list l60:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l61:level6 >+@list l60:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l61:level7 >+@list l60:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l61:level8 >+@list l60:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l61:level9 >+@list l60:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l62 >- {mso-list-id:794834376; >- mso-list-template-ids:-182966368;} >-@list l62:level2 >- {mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l63 >+@list l61 > {mso-list-id:814882467; > mso-list-type:hybrid; > mso-list-template-ids:297189182 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l63:level1 >+@list l61:level1 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; >@@ -2938,7 +2940,7 @@ > margin-left:1.0in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l63:level2 >+@list l61:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.25in; >@@ -2946,95 +2948,81 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l63:level3 >+@list l61:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l63:level4 >+@list l61:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l63:level5 >+@list l61:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l63:level6 >+@list l61:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l63:level7 >+@list l61:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l63:level8 >+@list l61:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l63:level9 >+@list l61:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64 >+@list l62 > {mso-list-id:821696038; > mso-list-template-ids:-473278142;} >-@list l64:level1 >+@list l62:level1 > {mso-level-start-at:3; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64:level2 >+@list l62:level2 > {mso-level-start-at:3; > mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64:level3 >+@list l62:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64:level4 >+@list l62:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64:level5 >+@list l62:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64:level6 >+@list l62:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64:level7 >+@list l62:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64:level8 >+@list l62:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l64:level9 >+@list l62:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l65 >- {mso-list-id:842624401; >- mso-list-template-ids:1407191942;} >-@list l65:level1 >- {mso-level-start-at:3; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l65:level2 >- {mso-level-start-at:2; >- mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l66 >+@list l63 > {mso-list-id:871262604; > mso-list-type:hybrid; > mso-list-template-ids:-517053204 2134686924 2134686924 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l66:level1 >+@list l63:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3045,7 +3033,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l66:level2 >+@list l63:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3056,7 +3044,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l66:level3 >+@list l63:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.75in; >@@ -3064,41 +3052,54 @@ > margin-left:1.75in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l66:level4 >+@list l63:level4 > {mso-level-tab-stop:1.75in; > mso-level-number-position:left; > margin-left:1.75in; > text-indent:-.25in;} >-@list l66:level5 >+@list l63:level5 > {mso-level-tab-stop:2.25in; > mso-level-number-position:left; > margin-left:2.25in; > text-indent:-.25in;} >-@list l66:level6 >+@list l63:level6 > {mso-level-tab-stop:2.75in; > mso-level-number-position:left; > margin-left:2.75in; > text-indent:-.25in;} >-@list l66:level7 >+@list l63:level7 > {mso-level-tab-stop:3.25in; > mso-level-number-position:left; > margin-left:3.25in; > text-indent:-.25in;} >-@list l66:level8 >+@list l63:level8 > {mso-level-tab-stop:3.75in; > mso-level-number-position:left; > margin-left:3.75in; > text-indent:-.25in;} >-@list l66:level9 >+@list l63:level9 > {mso-level-tab-stop:4.25in; > mso-level-number-position:left; > margin-left:4.25in; > text-indent:-.25in;} >-@list l67 >+@list l64 >+ {mso-list-id:878395859; >+ mso-list-template-ids:462089988;} >+@list l64:level1 >+ {mso-level-start-at:3; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l64:level2 >+ {mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l65 > {mso-list-id:886913869; > mso-list-type:hybrid; > mso-list-template-ids:-1221182508 2134686924 67698691 -726208670 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l67:level1 >+@list l65:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3109,14 +3110,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l67:level2 >+@list l65:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l67:level3 >+@list l65:level3 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:2.25in; >@@ -3125,43 +3126,35 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l67:level4 >+@list l65:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l67:level5 >+@list l65:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l67:level6 >+@list l65:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l67:level7 >+@list l65:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l67:level8 >+@list l65:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l67:level9 >+@list l65:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l68 >- {mso-list-id:887181412; >- mso-list-template-ids:-990851802;} >-@list l68:level2 >- {mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l69 >+@list l66 > {mso-list-id:898444859; > mso-list-type:hybrid; > mso-list-template-ids:-1487769696 2134686924 67698691 2134686924 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l69:level1 >+@list l66:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3172,14 +3165,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l69:level2 >+@list l66:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l69:level3 >+@list l66:level3 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3190,38 +3183,38 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l69:level4 >+@list l66:level4 > {mso-level-number-format:bullet; > mso-level-text:\F0B7; > mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Symbol;} >-@list l69:level5 >+@list l66:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l69:level6 >+@list l66:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l69:level7 >+@list l66:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l69:level8 >+@list l66:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l69:level9 >+@list l66:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l70 >+@list l67 > {mso-list-id:901136180; > mso-list-type:hybrid; > mso-list-template-ids:-1105954718 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l70:level1 >+@list l67:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3232,7 +3225,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l70:level2 >+@list l67:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:0in; >@@ -3240,7 +3233,7 @@ > margin-left:0in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l70:level3 >+@list l67:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:.5in; >@@ -3248,35 +3241,35 @@ > margin-left:.5in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l70:level4 >+@list l67:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l70:level5 >+@list l67:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l70:level6 >+@list l67:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l70:level7 >+@list l67:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l70:level8 >+@list l67:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l70:level9 >+@list l67:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l71 >+@list l68 > {mso-list-id:971642508; > mso-list-type:hybrid; > mso-list-template-ids:2041712328 2134686924 -1621047670 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l71:level1 >+@list l68:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3287,7 +3280,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l71:level2 >+@list l68:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0B7; >@@ -3298,119 +3291,119 @@ > font-family:Symbol; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Courier New";} >-@list l71:level3 >+@list l68:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l71:level4 >+@list l68:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l71:level5 >+@list l68:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l71:level6 >+@list l68:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l71:level7 >+@list l68:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l71:level8 >+@list l68:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l71:level9 >+@list l68:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72 >+@list l69 > {mso-list-id:1002977498; > mso-list-template-ids:2093908572;} >-@list l72:level1 >+@list l69:level1 > {mso-level-start-at:4; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72:level2 >+@list l69:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72:level3 >+@list l69:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72:level4 >+@list l69:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72:level5 >+@list l69:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72:level6 >+@list l69:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72:level7 >+@list l69:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72:level8 >+@list l69:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l72:level9 >+@list l69:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73 >+@list l70 > {mso-list-id:1058284527; > mso-list-template-ids:-1554224222;} >-@list l73:level1 >+@list l70:level1 > {mso-level-start-at:2; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73:level2 >+@list l70:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73:level3 >+@list l70:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73:level4 >+@list l70:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73:level5 >+@list l70:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73:level6 >+@list l70:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73:level7 >+@list l70:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73:level8 >+@list l70:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l73:level9 >+@list l70:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l74 >+@list l71 > {mso-list-id:1065110260; > mso-list-type:hybrid; > mso-list-template-ids:-2132538154 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l74:level1 >+@list l71:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3421,88 +3414,125 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l74:level2 >+@list l71:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l74:level3 >+@list l71:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l74:level4 >+@list l71:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l74:level5 >+@list l71:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l74:level6 >+@list l71:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l74:level7 >+@list l71:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l74:level8 >+@list l71:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l74:level9 >+@list l71:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75 >+@list l72 >+ {mso-list-id:1070614861; >+ mso-list-template-ids:-1936422876;} >+@list l72:level1 >+ {mso-level-start-at:3; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l73 > {mso-list-id:1077437679; > mso-list-template-ids:117594864;} >-@list l75:level1 >+@list l73:level1 > {mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75:level2 >+@list l73:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75:level3 >+@list l73:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75:level4 >+@list l73:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75:level5 >+@list l73:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75:level6 >+@list l73:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75:level7 >+@list l73:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75:level8 >+@list l73:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l75:level9 >+@list l73:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >+@list l74 >+ {mso-list-id:1111583647; >+ mso-list-template-ids:425088686;} >+@list l74:level1 >+ {mso-level-start-at:3; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l74:level2 >+ {mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l75 >+ {mso-list-id:1113012246; >+ mso-list-template-ids:-1000713136;} >+@list l75:level2 >+ {mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} > @list l76 >+ {mso-list-id:1118984753; >+ mso-list-template-ids:-1570717158;} >+@list l76:level1 >+ {mso-level-start-at:4; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l77 > {mso-list-id:1145395067; > mso-list-type:hybrid; > mso-list-template-ids:-1206773338 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l76:level1 >+@list l77:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -3513,7 +3543,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l76:level2 >+@list l77:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:.75in; >@@ -3521,7 +3551,7 @@ > margin-left:.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l76:level3 >+@list l77:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -3529,38 +3559,30 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l76:level4 >+@list l77:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l76:level5 >+@list l77:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l76:level6 >+@list l77:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l76:level7 >+@list l77:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l76:level8 >+@list l77:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l76:level9 >+@list l77:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l77 >- {mso-list-id:1171603962; >- mso-list-template-ids:-1274926482;} >-@list l77:level1 >- {mso-level-start-at:4; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} > @list l78 > {mso-list-id:1175998012; > mso-list-type:hybrid; >@@ -3763,18 +3785,13 @@ > mso-level-number-position:left; > text-indent:-.25in;} > @list l82 >- {mso-list-id:1247766601; >- mso-list-template-ids:186177076;} >+ {mso-list-id:1250384542; >+ mso-list-template-ids:1350069834;} > @list l82:level1 > {mso-level-start-at:3; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l82:level2 >- {mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} > @list l83 > {mso-list-id:1275092867; > mso-list-type:hybrid; >@@ -3923,60 +3940,49 @@ > mso-level-number-position:left; > text-indent:-.25in;} > @list l86 >- {mso-list-id:1313868342; >- mso-list-template-ids:-1329971654;} >-@list l86:level1 >- {mso-level-start-at:2; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l86:level2 >- {mso-level-start-at:2; >- mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l87 > {mso-list-id:1325205786; > mso-list-template-ids:-1640869422;} >-@list l87:level1 >+@list l86:level1 > {mso-level-start-at:3; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l87:level2 >+@list l86:level2 > {mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l87:level3 >+@list l86:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l87:level4 >+@list l86:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l87:level5 >+@list l86:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l87:level6 >+@list l86:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l87:level7 >+@list l86:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l87:level8 >+@list l86:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l87:level9 >+@list l86:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >+@list l87 >+ {mso-list-id:1337996649; >+ mso-list-template-ids:-2065381412;} > @list l88 > {mso-list-id:1353844832; > mso-list-type:hybrid; >@@ -4139,29 +4145,10 @@ > mso-level-number-position:left; > text-indent:-.25in;} > @list l91 >- {mso-list-id:1380084164; >- mso-list-template-ids:-1028766322;} >-@list l91:level1 >- {mso-level-start-at:2; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l92 >- {mso-list-id:1394813380; >- mso-list-template-ids:362418178;} >-@list l92:level1 >- {mso-level-start-at:2; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l93 >- {mso-list-id:1402748238; >- mso-list-template-ids:462949206;} >-@list l94 > {mso-list-id:1408916972; > mso-list-type:hybrid; > mso-list-template-ids:-666073592 2134686924 808464390 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l94:level1 >+@list l91:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -4172,7 +4159,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l94:level2 >+@list l91:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0D8; >@@ -4184,47 +4171,42 @@ > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman"; > mso-ansi-font-weight:normal;} >-@list l94:level3 >+@list l91:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l94:level4 >+@list l91:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l94:level5 >+@list l91:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l94:level6 >+@list l91:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l94:level7 >+@list l91:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l94:level8 >+@list l91:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l94:level9 >+@list l91:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l95 >- {mso-list-id:1415937199; >- mso-list-template-ids:494548728;} >-@list l95:level1 >- {mso-level-start-at:3; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l96 >+@list l92 >+ {mso-list-id:1412193490; >+ mso-list-template-ids:1630446124;} >+@list l93 > {mso-list-id:1417093946; > mso-list-type:hybrid; > mso-list-template-ids:1617962866 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l96:level1 >+@list l93:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -4235,132 +4217,132 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l96:level2 >+@list l93:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l96:level3 >+@list l93:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l96:level4 >+@list l93:level4 > {mso-level-number-format:bullet; > mso-level-text:\F0B7; > mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Symbol;} >-@list l96:level5 >+@list l93:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l96:level6 >+@list l93:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l96:level7 >+@list l93:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l96:level8 >+@list l93:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l96:level9 >+@list l93:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97 >+@list l94 > {mso-list-id:1424306011; > mso-list-template-ids:-947376482;} >-@list l97:level1 >+@list l94:level1 > {mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97:level2 >+@list l94:level2 > {mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97:level3 >+@list l94:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97:level4 >+@list l94:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97:level5 >+@list l94:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97:level6 >+@list l94:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97:level7 >+@list l94:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97:level8 >+@list l94:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l97:level9 >+@list l94:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98 >+@list l95 > {mso-list-id:1441997975; > mso-list-template-ids:-389105284;} >-@list l98:level1 >+@list l95:level1 > {mso-level-start-at:3; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98:level2 >+@list l95:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98:level3 >+@list l95:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98:level4 >+@list l95:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98:level5 >+@list l95:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98:level6 >+@list l95:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98:level7 >+@list l95:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98:level8 >+@list l95:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l98:level9 >+@list l95:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l99 >+@list l96 > {mso-list-id:1462259625; > mso-list-type:hybrid; > mso-list-template-ids:-1705469456 -994703330 67698691 -726208670 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l99:level1 >+@list l96:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0B7; >@@ -4371,7 +4353,7 @@ > font-family:Symbol; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l99:level2 >+@list l96:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.75in; >@@ -4379,7 +4361,7 @@ > margin-left:1.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l99:level3 >+@list l96:level3 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:2.25in; >@@ -4388,35 +4370,35 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l99:level4 >+@list l96:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l99:level5 >+@list l96:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l99:level6 >+@list l96:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l99:level7 >+@list l96:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l99:level8 >+@list l96:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l99:level9 >+@list l96:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l100 >+@list l97 > {mso-list-id:1492520990; > mso-list-type:hybrid; > mso-list-template-ids:1633064638 -1753948466 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l100:level1 >+@list l97:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0B7; >@@ -4427,151 +4409,137 @@ > font-family:Symbol; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l100:level2 >+@list l97:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l100:level3 >+@list l97:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l100:level4 >+@list l97:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l100:level5 >+@list l97:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l100:level6 >+@list l97:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l100:level7 >+@list l97:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l100:level8 >+@list l97:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l100:level9 >+@list l97:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l101 >- {mso-list-id:1510757109; >- mso-list-template-ids:1843431916;} >-@list l101:level1 >- {mso-level-start-at:3; >+@list l98 >+ {mso-list-id:1523664586; >+ mso-list-template-ids:125221976;} >+@list l98:level1 >+ {mso-level-start-at:2; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l101:level2 >- {mso-level-start-at:3; >- mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l102 >- {mso-list-id:1541434694; >- mso-list-template-ids:-432352304;} >-@list l102:level2 >- {mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l103 >+@list l99 > {mso-list-id:1545484964; > mso-list-template-ids:-811070720;} >-@list l103:level1 >+@list l99:level1 > {mso-level-start-at:4; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l103:level2 >+@list l99:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l103:level3 >+@list l99:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l103:level4 >+@list l99:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l103:level5 >+@list l99:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l103:level6 >+@list l99:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l103:level7 >+@list l99:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l103:level8 >+@list l99:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l103:level9 >+@list l99:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104 >+@list l100 > {mso-list-id:1562867714; > mso-list-template-ids:1563457352;} >-@list l104:level1 >+@list l100:level1 > {mso-level-start-at:3; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104:level2 >+@list l100:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104:level3 >+@list l100:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104:level4 >+@list l100:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104:level5 >+@list l100:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104:level6 >+@list l100:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104:level7 >+@list l100:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104:level8 >+@list l100:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l104:level9 >+@list l100:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l105 >+@list l101 > {mso-list-id:1565338330; > mso-list-type:hybrid; > mso-list-template-ids:1227649256 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l105:level1 >+@list l101:level1 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; >@@ -4579,7 +4547,7 @@ > margin-left:1.0in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l105:level2 >+@list l101:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.25in; >@@ -4587,39 +4555,60 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l105:level3 >+@list l101:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l105:level4 >+@list l101:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l105:level5 >+@list l101:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l105:level6 >+@list l101:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l105:level7 >+@list l101:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l105:level8 >+@list l101:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l105:level9 >+@list l101:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l106 >+@list l102 >+ {mso-list-id:1572346584; >+ mso-list-template-ids:-348780362;} >+@list l102:level1 >+ {mso-level-start-at:4; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l102:level2 >+ {mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l103 >+ {mso-list-id:1586527046; >+ mso-list-template-ids:496399036;} >+@list l103:level1 >+ {mso-level-start-at:2; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l104 > {mso-list-id:1590432885; > mso-list-type:hybrid; > mso-list-template-ids:657504852 -994703330 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l106:level1 >+@list l104:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0B7; >@@ -4630,14 +4619,14 @@ > font-family:Symbol; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l106:level2 >+@list l104:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l106:level3 >+@list l104:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:2.25in; >@@ -4645,35 +4634,35 @@ > margin-left:2.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l106:level4 >+@list l104:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l106:level5 >+@list l104:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l106:level6 >+@list l104:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l106:level7 >+@list l104:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l106:level8 >+@list l104:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l106:level9 >+@list l104:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l107 >+@list l105 > {mso-list-id:1604219207; > mso-list-type:hybrid; > mso-list-template-ids:362727156 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l107:level1 >+@list l105:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -4684,49 +4673,49 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l107:level2 >+@list l105:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l107:level3 >+@list l105:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l107:level4 >+@list l105:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l107:level5 >+@list l105:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l107:level6 >+@list l105:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l107:level7 >+@list l105:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l107:level8 >+@list l105:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l107:level9 >+@list l105:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l108 >+@list l106 > {mso-list-id:1618876345; > mso-list-type:hybrid; > mso-list-template-ids:-2085968786 2134686924 -1621047670 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l108:level1 >+@list l106:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -4737,7 +4726,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l108:level2 >+@list l106:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0B7; >@@ -4748,39 +4737,39 @@ > font-family:Symbol; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Courier New";} >-@list l108:level3 >+@list l106:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l108:level4 >+@list l106:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l108:level5 >+@list l106:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l108:level6 >+@list l106:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l108:level7 >+@list l106:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l108:level8 >+@list l106:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l108:level9 >+@list l106:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l109 >+@list l107 > {mso-list-id:1620720892; > mso-list-type:hybrid; > mso-list-template-ids:-1327047330 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l109:level1 >+@list l107:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -4791,14 +4780,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l109:level2 >+@list l107:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l109:level3 >+@list l107:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:.5in; >@@ -4806,7 +4795,7 @@ > margin-left:.5in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l109:level4 >+@list l107:level4 > {mso-level-number-format:bullet; > mso-level-text:\F0B7; > mso-level-tab-stop:1.0in; >@@ -4814,7 +4803,7 @@ > margin-left:1.0in; > text-indent:-.25in; > font-family:Symbol;} >-@list l109:level5 >+@list l107:level5 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.5in; >@@ -4822,69 +4811,82 @@ > margin-left:1.5in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l109:level6 >+@list l107:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l109:level7 >+@list l107:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l109:level8 >+@list l107:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l109:level9 >+@list l107:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110 >+@list l108 >+ {mso-list-id:1670399183; >+ mso-list-template-ids:-323341042;} >+@list l108:level1 >+ {mso-level-start-at:2; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l108:level2 >+ {mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l109 > {mso-list-id:1687369378; > mso-list-template-ids:624744478;} >-@list l110:level1 >+@list l109:level1 > {mso-level-start-at:2; > mso-level-tab-stop:.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110:level2 >+@list l109:level2 > {mso-level-start-at:2; > mso-level-number-format:alpha-lower; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110:level3 >+@list l109:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110:level4 >+@list l109:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110:level5 >+@list l109:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110:level6 >+@list l109:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110:level7 >+@list l109:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110:level8 >+@list l109:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l110:level9 >+@list l109:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l111 >+@list l110 > {mso-list-id:1699965015; > mso-list-type:hybrid; > mso-list-template-ids:1316545594 -726208670 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l111:level1 >+@list l110:level1 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:1.25in; >@@ -4893,49 +4895,49 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l111:level2 >+@list l110:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l111:level3 >+@list l110:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l111:level4 >+@list l110:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l111:level5 >+@list l110:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l111:level6 >+@list l110:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l111:level7 >+@list l110:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l111:level8 >+@list l110:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l111:level9 >+@list l110:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l112 >+@list l111 > {mso-list-id:1733849178; > mso-list-type:hybrid; > mso-list-template-ids:485139576 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l112:level1 >+@list l111:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -4946,7 +4948,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l112:level2 >+@list l111:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:.75in; >@@ -4954,7 +4956,7 @@ > margin-left:.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l112:level3 >+@list l111:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -4962,35 +4964,35 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l112:level4 >+@list l111:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l112:level5 >+@list l111:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l112:level6 >+@list l111:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l112:level7 >+@list l111:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l112:level8 >+@list l111:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l112:level9 >+@list l111:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l113 >+@list l112 > {mso-list-id:1757552992; > mso-list-type:hybrid; > mso-list-template-ids:999470556 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l113:level1 >+@list l112:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5001,14 +5003,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l113:level2 >+@list l112:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l113:level3 >+@list l112:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:.5in; >@@ -5016,30 +5018,38 @@ > margin-left:.5in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l113:level4 >+@list l112:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l113:level5 >+@list l112:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l113:level6 >+@list l112:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l113:level7 >+@list l112:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l113:level8 >+@list l112:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l113:level9 >+@list l112:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >+@list l113 >+ {mso-list-id:1786537623; >+ mso-list-template-ids:454224160;} >+@list l113:level1 >+ {mso-level-start-at:2; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} > @list l114 > {mso-list-id:1795322339; > mso-list-template-ids:-820578286;} >@@ -5176,23 +5186,10 @@ > mso-level-number-position:left; > text-indent:-.25in;} > @list l117 >- {mso-list-id:1918510491; >- mso-list-template-ids:-1006493958;} >-@list l117:level1 >- {mso-level-start-at:2; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l117:level2 >- {mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l118 > {mso-list-id:1933586812; > mso-list-type:hybrid; > mso-list-template-ids:721191082 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l118:level1 >+@list l117:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5203,49 +5200,49 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l118:level2 >+@list l117:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l118:level3 >+@list l117:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l118:level4 >+@list l117:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l118:level5 >+@list l117:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l118:level6 >+@list l117:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l118:level7 >+@list l117:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l118:level8 >+@list l117:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l118:level9 >+@list l117:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l119 >+@list l118 > {mso-list-id:1936938439; > mso-list-type:hybrid; > mso-list-template-ids:430091890 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l119:level1 >+@list l118:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5256,43 +5253,43 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l119:level2 >+@list l118:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l119:level3 >+@list l118:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l119:level4 >+@list l118:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l119:level5 >+@list l118:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l119:level6 >+@list l118:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l119:level7 >+@list l118:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l119:level8 >+@list l118:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l119:level9 >+@list l118:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l120 >+@list l119 > {mso-list-id:1980066461; > mso-list-type:hybrid; > mso-list-template-ids:-1170932670 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l120:level1 >+@list l119:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5303,49 +5300,49 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l120:level2 >+@list l119:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l120:level3 >+@list l119:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:Wingdings;} >-@list l120:level4 >+@list l119:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l120:level5 >+@list l119:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l120:level6 >+@list l119:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l120:level7 >+@list l119:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l120:level8 >+@list l119:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l120:level9 >+@list l119:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l121 >+@list l120 > {mso-list-id:1992634267; > mso-list-type:hybrid; > mso-list-template-ids:432185780 67698691 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l121:level1 >+@list l120:level1 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; >@@ -5353,7 +5350,7 @@ > margin-left:1.0in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l121:level2 >+@list l120:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.25in; >@@ -5361,39 +5358,39 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l121:level3 >+@list l120:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l121:level4 >+@list l120:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l121:level5 >+@list l120:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l121:level6 >+@list l120:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l121:level7 >+@list l120:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l121:level8 >+@list l120:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l121:level9 >+@list l120:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l122 >+@list l121 > {mso-list-id:1995179714; > mso-list-type:hybrid; > mso-list-template-ids:1186108464 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l122:level1 >+@list l121:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5404,7 +5401,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l122:level2 >+@list l121:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:.75in; >@@ -5412,7 +5409,7 @@ > margin-left:.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l122:level3 >+@list l121:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -5420,30 +5417,38 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l122:level4 >+@list l121:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l122:level5 >+@list l121:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l122:level6 >+@list l121:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l122:level7 >+@list l121:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l122:level8 >+@list l121:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l122:level9 >+@list l121:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >+@list l122 >+ {mso-list-id:2003073928; >+ mso-list-template-ids:-661907178;} >+@list l122:level1 >+ {mso-level-start-at:2; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} > @list l123 > {mso-list-id:2019773860; > mso-list-type:hybrid; >@@ -5500,10 +5505,23 @@ > mso-level-number-position:left; > text-indent:-.25in;} > @list l124 >+ {mso-list-id:2021159892; >+ mso-list-template-ids:-989309226;} >+@list l124:level1 >+ {mso-level-start-at:2; >+ mso-level-tab-stop:.5in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l124:level2 >+ {mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; >+ mso-level-number-position:left; >+ text-indent:-.25in;} >+@list l125 > {mso-list-id:2031757097; > mso-list-type:hybrid; > mso-list-template-ids:117491490 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l124:level1 >+@list l125:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5514,14 +5532,14 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l124:level2 >+@list l125:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in; > font-family:"Courier New";} >-@list l124:level3 >+@list l125:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -5529,35 +5547,35 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l124:level4 >+@list l125:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l124:level5 >+@list l125:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l124:level6 >+@list l125:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l124:level7 >+@list l125:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l124:level8 >+@list l125:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l124:level9 >+@list l125:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l125 >+@list l126 > {mso-list-id:2041200942; > mso-list-type:hybrid; > mso-list-template-ids:639007036 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l125:level1 >+@list l126:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5568,7 +5586,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l125:level2 >+@list l126:level2 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:-.75in; >@@ -5576,7 +5594,7 @@ > margin-left:-.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l125:level3 >+@list l126:level3 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:-.25in; >@@ -5584,7 +5602,7 @@ > margin-left:-.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l125:level4 >+@list l126:level4 > {mso-level-number-format:bullet; > mso-level-text:\F0B7; > mso-level-tab-stop:.25in; >@@ -5592,7 +5610,7 @@ > margin-left:.25in; > text-indent:-.25in; > font-family:Symbol;} >-@list l125:level5 >+@list l126:level5 > {mso-level-number-format:bullet; > mso-level-text:o; > mso-level-tab-stop:.75in; >@@ -5600,7 +5618,7 @@ > margin-left:.75in; > text-indent:-.25in; > font-family:"Courier New";} >-@list l125:level6 >+@list l126:level6 > {mso-level-number-format:bullet; > mso-level-text:\F0A7; > mso-level-tab-stop:1.25in; >@@ -5608,23 +5626,23 @@ > margin-left:1.25in; > text-indent:-.25in; > font-family:Wingdings;} >-@list l125:level7 >+@list l126:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l125:level8 >+@list l126:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l125:level9 >+@list l126:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l126 >+@list l127 > {mso-list-id:2049453896; > mso-list-type:hybrid; > mso-list-template-ids:-1897397562 2134686924 -1621047670 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l126:level1 >+@list l127:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5635,7 +5653,7 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l126:level2 >+@list l127:level2 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\F0B7; >@@ -5646,39 +5664,39 @@ > font-family:Symbol; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Courier New";} >-@list l126:level3 >+@list l127:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l126:level4 >+@list l127:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l126:level5 >+@list l127:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l126:level6 >+@list l127:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l126:level7 >+@list l127:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l126:level8 >+@list l127:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l126:level9 >+@list l127:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l127 >+@list l128 > {mso-list-id:2069038354; > mso-list-type:hybrid; > mso-list-template-ids:1748389086 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l127:level1 >+@list l128:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5689,43 +5707,43 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l127:level2 >+@list l128:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l127:level3 >+@list l128:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l127:level4 >+@list l128:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l127:level5 >+@list l128:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l127:level6 >+@list l128:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l127:level7 >+@list l128:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l127:level8 >+@list l128:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l127:level9 >+@list l128:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l128 >+@list l129 > {mso-list-id:2073431378; > mso-list-type:hybrid; > mso-list-template-ids:-2138780088 -726208670 -726208670 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l128:level1 >+@list l129:level1 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:1.25in; >@@ -5734,7 +5752,7 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l128:level2 >+@list l129:level2 > {mso-level-number-format:bullet; > mso-level-text:\25AA; > mso-level-tab-stop:2.0in; >@@ -5743,39 +5761,39 @@ > text-indent:-.25in; > font-family:"Courier New"; > mso-bidi-font-family:"Times New Roman";} >-@list l128:level3 >+@list l129:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l128:level4 >+@list l129:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l128:level5 >+@list l129:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l128:level6 >+@list l129:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l128:level7 >+@list l129:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l128:level8 >+@list l129:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l128:level9 >+@list l129:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l129 >+@list l130 > {mso-list-id:2074303821; > mso-list-type:hybrid; > mso-list-template-ids:1180717114 2134686924 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;} >-@list l129:level1 >+@list l130:level1 > {mso-level-start-at:0; > mso-level-number-format:bullet; > mso-level-text:\25CF; >@@ -5786,51 +5804,38 @@ > font-family:Arial; > mso-fareast-font-family:"Times New Roman"; > mso-bidi-font-family:"Times New Roman";} >-@list l129:level2 >+@list l130:level2 > {mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l129:level3 >+@list l130:level3 > {mso-level-tab-stop:1.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l129:level4 >+@list l130:level4 > {mso-level-tab-stop:2.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l129:level5 >+@list l130:level5 > {mso-level-tab-stop:2.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l129:level6 >+@list l130:level6 > {mso-level-tab-stop:3.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l129:level7 >+@list l130:level7 > {mso-level-tab-stop:3.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l129:level8 >+@list l130:level8 > {mso-level-tab-stop:4.0in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l129:level9 >+@list l130:level9 > {mso-level-tab-stop:4.5in; > mso-level-number-position:left; > text-indent:-.25in;} >-@list l130 >- {mso-list-id:2098019168; >- mso-list-template-ids:1058841578;} >-@list l130:level1 >- {mso-level-start-at:3; >- mso-level-tab-stop:.5in; >- mso-level-number-position:left; >- text-indent:-.25in;} >-@list l130:level2 >- {mso-level-number-format:alpha-lower; >- mso-level-tab-stop:1.0in; >- mso-level-number-position:left; >- text-indent:-.25in;} > @list l131 > {mso-list-id:2116054651; > mso-list-type:hybrid; >@@ -5880,11 +5885,11 @@ > mso-level-number-position:left; > text-indent:-.25in;} > @list l132 >- {mso-list-id:2123720145; >- mso-list-template-ids:-1147102270;} >-@list l132:level1 >- {mso-level-start-at:2; >- mso-level-tab-stop:.5in; >+ {mso-list-id:2142116560; >+ mso-list-template-ids:-986394142;} >+@list l132:level2 >+ {mso-level-number-format:alpha-lower; >+ mso-level-tab-stop:1.0in; > mso-level-number-position:left; > text-indent:-.25in;} > ol >@@ -5909,7 +5914,12 @@ > font-size:10.0pt; > font-family:"Times New Roman";} > </style> >-<![endif]--> >+<![endif]--><!--[if gte mso 9]><xml> >+ <o:shapedefaults v:ext="edit" spidmax="2050"/> >+</xml><![endif]--><!--[if gte mso 9]><xml> >+ <o:shapelayout v:ext="edit"> >+ <o:idmap v:ext="edit" data="1"/> >+ </o:shapelayout></xml><![endif]--> > </head> > > <body lang=EN-US link=blue vlink=purple style='tab-interval:.5in'> >@@ -5964,12 +5974,12 @@ > </v:formulas> > <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/> > <o:lock v:ext="edit" aspectratio="t"/> >-</v:shapetype><v:shape id="_x0000_i1044" type="#_x0000_t75" alt="" style='width:9.75pt; >+</v:shapetype><v:shape id="_x0000_i1026" type="#_x0000_t75" alt="" style='width:9.75pt; > height:9.75pt'> > <v:imagedata src="guide_files/image001.gif" o:href="http://www.eclipse.org/uml2/docs/plans/new.gif"/> > </v:shape><![endif]--><![if !vml]><img width=13 height=13 >-src="guide_files/image001.gif" v:shapes="_x0000_i1044"><![endif]> <span >-style='mso-spacerun:yes'> </span>marks interesting changes over the previous >+src="guide_files/image001.gif" v:shapes="_x0000_i1026"><![endif]><span >+style='mso-spacerun:yes'> </span>marks interesting changes over the previous > revision)</p> > > <p class=MsoNormal> </p> >@@ -5996,10 +6006,9 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoDate><st1:date Year="2006" Day="13" Month="6">June 13, 2006</st1:date></p> >+<p class=MsoDate><st1:date Month="6" Day="13" Year="2006">June 13, 2006</st1:date></p> > >-<p class=MsoBodyText>James Bruck and <span class=SpellE>Kenn</span> Hussey, IBM >-</p> >+<p class=MsoBodyText>James Bruck and Kenn Hussey, IBM </p> > > <div class=MsoNormal align=center style='text-align:center'><span > style='font-size:10.0pt;font-family:Arial'> >@@ -6008,10 +6017,10 @@ > > </span></div> > >-<span style='font-size:14.0pt;font-family:Arial;mso-fareast-font-family:"Times New Roman"; >-mso-ansi-language:EN-US;mso-fareast-language:EN-US;mso-bidi-language:AR-SA'><br >-clear=all style='page-break-before:always'> >-</span> >+<b><i><span style='font-size:14.0pt;font-family:Arial;mso-fareast-font-family: >+"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:EN-US; >+mso-bidi-language:AR-SA'><br clear=all style='page-break-before:always'> >+</span></i></b> > > <h2>Goals</h2> > >@@ -6026,20 +6035,20 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet3 style='mso-list:l18 level1 lfo6;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l17 level1 lfo6;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:Arial;mso-fareast-font-family:Arial'><span style='mso-list: > Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Summary of newly refined concepts will be > covered in the section <a href="#_Superstructure_Specification_change_1">Superstructure > Specification Changes</a></p> > >-<p class=MsoListBullet3 style='mso-list:l40 level1 lfo8;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l37 level1 lfo8;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:Arial;mso-fareast-font-family:Arial'><span style='mso-list: > Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Migration tips will be covered in the section > entitled <a href="#_API_Migration">API Migration</a>.</p> > >-<p class=MsoListBullet3 style='mso-list:l127 level1 lfo10;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l128 level1 lfo10;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:Arial;mso-fareast-font-family:Arial'><span style='mso-list: > Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Data migration of existing models and profiles >@@ -6114,8 +6123,8 @@ > <p class=MsoNormal>This refers to the latest version of the UML API which is > based on the UML2.1 specification defined by OMG.</p> > <p class=MsoNormal> </p> >- <p class=MsoNormal>The latest draft of the UML 2.1 Superstructure Specification >- can be found at:</p> >+ <p class=MsoNormal>The latest draft of the UML 2.1 Superstructure >+ Specification can be found at:</p> > <p class=MsoNormal><a href="http://www.omg.org/docs/ptc/06-04-02.pdf">http://www.omg.org/docs/ptc/06-04-02.pdf</a></p> > <p class=MsoNormal> </p> > </td> >@@ -6177,8 +6186,8 @@ > <td width=559 valign=top style='width:419.4pt;border-top:none;border-left: > none;border-bottom:solid black 1.5pt;border-right:solid black 1.0pt; > padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal>Finalization Task Force. A process which the OMG uses >- to finalize a specification.</p> >+ <p class=MsoNormal>Finalization Task Force. A process which the OMG >+ uses to finalize a specification.</p> > <p class=MsoNormal> </p> > </td> > </tr> >@@ -6192,8 +6201,8 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoBodyText>Depending on your requirements, you will presumably be >-interested in one or more of the following aspects of migration: API migration, >+<p class=MsoBodyText>Depending on your requirements, you will presumably be interested >+in one or more of the following aspects of migration: API migration, > artifact migration, or discovering what has changed in UML. </p> > > <p class=MsoBodyText>This document is structured to help you accomplish your >@@ -6291,26 +6300,26 @@ > 2.0 Project Plan</a>, several key points should be re-iterated before > continuing:</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l119 level1 lfo14; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l118 level1 lfo14; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial'><span style='mso-list:Ignore'>●<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>The > older UML2 1.x version will <b>not</b> be shipped together with the newer UML2 > 2.0 version.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l60 level1 lfo16; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l59 level1 lfo16; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial'><span style='mso-list:Ignore'>●<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>UML2 > 2.0 will <b>not</b> be upwards contract-compatible with UML2 1.x.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l53 level1 lfo18; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l52 level1 lfo18; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial'><span style='mso-list:Ignore'>●<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>UML2 > 2.0 will <b>not</b> be upwards binary-compatible with UML2 1.x.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l126 level1 lfo20; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l127 level1 lfo20; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial'><span style='mso-list:Ignore'>●<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>The >@@ -6353,7 +6362,7 @@ > <p class=MsoNormal> </p> > > <p class=MsoNormal> >-<img border=0 width=671 height=337 id="_x0000_i1027" >+<img border=0 width=671 height=337 id="_x0000_i1028" > src="guide_files/image002.jpg"></p> > > <p class=MsoNormal> </p> >@@ -6367,7 +6376,7 @@ > that the UML2 1.x is based on an interim draft of the UML 2.0 version of the > specification.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l71 level1 lfo26; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l68 level1 lfo26; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial'><span style='mso-list:Ignore'>●<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Also, >@@ -6388,17 +6397,17 @@ > discussed in this document has been obtained is from summarizing these FTF and > RTF ballots.</p> > >-<span style='font-size:13.0pt;font-family:Arial;mso-fareast-font-family:"Times New Roman"; >-mso-ansi-language:EN-US;mso-fareast-language:EN-US;mso-bidi-language:AR-SA'><br >-clear=all style='page-break-before:always'> >-</span> >+<b><span style='font-size:13.0pt;font-family:Arial;mso-fareast-font-family: >+"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:EN-US; >+mso-bidi-language:AR-SA'><br clear=all style='page-break-before:always'> >+</span></b> > > <h3 style='margin-left:0in;text-indent:0in'>Key Changes</h3> > > <p class=MsoNormal> </p> > >-<p class=MsoBodyText>Several key changes can be distilled out of the updated Superstructure >-specification.</p> >+<p class=MsoBodyText>Several key changes can be distilled out of the updated >+Superstructure specification.</p> > > <h4 style='margin-left:0in;text-indent:0in'><a name="_Events"></a>Events</h4> > >@@ -6407,7 +6416,7 @@ > <p class=MsoBodyText>Lets first review the differences between Trigger, Event > and Message:</p> > >-<p class=MsoListBullet style='margin-left:1.0in;mso-list:l108 level1 lfo28; >+<p class=MsoListBullet style='margin-left:1.0in;mso-list:l106 level1 lfo28; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -6446,46 +6455,40 @@ > <p class=MsoBodyText><span style='color:black'>So what has changed? </span></p> > > <p class=MsoBodyText>In the latest version of the specification, the concept of >-Event has been separated from the concept of Trigger. The Trigger <span >-class=SpellE>metatype</span> is now a concrete class whereas in the past, this >-was an abstract class. The various concrete triggers such as <span >-class=SpellE>CallTrigger</span>, have been removed and replaced by a >-corresponding Event type (i.e. <span class=SpellE>CallEvent</span>).</p> >+Event has been separated from the concept of Trigger. The Trigger >+metatype is now a concrete class whereas in the past, this was an abstract >+class. The various concrete triggers such as CallTrigger, have been >+removed and replaced by a corresponding Event type (i.e. CallEvent).</p> > > <p class=MsoBodyText>For a given model to be considered valid, all triggers >-must refer to some event. A trigger must refer to an event since triggers relate >-events to behaviors. </p> >+must refer to some event. A trigger must refer to an event since triggers >+relate events to behaviors. </p> > >-<p class=MsoBodyText>Triggers can be owned either by transitions or by <span >-class=SpellE>behaviored</span> classifiers (as an example). </p> >+<p class=MsoBodyText>Triggers can be owned either by transitions or by >+behaviored classifiers (as an example). </p> > > <p class=MsoBodyText>Existing code presumably has transitions owning one of the >-various trigger types such as <span class=SpellE>CallTrigger</span>. Such >-code should be changed such that the transition will refer to the concrete >-trigger type and the trigger will refer to an event created somewhere at the >-package level (events are <span class=SpellE>packageable</span> elements and >-are owned by some package).</p> >+various trigger types such as CallTrigger. Such code should be changed >+such that the transition will refer to the concrete trigger type and the >+trigger will refer to an event created somewhere at the package level (events >+are packageable elements and are owned by some package).</p> > > <p class=MsoBodyText>In order to create an event for a particular transition, > one could:</p> > >-<p class=MsoListBullet2 style='mso-list:l129 level1 lfo30;tab-stops:list .75in'><![if !supportLists]><span >+<p class=MsoListBullet2 style='mso-list:l130 level1 lfo30;tab-stops:list .75in'><![if !supportLists]><span > style='font-family:Arial;mso-fareast-font-family:Arial'><span style='mso-list: > Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Find the nearest package using the <span >-class=SpellE><span style='font-family:"Courier New"'>Element#<span class=GramE>getNearestPackage</span></span></span><span >-class=GramE><span style='font-family:"Courier New"'>(</span></span><span >-style='font-family:"Courier New"'>)</span> function.</p> >+style='font-family:"Courier New"'>Element#<span class=GramE>getNearestPackage(</span>)</span> >+function.</p> > >-<p class=MsoListBullet2 style='mso-list:l57 level1 lfo32;tab-stops:list .75in'><![if !supportLists]><span >+<p class=MsoListBullet2 style='mso-list:l56 level1 lfo32;tab-stops:list .75in'><![if !supportLists]><span > style='font-family:Arial;mso-fareast-font-family:Arial'><span style='mso-list: > Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>Call <span class=SpellE><span style='font-family: >-"Courier New"'>Package#<span class=GramE>createPackagedElement</span></span></span><span >-class=GramE><span style='font-family:"Courier New"'>(</span></span><span >-class=SpellE><span style='font-family:"Courier New"'>EClass</span></span><span >-style='font-family:"Courier New"'>)</span>. You would pass the event type >-as a parameter.</p> >+</span></span></span><![endif]>Call <span style='font-family:"Courier New"'>Package#<span >+class=GramE>createPackagedElement(</span>EClass)</span>. You would pass >+the event type as a parameter.</p> > > <p class=MsoNormal> </p> > >@@ -6502,19 +6505,19 @@ > occurrence. An event is a model element that specifies a set of possible > event<b> </b>occurrences all of the same kind.</p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l120 level1 lfo34; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l119 level1 lfo34; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Event</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l63 level1 lfo36; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l61 level1 lfo36; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>State > changes of a system are the result of the occurrence of some<b> event.</b> </p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l105 level1 lfo38; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l101 level1 lfo38; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><b>Creation >@@ -6526,28 +6529,28 @@ > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><b>Destruction > events</b> occur when the system destroys an object.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l7 level1 lfo42; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l6 level1 lfo42; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><b>Execution > events</b> occur at the start of an Action or Behavior which is referenced by > the object of the lifeline.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l121 level1 lfo44; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l120 level1 lfo44; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><b>Message > events</b> occur as a result of the sending or the receiving of <b>messages</b> > from one object to another. </p> > >-<p class=MsoListBullet3 style='margin-left:1.25in;mso-list:l61 level1 lfo46; >+<p class=MsoListBullet3 style='margin-left:1.25in;mso-list:l60 level1 lfo46; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>▪<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>The > message event instance can reference either an operation that was called or a > signal that is sent.</p> > >-<p class=MsoListBullet4 style='margin-left:1.25in;mso-list:l128 level1 lfo48; >+<p class=MsoListBullet4 style='margin-left:1.25in;mso-list:l129 level1 lfo48; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>▪<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>It >@@ -6559,26 +6562,26 @@ > > <p class=MsoNormal style='margin-left:21.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l107 level1 lfo50; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l105 level1 lfo50; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE>OccurrenceSpecification</span></p> >+</span></span></span><![endif]>OccurrenceSpecification</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Occurrence > specifications model the occurrence of an event.</p> > >-<p class=MsoListBullet4 style='margin-left:1.25in;mso-list:l111 level1 lfo54; >+<p class=MsoListBullet4 style='margin-left:1.25in;mso-list:l110 level1 lfo54; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>▪<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Occurrence > specifications represents points on a lifeline that deliver the anchors for > Messages and execution specifications</p> > >-<p class=MsoListBullet4 style='margin-left:1.25in;mso-list:l42 level1 lfo56; >+<p class=MsoListBullet4 style='margin-left:1.25in;mso-list:l39 level1 lfo56; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>▪<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Occurrence >@@ -6587,13 +6590,13 @@ > > <p class=MsoNormal style='margin-left:3.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l6 level1 lfo58; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l5 level1 lfo58; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE>ExecutionOccurrenceSpecification</span></p> >+</span></span></span><![endif]>ExecutionOccurrenceSpecification</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Reference >@@ -6601,38 +6604,37 @@ > > <p class=MsoNormal style='margin-left:3.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l24 level1 lfo60; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l22 level1 lfo60; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE>ExecutionSpecification</span> >-(abstract)</p> >+</span></span></span><![endif]>ExecutionSpecification (abstract)</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>The >-concrete types are <span class=SpellE>BehaviorExecutionSpecification</span> and >-<span class=SpellE>ActionExecutionSpecification</span>.</p> >+concrete types are BehaviorExecutionSpecification and >+ActionExecutionSpecification.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>An >-execution specification does not model an event. Instead, it models the >-act of some object executing some portion of its behavior specification (e.g., >+execution specification does not model an event. Instead, it models the act >+of some object executing some portion of its behavior specification (e.g., > executing an action or behavior).</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>An > execution specification defines <b>start</b> and <b>finish</b> points on the >-lifeline, which define its active period, and reference the corresponding >-action or behavior that is executing. A <b>start</b> and <b>finish</b> must be >+lifeline, which define its active period, and reference the corresponding action >+or behavior that is executing. A <b>start</b> and <b>finish</b> must be > specified.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Messages >@@ -6642,13 +6644,13 @@ > > <p class=MsoNormal style='margin-left:3.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l118 level1 lfo62; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l117 level1 lfo62; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Message</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>A >@@ -6656,20 +6658,20 @@ > asynchronous signal send). The message carries the information about the > call and is sent from the invoking object and received by the invoked object.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Objects > can communicate via messages.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Messages > have <b>arguments</b> if the called <b>operation</b> has parameters, or <b>attributes</b> > if the message sends a <b>signal</b>.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l100 level2 lfo52; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l97 level2 lfo52; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Messages >@@ -6685,25 +6687,24 @@ > > <p class=MsoBodyText><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l19 level1 lfo64; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l18 level1 lfo64; > tab-stops:list .75in 1.0in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE>OccurrenceSpecification</span> >-<span style='font-weight:normal'>is a newly introduced type that replaces</span> >-<span class=SpellE>EventOccurrence</span>.</p> >- >-<p class=MsoListBullet2>The new specification introduces two new types of <span >-class=SpellE>OccurrenceSpecification</span>: <b>event occurrence specifications</b> >-and <b>message occurrence specifications</b>. </p> >+</span></span></span><![endif]>OccurrenceSpecification <span style='font-weight: >+normal'>is a newly introduced type that replaces</span> EventOccurrence.</p> > >-<p class=MsoListBullet3 style='mso-list:l106 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet2>The new specification introduces two new types of >+OccurrenceSpecification: <b>event occurrence specifications</b> and <b>message >+occurrence specifications</b>. </p> >+ >+<p class=MsoListBullet3 style='mso-list:l104 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>In order to migrate older event occurrences you > can follow this rule of thumb:</p> > >-<p class=MsoListBullet3 style='margin-left:1.5in;mso-list:l99 level3 lfo68; >+<p class=MsoListBullet3 style='margin-left:1.5in;mso-list:l96 level3 lfo68; > tab-stops:list 1.5in 2.25in'><![if !supportLists]><span style='font-family: > "Courier New";mso-fareast-font-family:"Courier New"'><span style='mso-list: > Ignore'>▪<span style='font:7.0pt "Times New Roman"'> >@@ -6711,34 +6712,34 @@ > going out of the event occurrence, then it can be replaced with message > occurrence specification.</p> > >-<p class=MsoListBullet4 style='mso-list:l99 level3 lfo68;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span >+<p class=MsoListBullet4 style='mso-list:l96 level3 lfo68;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>If there is a spontaneous stop, then you can > replace with an occurrence specification and refer to a destruction event.</p> > >-<p class=MsoListBullet4 style='margin-left:1.0in;mso-list:l106 level2 lfo66; >+<p class=MsoListBullet4 style='margin-left:1.0in;mso-list:l104 level2 lfo66; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>If > the event occurrence starts or finishes an independent execution occurrence > then it maps to and execution occurrence specification.</p> > >-<p class=MsoListBullet3 style='mso-list:l106 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l104 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Occurrence specifications <b>must</b> reference > an event.</p> > >-<p class=MsoListBullet3 style='mso-list:l106 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l104 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><b>Events</b> could be referenced by <b>multiple</b> > occurrence specifications or triggers. Since an event is owned by a >-package, this is a convenient way to tie together both <span class=SpellE>statechart</span> >-concepts and sequence concepts.</p> >+package, this is a convenient way to tie together both statechart concepts and >+sequence concepts.</p> > >-<p class=MsoListBullet3 style='mso-list:l106 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l104 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><b>Differing messages </b>that refer to the same >@@ -6750,49 +6751,46 @@ > > <p class=MsoNormal><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l66 level1 lfo70; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l63 level1 lfo70; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>The Stop <span class=SpellE><span >-style='font-weight:normal'>metaclass</span></span><span style='font-weight: >-normal'> has been removed from the latest version</span>.</p> >+</span></span></span><![endif]>The Stop <span style='font-weight:normal'>metaclass >+has been removed from the latest version</span>.</p> > >-<p class=MsoListBullet3 style='mso-list:l106 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l104 level2 lfo66;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>Stop used to be a specialization of <span >-class=SpellE>EventOccurrence</span>. Now, stops should be replaced >-by creating either an occurrence specification or a message occurrence >-specification that references a <b>destruction event</b>.</p> >+</span></span></span><![endif]>Stop used to be a specialization of >+EventOccurrence. Now, stops should be replaced by creating either >+an occurrence specification or a message occurrence specification that >+references a <b>destruction event</b>.</p> > > <p class=MsoNormal style='margin-left:-87.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l122 level1 lfo72; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l121 level1 lfo72; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE>ExecutionOccurrence</span> >-(older)</p> >+</span></span></span><![endif]>ExecutionOccurrence (older)</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l20 level2 lfo74; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l19 level2 lfo74; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Mapped >-to either an <b>action <span class=SpellE>exection</span> specification</b> >-that references an action, or a <b>behavior <span class=SpellE>exection</span> >-specification</b> that refers to a behavior (more general).</p> >+to either an <b>action exection specification</b> that references an action, or >+a <b>behavior exection specification</b> that refers to a behavior (more >+general).</p> > > <p class=MsoNormal style='margin-left:-105.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l122 level1 lfo72; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l121 level1 lfo72; > tab-stops:list .25in .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE>EventOccurrence</span> >-(older)</p> >+</span></span></span><![endif]>EventOccurrence (older)</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l21 level2 lfo76; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l20 level2 lfo76; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>In >@@ -6802,13 +6800,13 @@ > > <p class=MsoNormal style='margin-left:-105.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l122 level1 lfo72; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l121 level1 lfo72; > tab-stops:list .25in .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Message</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l124 level2 lfo78; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l125 level2 lfo78; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>A >@@ -6820,7 +6818,7 @@ > referenced by the message occurrence specification. Those events can > refer to operations or signals from which the signature is derived.</p> > >-<p class=MsoListBullet3 style='mso-list:l124 level2 lfo78;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l125 level2 lfo78;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>If an operation is not present, it is derived >@@ -6829,23 +6827,22 @@ > > <p class=MsoNormal style='margin-left:-105.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l122 level1 lfo72; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l121 level1 lfo72; > tab-stops:list .25in .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE>MessageSort</span></p> >+</span></span></span><![endif]>MessageSort</p> > >-<p class=MsoListBullet3 style='mso-list:l37 level2 lfo80;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l33 level2 lfo80;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>The <span class=SpellE>synchSignal</span> >-literal has been removed.</p> >+</span></span></span><![endif]>The synchSignal literal has been removed.</p> > >-<p class=MsoListBullet3 style='mso-list:l37 level2 lfo80;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l33 level2 lfo80;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>The <span class=SpellE>createMessage</span>, <span >-class=SpellE>deleteMessage</span> and reply literals are new.</p> >+</span></span></span><![endif]>The createMessage, deleteMessage and reply >+literals are new.</p> > > <p class=MsoNormal style='margin-left:3.0pt'><o:p> </o:p></p> > >@@ -6853,14 +6850,14 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoBodyText>UML 2.0 separated the concepts of navigability from association >-end ownership. In UML 2.1, a new black dot notation has been introduced >-where it is desired to make ownership explicit.</p> >+<p class=MsoBodyText>UML 2.0 separated the concepts of navigability from >+association end ownership. In UML 2.1, a new black dot notation has >+been introduced where it is desired to make ownership explicit.</p> > > <p class=MsoBodyText>Diagrams showing associations now can display three >-distinct concepts: aggregation type, ownership and navigability. These >-three notions could all potentially be combined at once in the display of an >-association.</p> >+distinct concepts: aggregation type, ownership and navigability. >+These three notions could all potentially be combined at once in the display of >+an association.</p> > > <p class=MsoBodyText>The Superstructure specification refers to some > presentation options that might be implemented including suppression of some >@@ -6872,14 +6869,13 @@ > > <p class=MsoBodyText>In the diagram below:</p> > >-<p class=MsoListBullet2 style='mso-list:l48 level1 lfo82;tab-stops:list .75in'><![if !supportLists]><span >+<p class=MsoListBullet2 style='mso-list:l46 level1 lfo82;tab-stops:list .75in'><![if !supportLists]><span > style='font-family:Arial;mso-fareast-font-family:Arial'><span style='mso-list: > Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE><span class=GramE>endA</span></span> >-is owned by classifier B and <span class=SpellE>endB</span> is owned by <span >-class=SpellE>BinaryAssociationAB</span>.</p> >+</span></span></span><![endif]><span class=GramE>endA</span> is owned by >+classifier B and endB is owned by BinaryAssociationAB.</p> > >-<p class=MsoListBullet2 style='mso-list:l15 level1 lfo84;tab-stops:list .75in'><![if !supportLists]><span >+<p class=MsoListBullet2 style='mso-list:l12 level1 lfo84;tab-stops:list .75in'><![if !supportLists]><span > style='font-family:Arial;mso-fareast-font-family:Arial'><span style='mso-list: > Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>The absence of a dot signifies ownership by the >@@ -6889,7 +6885,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoNormal><img border=0 width=588 height=118 id="_x0000_i1028" >+<p class=MsoNormal><img border=0 width=588 height=118 id="_x0000_i1029" > src="guide_files/image003.gif"></p> > > <p class=MsoNormal> </p> >@@ -6908,21 +6904,19 @@ > working with time concepts almost impossible. All time expressions were > relative to now and there was no way to specify some arbitrary point time t > to which all other time expressions were relative. In the current >-specification, the concepts of <span class=SpellE>TimeObservation</span> and <span >-class=SpellE>DurationObservation</span> have been introduced to fix this >-shortcoming. Time expressions and durations now can refer to these >-observations to create more complex expressions that can be evaluated given >-some specific time. Observations are really a way to introduce variables >-in time expressions and durations.</p> >+specification, the concepts of TimeObservation and DurationObservation have >+been introduced to fix this shortcoming. Time expressions and durations >+now can refer to these observations to create more complex expressions that can >+be evaluated given some specific time. Observations are really a way to >+introduce variables in time expressions and durations.</p> > > <p class=MsoNormal> </p> > >-<p class=MsoNormal>In addition, older <span class=SpellE>TimeObservationAction</span> >-and <span class=SpellE>DurationObservationAction</span> have been replaced by >-opaque actions. The now and duration fields in these old <span >-class=SpellE>metaclasses</span> have been replaced by value pins as input >-values that refer to time expressions and durations (both of which are value >-specifications).</p> >+<p class=MsoNormal>In addition, older TimeObservationAction and >+DurationObservationAction have been replaced by opaque actions. The >+now and duration fields in these old metaclasses have been replaced by >+value pins as input values that refer to time expressions and durations (both >+of which are value specifications).</p> > > <p class=MsoNormal> </p> > >@@ -6939,7 +6933,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoNormal><img border=0 width=696 height=366 id="_x0000_i1029" >+<p class=MsoNormal><img border=0 width=696 height=366 id="_x0000_i1030" > src="guide_files/image004.jpg"></p> > > <p class=MsoNormal> </p> >@@ -6953,7 +6947,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l43 level1 lfo86; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l41 level1 lfo86; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -6964,16 +6958,15 @@ > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>The >-<span class=SpellE><b>ProfileApplication</b></span> meta-type no longer extends >-<span class=SpellE>PackageImport</span>. It now directly extends <span >-class=SpellE><b>DirectedRelationship</b></span>.</p> >+<b>ProfileApplication</b> meta-type no longer extends PackageImport. It >+now directly extends <b>DirectedRelationship</b>.</p> > > <p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l81 level2 lfo88; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>The >-structural feature <span class=SpellE>ProfileApplication::importedProfile</span> >-has been renamed to <span class=SpellE>ProfileApplication::appliedProfile</span>.</p> >+structural feature ProfileApplication::importedProfile has been renamed to >+ProfileApplication::appliedProfile.</p> > > <p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l81 level2 lfo88; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; >@@ -7007,7 +7000,7 @@ > <p class=MsoNormal> </p> > > <h4 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; >-margin-bottom:.0001pt;text-indent:-.25in;mso-list:l49 level1 lfo90;tab-stops: >+margin-bottom:.0001pt;text-indent:-.25in;mso-list:l48 level1 lfo90;tab-stops: > list .75in;text-autospace:none'><![if !supportLists]><span style='font-family: > Arial;mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight: > bold'><span style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7044,8 +7037,8 @@ > 7328</a><a name="_Toc125129066"></a> Message Sort</h4> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>MessageSort::synchSignal</span> mapped to <span class=SpellE>MessageSort::asynchSignal</span></p> >+style='font-size:7.0pt'> </span>MessageSort::synchSignal >+mapped to MessageSort::asynchSignal</p> > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span > style='font-size:7.0pt'> </span>A >@@ -7055,7 +7048,7 @@ > <p class=MsoNormal> </p> > > <h4 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; >-margin-bottom:.0001pt;text-indent:-.25in;mso-list:l94 level1 lfo94;tab-stops: >+margin-bottom:.0001pt;text-indent:-.25in;mso-list:l91 level1 lfo94;tab-stops: > list .75in;text-autospace:none'><![if !supportLists]><span style='font-family: > Arial;mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight: > bold'><span style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7064,9 +7057,8 @@ > 7637</a><a name="_Toc125129067"></a> Event Occurrence</h4> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>EventOccurrence::getFinishExecs</span> and <span class=SpellE>getStartExecs</span> >-list changed to scalar</p> >+style='font-size:7.0pt'> </span>EventOccurrence::getFinishExecs >+and getStartExecs list changed to scalar</p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span > style='font-size:7.0pt'> </span>Additional >@@ -7074,46 +7066,44 @@ > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span > style='font-size:7.0pt'> </span>The >-corresponding property is <span class=SpellE>ExecutionOccurrenceSpecification::execution</span> >-which is a kind of <span class=SpellE>ExecutionSpecification</span>. </p> >+corresponding property is ExecutionOccurrenceSpecification::execution which is >+a kind of ExecutionSpecification. </p> > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span > style='font-size:7.0pt'> </span>The > multiplicity changed from * to 1 because the semantics changed somewhat. > That is in UML2 2.0 even if two execution specifications start at the same > time, they have individual start events. Therefore, when converting older >-models in which one <span class=SpellE>EventOccurrence</span> had more than one >-<span class=SpellE>ExecutionOccrrence</span> (if there are such), it is >-necessary to create multiple copies of the <span class=SpellE>ExecutionOccurrenceSpecification</span> >-<span class=GramE>( corresponding</span> to the UML2 1.x) <span class=SpellE>EventOccurrence</span>, >-so that each <span class=SpellE>ExecutionSpecification</span> can have its own >-start event.</p> >+models in which one EventOccurrence had more than one ExecutionOccrrence (if >+there are such), it is necessary to create multiple copies of the ExecutionOccurrenceSpecification >+<span class=GramE>( corresponding</span> to the UML2 1.x) EventOccurrence, so >+that each ExecutionSpecification can have its own start event.</p> > > <p class=MsoNormal> </p> > > <h4 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; >-margin-bottom:.0001pt;text-indent:-.25in;mso-list:l32 level1 lfo96;tab-stops: >+margin-bottom:.0001pt;text-indent:-.25in;mso-list:l28 level1 lfo96;tab-stops: > list .75in;text-autospace:none'><![if !supportLists]><span style='font-family: > Arial;mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight: > bold'><span style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><a > href="http://www.omg.org/issues/uml2-superstructure-ftf.html#Issue7319">Issue >-7319</a><a name="_Toc125129068"></a> <span class=SpellE>ExecutionOccurrence</span></h4> >+7319</a><a name="_Toc125129068"></a> ExecutionOccurrence</h4> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>ExecutionOccurrence::getBehaviors</span> list changed to scalar</p> >+style='font-size:7.0pt'> </span>ExecutionOccurrence::getBehaviors >+list changed to scalar</p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span > style='font-size:7.0pt'> </span>In > UML2 1.x this was the specification of the Behavior that, when executed, caused >-the <span class=SpellE>ExecutionOccurrence</span>. In UML2 2.0 <span >-class=SpellE>ExecutionOccurrence</span> was replaced by <span class=SpellE>ExecutionSpecification</span>. >-Furthermore, action executions (<span class=SpellE>ActionExecutionSpecification</span>) >-were differentiated from other types of executions (<span class=SpellE>BehaviorExecutionSpecification</span>). >-Since the UML2 1.x model did not support the former case, this will never occur >-when converting a UML2 1.x model. So the corresponding feature is <span >-class=SpellE>BehaviorExecutionSpecification::behavior</span>.</p> >+the ExecutionOccurrence. In UML2 2.0 ExecutionOccurrence was replaced by >+ExecutionSpecification. Furthermore, action executions >+(ActionExecutionSpecification) were differentiated from other types of >+executions (BehaviorExecutionSpecification). Since the UML2 1.x model did >+not support the former case, this will never occur when converting a UML2 1.x >+model. So the corresponding feature is >+BehaviorExecutionSpecification::behavior.</p> > > <p class=MsoNormal> </p> > >@@ -7131,9 +7121,8 @@ > 8318, 8894</p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>Interval::getMaxes</span> and <span class=SpellE>getMins</span> >-list changed to scalar</p> >+style='font-size:7.0pt'> </span>Interval::getMaxes >+and getMins list changed to scalar</p> > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span > style='font-size:7.0pt'> </span>This >@@ -7143,7 +7132,7 @@ > <p class=MsoNormal> </p> > > <h4 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; >-margin-bottom:.0001pt;text-indent:-.25in;mso-list:l35 level1 lfo100;tab-stops: >+margin-bottom:.0001pt;text-indent:-.25in;mso-list:l32 level1 lfo100;tab-stops: > list .75in;text-autospace:none'><![if !supportLists]><span style='font-family: > Arial;mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight: > bold'><span style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7152,19 +7141,16 @@ > 7560</a><a name="_Toc125129070"></a> Primitive Function</h4> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>PrimitiveFunction::getBody</span> and <span class=SpellE>getLanguage</span> >-scalar changed to list</p> >+style='font-size:7.0pt'> </span>PrimitiveFunction::getBody >+and getLanguage scalar changed to list</p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>Activity::getBody</span> and <span class=SpellE>getLanguage</span> >-scalar changed to list</p> >+style='font-size:7.0pt'> </span>Activity::getBody >+and getLanguage scalar changed to list</p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>OpaqueExpression::getLanguage</span> and <span class=SpellE>getBody</span> >-scalar changed to list</p> >+style='font-size:7.0pt'> </span>OpaqueExpression::getLanguage >+and getBody scalar changed to list</p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span > style='font-size:7.0pt'> </span>Latest >@@ -7189,7 +7175,7 @@ > <p class=MsoNormal> </p> > > <h4 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; >-margin-bottom:.0001pt;text-indent:-.25in;mso-list:l51 level1 lfo102;tab-stops: >+margin-bottom:.0001pt;text-indent:-.25in;mso-list:l50 level1 lfo102;tab-stops: > list .75in;text-autospace:none'><![if !supportLists]><span style='font-family: > Arial;mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight: > bold'><span style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7198,12 +7184,9 @@ > 6682</a><a name="_Toc125129072"></a> Trigger vs. Event</h4> > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>AnyTrigger</span>, <span class=SpellE>CallTrigger</span>, <span >-class=SpellE>TimeTrigger</span>, <span class=SpellE>ChangeTrigger</span>, <span >-class=SpellE>MessageTrigger</span>, <span class=SpellE>SignalTrigger</span> >-mapped to concrete Trigger. That new trigger refers to the corresponding >-Event.</p> >+style='font-size:7.0pt'> </span>AnyTrigger, >+CallTrigger, TimeTrigger, ChangeTrigger, MessageTrigger, SignalTrigger mapped >+to concrete Trigger. That new trigger refers to the corresponding Event.</p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span > style='font-size:7.0pt'> </span>Trigger >@@ -7220,8 +7203,8 @@ > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span > style='font-size:7.0pt'> </span>An >-event is an instantaneous thing. An <span class=SpellE>EventOccurrenceSpecification</span> >-is an instance of an event.</p> >+event is an instantaneous thing. An EventOccurrenceSpecification is an >+instance of an event.</p> > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span > style='font-size:7.0pt'> </span>An >@@ -7257,23 +7240,22 @@ > <p class=MsoNormal> </p> > > <h4 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; >-margin-bottom:.0001pt;text-indent:-.25in;mso-list:l17 level1 lfo104;tab-stops: >+margin-bottom:.0001pt;text-indent:-.25in;mso-list:l14 level1 lfo104;tab-stops: > list .75in;text-autospace:none'><![if !supportLists]><span style='font-family: > Arial;mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight: > bold'><span style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><a > href="http://www.omg.org/issues/uml2-superstructure-ftf.html#Issue8894">Issue >-8894</a><a name="_Toc125129073"></a> <span class=SpellE>ObservationAction</span></h4> >+8894</a><a name="_Toc125129073"></a> ObservationAction</h4> > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>DurationObservationAction</span>, <span class=SpellE>TimeObservationAction</span> >-are mapped to <span class=SpellE>OpaqueAction</span>.</p> >+style='font-size:7.0pt'> </span>DurationObservationAction, >+TimeObservationAction are mapped to OpaqueAction.</p> > > <p class=MsoNormal> </p> > > <h4 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; >-margin-bottom:.0001pt;text-indent:-.25in;mso-list:l41 level1 lfo106;tab-stops: >+margin-bottom:.0001pt;text-indent:-.25in;mso-list:l38 level1 lfo106;tab-stops: > list .75in;text-autospace:none'><![if !supportLists]><span style='font-family: > Arial;mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight: > bold'><span style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7281,7 +7263,7 @@ > href="http://www.omg.org/issues/uml2-superstructure-ftf.html#Issue8706">Issue > 8706</a><a name="_Toc125129074"></a> <a > href="http://www.omg.org/issues/uml2-superstructure-ftf.html#Issue9183">Issue >-9183</a> <span class=SpellE>ProfileApplication</span></h4> >+9183</a> ProfileApplication</h4> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span > style='font-size:7.0pt'> </span>Issue >@@ -7289,32 +7271,31 @@ > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span > style='font-size:7.0pt'> </span>Now >-a <span class=SpellE>ProfileApplication</span> is a subclass of <span >-class=SpellE>DirectedRelationship</span> rather than <span class=SpellE>PackageImport</span>.</p> >+a ProfileApplication is a subclass of DirectedRelationship rather than >+PackageImport.</p> > > <p class=MsoNormal> </p> > > <h4 style='margin-top:0in;margin-right:0in;margin-bottom:0in;margin-left:.75in; >-margin-bottom:.0001pt;text-indent:-.25in;mso-list:l16 level1 lfo108;tab-stops: >+margin-bottom:.0001pt;text-indent:-.25in;mso-list:l13 level1 lfo108;tab-stops: > list .75in;text-autospace:none'><![if !supportLists]><span style='font-family: > Arial;mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight: > bold'><span style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><a > href="http://www.omg.org/issues/uml2-superstructure-ftf.html#Issue7405">Issue >-7405</a><a name="_Toc125129077"></a> <span class=SpellE>ApplyFuncitonActoin</span></h4> >+7405</a><a name="_Toc125129077"></a> ApplyFuncitonActoin</h4> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span > style='font-size:7.0pt'> </span>Issue > 7319, 7365 </p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>ApplyFunctionAction::getArguments</span>, <span class=SpellE>getFunction</span>, >-<span class=SpellE>getResults</span> unmapped.</p> >+style='font-size:7.0pt'> </span>ApplyFunctionAction::getArguments, >+getFunction, getResults unmapped.</p> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>ApplyFunctionAction</span> mapped to <span class=SpellE>CallBehaviorAction</span>.</p> >+style='font-size:7.0pt'> </span>ApplyFunctionAction >+mapped to CallBehaviorAction.</p> > > <p class=MsoNormal> </p> > >@@ -7325,12 +7306,11 @@ > mso-bidi-font-weight:bold'><span style='mso-list:Ignore'>●<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><a > href="http://www.omg.org/issues/uml2-superstructure-ftf.html#Issue7421">Issue >-7421</a><a name="_Toc125129079"></a> <span class=SpellE>TemplateSignature</span></h4> >+7421</a><a name="_Toc125129079"></a> TemplateSignature</h4> > > <p class=MsoListBullet3><span style='font-family:"Courier New"'>o</span><span >-style='font-size:7.0pt'> </span><span >-class=SpellE>TemplateSignature::getNestedSignatures</span> and <span >-class=SpellE>getNestingSignature</span> unmapped</p> >+style='font-size:7.0pt'> </span>TemplateSignature::getNestedSignatures >+and getNestingSignature unmapped</p> > > <p class=MsoListBullet3><span class=GramE><span style='font-family:"Courier New"'>o</span></span><span > style='font-size:7.0pt'> </span>This >@@ -7353,7 +7333,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l74 level1 lfo112; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l71 level1 lfo112; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7364,7 +7344,7 @@ > > <p class=MsoListBullet style='margin-left:-15.0pt;text-indent:0in'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l14 level1 lfo114; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l11 level1 lfo114; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7380,27 +7360,26 @@ > > <p class=MsoListBullet style='margin-left:-15.0pt;text-indent:0in'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l112 level1 lfo118; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l111 level1 lfo118; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Package Literals</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l30 level2 lfo120; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l27 level2 lfo120; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>New > package literals have been introduced for accessing metadata.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l30 level2 lfo120; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l27 level2 lfo120; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>More >-efficient to use package literals instead of metadata <span class=SpellE>accessor</span> >-methods, e.g. use <span class=SpellE><span style='font-family:"Courier New"'>UMLPackage.Literals.PACKAGE__PACKAGED_ELEMENT</span></span> >-instead of <span class=SpellE><span style='font-family:"Courier New"'>UMLPackage.eINSTANCE.getPackage_<span >-class=GramE>PackagedElement</span></span></span><span class=GramE><span >-style='font-family:"Courier New"'>(</span></span><span style='font-family:"Courier New"'>)</span>.</p> >+efficient to use package literals instead of metadata accessor methods, e.g. >+use <span style='font-family:"Courier New"'>UMLPackage.Literals.PACKAGE__PACKAGED_ELEMENT</span> >+instead of <span style='font-family:"Courier New"'>UMLPackage.eINSTANCE.getPackage_<span >+class=GramE>PackagedElement(</span>)</span>.</p> > > <p class=MsoNormal> </p> > >@@ -7420,8 +7399,8 @@ > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>UML2 >-resources (libraries, <span class=SpellE>metamodels</span>, <span class=GramE>profiles</span>) >-have been updated.</p> >+resources (libraries, metamodels, <span class=GramE>profiles</span>) have been >+updated.</p> > > <p class=MsoListBullet3 style='margin-left:39.0pt;text-indent:0in'><o:p> </o:p></p> > >@@ -7442,31 +7421,29 @@ > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><span >-class=SpellE><span style='font-family:"Courier New"'>UMLUtil</span></span> >-currently supports two functions </p> >+style='font-family:"Courier New"'>UMLUtil</span> currently supports two >+functions </p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>void merge(org.eclipse.uml2.uml.Package > package_, Map options) ;</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>void merge(org.eclipse.uml2.uml.Package <span >-class=SpellE>package_,Map</span> options, <span class=SpellE>DiagnosticChain</span> >-diagnostics, Map context)</p> >+</span></span></span><![endif]>void merge(org.eclipse.uml2.uml.Package >+package_,Map options, DiagnosticChain diagnostics, Map context)</p> > > <p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l79 level2 lfo122; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]><span >-class=SpellE><span style='font-family:"Courier New"'>UMLUtil</span></span> >-implements a nested inner class that can be overridden for application-specific >-merge.</p> >+style='font-family:"Courier New"'>UMLUtil</span> implements a nested inner >+class that can be overridden for application-specific merge.</p> > > <p class=MsoListBullet3 style='margin-left:39.0pt;text-indent:0in'><o:p> </o:p></p> > >@@ -7480,14 +7457,14 @@ > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Stereotype >-attributes type can now reference a <span class=SpellE>metaclass</span>.</p> >+attributes type can now reference a metaclass.</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>Association between stereotype and <span >-class=SpellE>metaclass</span> (which introduces property on stereotype).</p> >+</span></span></span><![endif]>Association between stereotype and metaclass >+(which introduces property on stereotype).</p> > > <p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l79 level2 lfo122; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; >@@ -7496,25 +7473,25 @@ > support in profiles</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>Image is a new <span class=SpellE>metaclass</span>.</p> >+</span></span></span><![endif]>Image is a new metaclass.</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Image part of stereotype definition.</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Introduces notational changes.</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Can now have multiple images per stereotype</p> >@@ -7526,34 +7503,33 @@ > of stereotype applications.</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Will no longer be in an annotation on an > element. </p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Will be added to the resource and will reference > the elements to which they are applied</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Listeners will be affected.</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>When stereotypes are applied with <span >-class=GramE><span class=SpellE><span style='font-family:"Courier New"'>applyStereotype</span></span><span >-style='font-family:"Courier New"'>(</span></span><span style='font-family:"Courier New"'> )</span> >-the object representing that particular stereotype application will be >-returned.</p> >+class=GramE><span style='font-family:"Courier New"'>applyStereotype(</span></span><span >+style='font-family:"Courier New"'> )</span> the object representing that >+particular stereotype application will be returned.</p> > > <p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l79 level2 lfo122; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; >@@ -7569,12 +7545,12 @@ > we had three standard profiles.</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-.75in; >-mso-list:l67 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span >+mso-list:l65 level3 lfo124;tab-stops:list 1.75in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Will now use only one standard profile (called <span >-class=SpellE><span style='font-family:"Courier New"'>Standard.profile.uml</span></span>) >-which is L3 compliant</p> >+style='font-family:"Courier New"'>Standard.profile.uml</span>) which is L3 >+compliant</p> > > <p class=MsoNormal> </p> > >@@ -7583,38 +7559,37 @@ > <p class=MsoListBullet style='margin-left:.25in;text-indent:0in'><span > style='font-weight:normal'> </span></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l58 level1 lfo126; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l57 level1 lfo126; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>Support for > loading and saving in official OMG format. The UML editor now supports >-saving with .<span class=SpellE>xmi</span> extension. Simply select >-the</span> File > Save As... <span style='font-weight:normal'>and specify <span >-class=GramE>a</span> .<span class=SpellE>xmi</span> extension.</span></p> >+saving with .xmi extension. Simply select the</span> File > >+Save As... <span style='font-weight:normal'>and specify <span class=GramE>a</span> >+.xmi extension.</span></p> > > <p class=MsoListBullet style='margin-left:-195.0pt;text-indent:0in'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l47 level1 lfo128; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l45 level1 lfo128; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>The difference >-between the .<span class=SpellE>xmi</span> format and the .uml is that annotations >-are not a legal part of the UML schema. When saving your existing .uml >-model to the</span> .<span class=SpellE>xmi</span> <span style='font-weight: >-normal'>format, annotations will be converted to XMI extensions.</span></p> >+between the .xmi format and the .uml is that annotations are not a legal part >+of the UML schema. When saving your existing .uml model to the</span> >+.xmi <span style='font-weight:normal'>format, annotations will be converted to >+XMI extensions.</span></p> > > <p class=MsoListBullet style='margin-left:-195.0pt;text-indent:0in'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l34 level1 lfo130; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l30 level1 lfo130; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>Opening a model >-with .<span class=SpellE>xmi</span> format with the</span> UML editor <span >-style='font-weight:normal'>will work and properly render using the </span>UML >-API.</p> >+with .xmi format with the</span> UML editor <span style='font-weight:normal'>will >+work and properly render using the </span>UML API.</p> > > <p class=MsoListBullet4 style='margin-left:1.25in;text-indent:0in'> </p> > >@@ -7623,7 +7598,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l67 level1 lfo124; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l65 level1 lfo124; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7640,57 +7615,54 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l70 level1 lfo132; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l67 level1 lfo132; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>Retrieval of</span> > derived collections<span style='font-weight:normal'> made more efficient</span>.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l109 level2 lfo134; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l107 level2 lfo134; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Derived >-collections now use a smart <span class=SpellE>iterator</span>. </p> >+collections now use a smart iterator. </p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-1.0in; >-mso-list:l33 level3 lfo136;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span >+mso-list:l29 level3 lfo136;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>The result is that sequentially moving through > collections using an indexed approach is very inefficient.</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-1.0in; >-mso-list:l33 level3 lfo136;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span >+mso-list:l29 level3 lfo136;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]>For a derived collection, <span class=SpellE><span >-style='font-family:"Courier New"'>getSize</span></span><span style='font-family: >-"Courier New"'>()</span> is O(n)</p> >+</span></span></span><![endif]>For a derived collection, <span >+style='font-family:"Courier New"'>getSize()</span> is O(n)</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-1.0in; >-mso-list:l33 level3 lfo136;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span >+mso-list:l29 level3 lfo136;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>The list does not hold onto all the elements at > once. Memory price is paid only when the list is traversed.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l59 level2 lfo138; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l58 level2 lfo138; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Always >-use an <span class=SpellE>iterator</span> when moving through derived >-collections obtained from UML2 API.</p> >+use an iterator when moving through derived collections obtained from UML2 API.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l113 level2 lfo140; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l112 level2 lfo140; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Index-based > iteration need only be avoided for lists returned for features that are derived > unions. In general, a way to tell which kind of iteration will be optimal >-at runtime is to test <span class=SpellE><i><span style='font-family:"Courier New"'>instanceof</span></i></span><i><span >-style='font-family:"Courier New"'> <span class=SpellE>RandomAccess</span></span></i> >-(see <span class=SpellE>Javadoc</span> for that interface for details).</p> >+at runtime is to test <i><span style='font-family:"Courier New"'>instanceof >+RandomAccess</span></i> (see Javadoc for that interface for details).</p> > > <p class=MsoNormal style='margin-left:3.0pt'><o:p> </o:p></p> > >@@ -7699,19 +7671,18 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l125 level1 lfo142; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l126 level1 lfo142; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>Support for</span> > segregation <span style='font-weight:normal'>of UML2 resources into fragments >-(e.g. </span><span style='font-family:"Courier New";font-weight:normal'>*.<span >-class=SpellE>fragment.uml</span></span><span style='font-weight:normal'>) with >-packages as root elements has been provided.</span></p> >+(e.g. </span><span style='font-family:"Courier New";font-weight:normal'>*.fragment.uml</span><span >+style='font-weight:normal'>) with packages as root elements has been provided.</span></p> > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l125 level1 lfo142; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l126 level1 lfo142; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7720,7 +7691,7 @@ > for </span>containment proxies<span style='font-weight:normal'> has been > introduced</span>.</p> > >-<p class=MsoListBullet3 style='mso-list:l22 level2 lfo144;tab-stops:list 1.0in'><![if !supportLists]><span >+<p class=MsoListBullet3 style='mso-list:l21 level2 lfo144;tab-stops:list 1.0in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>o<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Enabled on a per-feature basis.</p> >@@ -7742,19 +7713,18 @@ > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>EMF support for logical resources is to check >-definition of each feature and invoke <span class=SpellE><span class=GramE><span >-style='font-family:"Courier New"'>isResolveProxies</span></span></span><span >-class=GramE><span style='font-family:"Courier New"'>(</span></span><span >-style='font-family:"Courier New"'>)</span>. </p> >+definition of each feature and invoke <span class=GramE><span style='font-family: >+"Courier New"'>isResolveProxies(</span></span><span style='font-family:"Courier New"'>)</span>. >+</p> > > <p class=MsoListBullet4 style='margin-left:2.25in;text-indent:-1.0in; > mso-list:l89 level3 lfo146;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE><span style='font-family: >-"Courier New"'>isResolveProxies</span></span> is an attribute on every >-Ecore reference and must be set to TRUE on containment references for which >-proxy support is desired (must be set to TRUE for containment proxies to work)</p> >+</span></span></span><![endif]><span style='font-family:"Courier New"'>isResolveProxies</span> >+is an attribute on every Ecore reference and must be set to TRUE on containment >+references for which proxy support is desired (must be set to TRUE for >+containment proxies to work)</p> > > <p class=MsoNormal> </p> > >@@ -7767,7 +7737,7 @@ > un-control <span style='font-weight:normal'>in a unit</span>.</p> > > <p class=MsoNormal> >-<img border=0 width=200 height=232 id="_x0000_i1030" >+<img border=0 width=200 height=232 id="_x0000_i1031" > src="guide_files/image005.jpg"></p> > > <p class=MsoNormal> </p> >@@ -7777,7 +7747,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l25 level1 lfo148; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l23 level1 lfo148; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7785,19 +7755,18 @@ > derived unions <span style='font-weight:normal'>that are redefined by > subclasses</span>.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l96 level2 lfo150; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l93 level2 lfo150; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Cases > where derived unions were redefined by non-derived properties have been >-removed; as a result, the properties like <span class=SpellE>Package::ownedMember</span> >-and <span class=SpellE>Component::ownedMember</span> are now derived and new >-modifiable properties named <span class=SpellE>packagedElement</span> are >-available.</p> >+removed; as a result, the properties like Package::ownedMember and >+Component::ownedMember are now derived and new modifiable properties named >+packagedElement are available.</p> > > <p class=MsoNormal style='margin-left:-15.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l25 level1 lfo148; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l23 level1 lfo148; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7806,7 +7775,7 @@ > > <p class=MsoNormal style='margin-left:-15.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l25 level1 lfo148; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l23 level1 lfo148; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7815,7 +7784,7 @@ > > <p class=MsoNormal style='margin-left:-15.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l25 level1 lfo148; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l23 level1 lfo148; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7829,7 +7798,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l76 level1 lfo152; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l77 level1 lfo152; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7853,10 +7822,8 @@ > <tr style='mso-yfti-irow:1'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Element#getRelationships</span>() >- </span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Element#getRelationships() </span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -7869,10 +7836,8 @@ > <tr style='mso-yfti-irow:2'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Element#getRelationships</span>(<span >- class=SpellE>EClass</span>)</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Element#getRelationships(EClass)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -7885,9 +7850,8 @@ > <tr style='mso-yfti-irow:3'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Element#getSourceDirectedRelationships</span>()</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Element#getSourceDirectedRelationships()</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -7900,10 +7864,8 @@ > <tr style='mso-yfti-irow:4'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Element#getSourceDirectedRelationships</span>(<span >- class=SpellE>EClass</span>)</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Element#getSourceDirectedRelationships(EClass)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -7917,9 +7879,8 @@ > <tr style='mso-yfti-irow:5'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Element#getTargetDirectedRelationships</span>()</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Element#getTargetDirectedRelationships()</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -7932,17 +7893,15 @@ > <tr style='mso-yfti-irow:6;mso-yfti-lastrow:yes'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Element#getTargetDirectedRelationships</span>(<span >- class=SpellE>EClass</span>)</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Element#getTargetDirectedRelationships(EClass)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; > padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:10.0pt'>Get directed relationships >- of a particular type of which this element is a target.</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt'>Get directed relationships of >+ a particular type of which this element is a target.</span></p> > <p class=MsoNormal><span style='font-size:10.0pt'> </span></p> > </td> > </tr> >@@ -7950,7 +7909,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l76 level1 lfo152; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l77 level1 lfo152; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -7994,9 +7953,8 @@ > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:9.0pt;font-family:"Courier New"'>Operation >- <span class=SpellE>Class#<b>createOwnedOperation</b></span>(String name, <span >- class=SpellE>EList</span> <span class=SpellE>ownedParameterNames</span>, <span >- class=SpellE>EList</span> <span class=SpellE>ownedParameterTypes</span>);</span></p> >+ Class#<b>createOwnedOperation</b>(String name, EList ownedParameterNames, >+ EList ownedParameterTypes);</span></p> > <p class=MsoNormal><span style='font-size:9.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; >@@ -8009,30 +7967,26 @@ > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Operation >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:"Courier New"'>Class#</span><b><span >- style='font-size:10.0pt;font-family:"Courier New"'>getOwnedOperation</span></b></span><span >- style='font-size:10.0pt;font-family:"Courier New"'>(String name, <span >- class=SpellE>EList</span> <span class=SpellE>ownedParameterNames</span>, <span >- class=SpellE>EList</span> <span class=SpellE>ownedParameterTypes</span>);</span></p> >+ </span><span style='font-size:9.0pt;font-family:"Courier New"'>Class#</span><b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>getOwnedOperation</span></b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>(String name, EList ownedParameterNames, >+ EList ownedParameterTypes);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; > border-bottom:solid black 1.0pt;border-right:solid black 1.0pt;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt'>[sample] Get specific >- operation based on <span class=SpellE>param</span> types. Passing NULL >- is OK.</span></p> >+ operation based on param types. Passing NULL is OK.</span></p> > </td> > </tr> > <tr style='mso-yfti-irow:3'> > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Operation >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:"Courier New"'>Class#</span><b><span >- style='font-size:10.0pt;font-family:"Courier New"'>createOwnedOperation</span></b></span><span >- style='font-size:10.0pt;font-family:"Courier New"'>(String name, <span >- class=SpellE>EList</span> <span class=SpellE>parameterNames</span>, <span >- class=SpellE>EList</span> <span class=SpellE>parameterTypes</span>, Type <span >- class=SpellE>returnType</span>);</span></p> >+ </span><span style='font-size:9.0pt;font-family:"Courier New"'>Class#</span><b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>createOwnedOperation</span></b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>(String name, EList >+ parameterNames, EList parameterTypes, Type returnType);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; >@@ -8044,13 +7998,11 @@ > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Operation >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:"Courier New"'>Class#</span><b><span >- style='font-size:10.0pt;font-family:"Courier New"'>getOwnedOperation</span></b></span><span >- style='font-size:10.0pt;font-family:"Courier New"'>(String name, <span >- class=SpellE>EList</span> <span class=SpellE>ownedParameterNames,EList</span> >- <span class=SpellE>ownedParameterTypes</span>, <span class=SpellE>boolean</span> >- <span class=SpellE>ignoreCase</span>, <span class=SpellE>boolean</span> <span >- class=SpellE>createOnDemand</span>);</span></p> >+ </span><span style='font-size:9.0pt;font-family:"Courier New"'>Class#</span><b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>getOwnedOperation</span></b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>(String name, EList >+ ownedParameterNames,EList ownedParameterTypes, boolean ignoreCase, boolean >+ createOnDemand);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; >@@ -8073,8 +8025,8 @@ > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Classifier</span><span >- style='font-size:9.0pt;font-family:"Courier New"'> <span class=SpellE>Class#<b><span >- style='font-size:10.0pt'>getNestedClassifier</span></b></span></span><span >+ style='font-size:9.0pt;font-family:"Courier New"'> Class#</span><b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>getNestedClassifier</span></b><span > style='font-size:10.0pt;font-family:"Courier New"'>(String name);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> >@@ -8088,28 +8040,26 @@ > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Classifier</span><span >- style='font-size:9.0pt;font-family:"Courier New"'> <span class=SpellE>Class#<b><span >- style='font-size:10.0pt'>getNestedClassifier</span></b></span></span><span >- style='font-size:10.0pt;font-family:"Courier New"'>(String name, <span >- class=SpellE>boolean</span> <span class=SpellE>ignoreCase</span>, <span >- class=SpellE>EClass</span> <span class=SpellE>eClass</span>, <span >- class=SpellE>boolean</span> <span class=SpellE>createOnDemand</span>);</span></p> >+ style='font-size:9.0pt;font-family:"Courier New"'> Class#</span><b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>getNestedClassifier</span></b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>(String name, boolean >+ ignoreCase, EClass eClass, boolean createOnDemand);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; > border-bottom:solid black 1.0pt;border-right:solid black 1.0pt;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:10.0pt'>[sample] Getter with potential >- to create if not found.</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt'>[sample] Getter with >+ potential to create if not found.</span></p> > </td> > </tr> > <tr style='mso-yfti-irow:8'> > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Classifier</span><span >- style='font-size:9.0pt;font-family:"Courier New"'> <span class=SpellE>Class#<b><span >- style='font-size:10.0pt'>createNestedClassifier</span></b></span></span><span >- style='font-size:10.0pt;font-family:"Courier New"'>(String name, <span >- class=SpellE>EClass</span> <span class=SpellE>eClass</span>);</span></p> >+ style='font-size:9.0pt;font-family:"Courier New"'> Class#</span><b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>createNestedClassifier</span></b><span >+ style='font-size:10.0pt;font-family:"Courier New"'>(String name, EClass >+ eClass);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; >@@ -8121,12 +8071,9 @@ > <tr style='mso-yfti-irow:9'> > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>PackageableElement</span></span><span >- style='font-size:10.0pt;font-family:"Courier New"'> <span class=SpellE>Package#<b>getPackagedElement</b></span>(String >- name, <span class=SpellE>boolean</span> <span class=SpellE>ignoreCase</span>, >- <span class=SpellE>EClass</span> <span class=SpellE>eClass</span>, <span >- class=SpellE>boolean</span> <span class=SpellE>createOnDemand</span>);</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>PackageableElement >+ Package#<b>getPackagedElement</b>(String name, boolean ignoreCase, EClass >+ eClass, boolean createOnDemand);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; >@@ -8138,10 +8085,8 @@ > <tr style='mso-yfti-irow:10'> > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>PackageableElement</span></span><span >- style='font-size:10.0pt;font-family:"Courier New"'> <span class=SpellE>Package#<b>getPackagedElement</b></span>(String >- name);</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>PackageableElement >+ Package#<b>getPackagedElement</b>(String name);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; >@@ -8153,16 +8098,14 @@ > <tr style='mso-yfti-irow:11'> > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>PackageableElement</span></span><span >- style='font-size:10.0pt;font-family:"Courier New"'> <span class=SpellE>Package#<b>createPackagedElement</b></span>(String >- name, <span class=SpellE>EClass</span> <span class=SpellE>eClass</span>);</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>PackageableElement >+ Package#<b>createPackagedElement</b>(String name, EClass eClass);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; > border-bottom:solid black 1.0pt;border-right:solid black 1.0pt;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:10.0pt'>[sample] Creation with <span >- class=SpellE>EClass</span> specified.</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt'>[sample] Creation with >+ EClass specified.</span></p> > </td> > </tr> > <tr style='mso-yfti-irow:12'> >@@ -8179,8 +8122,7 @@ > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Port >- <span class=SpellE>EncapsulatedClassifier#<b>createOwnedPort</b></span>(String >- name, Type <span class=SpellE>type</span>);</span></p> >+ EncapsulatedClassifier#<b>createOwnedPort</b>(String name, Type type);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; >@@ -8192,10 +8134,8 @@ > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Port >- <span class=SpellE>EncapsulatedClassifier#<b>getOwnedPort</b></span>(String >- name, Type <span class=SpellE>type</span>, <span class=SpellE>boolean</span> <span >- class=SpellE>ignoreCase</span>, <span class=SpellE>boolean</span> <span >- class=SpellE>createOnDemand</span>);</span></p> >+ EncapsulatedClassifier#<b>getOwnedPort</b>(String name, Type type, boolean >+ ignoreCase, boolean createOnDemand);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; >@@ -8208,8 +8148,7 @@ > <td width=396 valign=top style='width:297.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Port >- <span class=SpellE>EncapsulatedClassifier#<b>getOwnedPort</b></span>(String >- name, Type <span class=SpellE>type</span>);</span></p> >+ EncapsulatedClassifier#<b>getOwnedPort</b>(String name, Type type);</span></p> > </td> > <td width=240 valign=top style='width:2.5in;border-top:none;border-left:none; > border-bottom:solid black 1.0pt;border-right:solid black 1.0pt;padding:0in 5.4pt 0in 5.4pt'> >@@ -8222,12 +8161,12 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l76 level1 lfo152; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l77 level1 lfo152; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>Enhanced</span> >-<span class=SpellE>UMLUtil</span> <span style='font-weight:normal'>methods</span>.</p> >+UMLUtil <span style='font-weight:normal'>methods</span>.</p> > > <p class=MsoNormal> </p> > >@@ -8255,10 +8194,8 @@ > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Collection >- <span class=SpellE>UMLUtil#findNamedElements</span>(Resource <span >- class=SpellE>resource</span>, String <span class=SpellE>qualifiedName</span>, >- <span class=SpellE>boolean</span> <span class=SpellE>ignoreCase</span>, <span >- class=SpellE>EClass</span> <span class=SpellE>eClass</span>)</span></p> >+ UMLUtil#findNamedElements(Resource resource, String qualifiedName, boolean >+ ignoreCase, EClass eClass)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -8271,8 +8208,7 @@ > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Collection >- <span class=SpellE>UMLUtil#findNamedElements</span>(Resource <span >- class=SpellE>resource</span>, String <span class=SpellE>qualifiedName</span>)</span></p> >+ UMLUtil#findNamedElements(Resource resource, String qualifiedName)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -8306,18 +8242,16 @@ > <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EObject</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>UMLUtil#safeApplyStereotype</span>(Element >- <span class=SpellE>element</span>, Stereotype <span >- class=SpellE>stereotype</span>)</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EObject >+ UMLUtil#safeApplyStereotype(Element element, Stereotype >+ stereotype)</span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; > padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:10.0pt'>Will apply profile to outermost >- package if not already applied. All efforts are made to safely >- apply stereotype.</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt'>Will apply profile to >+ outermost package if not already applied. All efforts are made to >+ safely apply stereotype.</span></p> > <p class=MsoNormal><span style='font-size:10.0pt'> </span></p> > </td> > </tr> >@@ -8327,9 +8261,9 @@ > > <p class=MsoListBullet2 style='margin-left:1.25in'><span style='font-family: > "Courier New"'>o</span><span style='font-size:7.0pt'> >-</span><span class=SpellE><span style='font-family:"Courier New"'>UMLUtil</span></span> >-now defines a <span style='font-family:"Courier New"'>merge( )</span> function >-that performs a package merge as defined by the Superstructure specification</p> >+</span><span style='font-family:"Courier New"'>UMLUtil</span> now defines a <span >+style='font-family:"Courier New"'>merge( )</span> function that performs a >+package merge as defined by the Superstructure specification</p> > > <p class=MsoNormal> </p> > >@@ -8349,8 +8283,7 @@ > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>void >- <span class=SpellE>UMLUtil#merge</span>(org.eclipse.uml2.uml.Package >- package_, Map options)</span></p> >+ UMLUtil#merge(org.eclipse.uml2.uml.Package package_, Map options)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -8363,12 +8296,12 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l76 level1 lfo152; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l77 level1 lfo152; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span style='font-weight:normal'>Utilities to >-get all attributes and operations even inherited ones.</span></p> >+</span></span></span><![endif]><span style='font-weight:normal'>Utilities to get >+all attributes and operations even inherited ones.</span></p> > > <p class=MsoNormal> </p> > >@@ -8387,9 +8320,8 @@ > <tr style='mso-yfti-irow:1'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Classifier#getAllAttributes</span>()</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Classifier#getAllAttributes()</span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; >@@ -8402,9 +8334,8 @@ > <tr style='mso-yfti-irow:2'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Classifier#getAttributes</span>()</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Classifier#getAttributes()</span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; >@@ -8417,9 +8348,8 @@ > <tr style='mso-yfti-irow:3'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Classifier#getAllOperations</span>()</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Classifier#getAllOperations()</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -8433,9 +8363,8 @@ > <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>EList</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>Classifier#getOperations</span>()</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>EList >+ Classifier#getOperations()</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -8449,7 +8378,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l76 level1 lfo152; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l77 level1 lfo152; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -8473,10 +8402,9 @@ > <tr style='mso-yfti-irow:1'> > <td width=384 valign=top style='width:4.0in;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>PackageImport</span></span><span style='font-size: >- 10.0pt;font-family:"Courier New"'> <span class=SpellE>Profile#createMetamodelReference</span>(org.eclipse.uml2.uml.Package >- <span class=SpellE>importedPackage</span>)</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>PackageImport >+ Profile#createMetamodelReference(org.eclipse.uml2.uml.Package >+ importedPackage)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=252 valign=top style='width:189.0pt;border-top:none;border-left: >@@ -8488,10 +8416,8 @@ > <tr style='mso-yfti-irow:2'> > <td width=384 valign=top style='width:4.0in;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>ElementImport</span></span><span style='font-size: >- 10.0pt;font-family:"Courier New"'> <span class=SpellE>createMetaclassReference</span>(<span >- class=SpellE>PackageableElement</span> <span class=SpellE>importedElement</span>)</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>ElementImport >+ createMetaclassReference(PackageableElement importedElement)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=252 valign=top style='width:189.0pt;border-top:none;border-left: >@@ -8504,8 +8430,7 @@ > <td width=384 valign=top style='width:4.0in;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Stereotype >- <span class=SpellE>createOwnedStereotype</span>(String name, <span >- class=SpellE>boolean</span> <span class=SpellE>isAbstract</span>);</span></p> >+ createOwnedStereotype(String name, boolean isAbstract);</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=252 valign=top style='width:189.0pt;border-top:none;border-left: >@@ -8517,9 +8442,8 @@ > <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'> > <td width=384 valign=top style='width:4.0in;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>boolean</span></span><span style='font-size:10.0pt; >- font-family:"Courier New"'> <span class=SpellE>isDefined</span>();</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>boolean >+ isDefined();</span></p> > </td> > <td width=252 valign=top style='width:189.0pt;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; >@@ -8531,55 +8455,54 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l76 level1 lfo152; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l77 level1 lfo152; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span style='font-weight:normal'>Custom >-operations specified in metadata</span></p> >+</span></span></span><![endif]><span style='font-weight:normal'>Custom operations >+specified in metadata</span></p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l25 level2 lfo148; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l23 level2 lfo148; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Result > is that OCL engine can now use custom operations</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-1.0in; >-mso-list:l38 level3 lfo156;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span >+mso-list:l35 level3 lfo156;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span class=GramE>e.g</span>. Check for applied > stereotypes.</p> > >-<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l25 level2 lfo148; >+<p class=MsoListBullet2 style='margin-left:1.0in;mso-list:l23 level2 lfo148; > tab-stops:list 1.0in'><![if !supportLists]><span style='font-family:"Courier New"; > mso-fareast-font-family:"Courier New"'><span style='mso-list:Ignore'>o<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Lists > vs. Sets</p> > > <p class=MsoListBullet3 style='margin-left:2.25in;text-indent:-1.0in; >-mso-list:l38 level3 lfo156;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span >+mso-list:l35 level3 lfo156;tab-stops:list 1.5in 2.25in'><![if !supportLists]><span > style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'><span > style='mso-list:Ignore'>▪<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]>Custom operations in source models used to >-return sets, now they return <span class=SpellE><span style='font-family:"Courier New"'>EList</span></span> >+return sets, now they return <span style='font-family:"Courier New"'>EList</span> > </p> > > <p class=MsoNormal> </p> > >-<h3 style='margin-left:0in;text-indent:0in'><span class=SpellE>Javadoc</span></h3> >+<h3 style='margin-left:0in;text-indent:0in'>Javadoc</h3> > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l38 level1 lfo156; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l35 level1 lfo156; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span class=SpellE><span style='font-weight: >-normal'>Javadoc</span></span><span style='font-weight:normal'> based on the</span> >-<span style='font-weight:normal'>Superstructure</span> <span style='font-weight: >-normal'>specification</span> <span style='font-weight:normal'>has</span> <span >-style='font-weight:normal'>been</span> <span style='font-weight:normal'>included</span>.</p> >+</span></span></span><![endif]><span style='font-weight:normal'>Javadoc based >+on the</span> <span style='font-weight:normal'>Superstructure</span> <span >+style='font-weight:normal'>specification</span> <span style='font-weight:normal'>has</span> >+<span style='font-weight:normal'>been</span> <span style='font-weight:normal'>included</span>.</p> > > <p class=MsoNormal> </p> > >@@ -8588,14 +8511,14 @@ > > <p class=MsoNormal><span class=heading3char><span style='font-family:"Times New Roman"'> </span></span></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l38 level1 lfo156; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l35 level1 lfo156; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span class=heading3char><span style='font-family: > "Times New Roman"'>Icons </span></span><span class=heading3char><span >-style='font-family:"Times New Roman";font-weight:normal'>added for each of the types >-defined by UML (instead of the default generated</span></span> <span >+style='font-family:"Times New Roman";font-weight:normal'>added for each of the >+types defined by UML (instead of the default generated</span></span> <span > style='font-weight:normal'>by</span> <span style='font-weight:normal'>EMF).</span></p> > > <p class=MsoNormal> </p> >@@ -8617,7 +8540,7 @@ > <p class=MsoNormal> </p> > > <ol style='margin-top:0in' start=1 type=1> >- <li class=MsoNormal style='mso-list:l75 level1 lfo159;tab-stops:list .5in'>Through >+ <li class=MsoNormal style='mso-list:l73 level1 lfo159;tab-stops:list .5in'>Through > the import/export wizards.</li> > </ol> > >@@ -8625,7 +8548,7 @@ > > <ol style='margin-top:0in' start=1 type=1> > <ol style='margin-top:0in' start=1 type=a> >- <li class=MsoNormal style='mso-list:l11 level2 lfo162;tab-stops:list 1.0in'>When >+ <li class=MsoNormal style='mso-list:l8 level2 lfo162;tab-stops:list 1.0in'>When > creating a new EMF project, via the EMF Project wizard, it is possible to > select a UML model as the source type. The following page will > appear </li> >@@ -8633,7 +8556,7 @@ > </ol> > > <p class=MsoNormal> >-<img border=0 width=269 height=376 id="_x0000_i1031" >+<img border=0 width=269 height=376 id="_x0000_i1032" > src="guide_files/image006.jpg"></p> > > <p class=MsoNormal style='margin-left:.75in'> </p> >@@ -8651,13 +8574,13 @@ > <p class=MsoNormal><o:p> </o:p></p> > > <p class=MsoNormal style='margin-left:1.5in'><span lang=DE style='mso-ansi-language: >-DE'><img border=0 width=280 height=300 id="_x0000_i1032" >+DE'><img border=0 width=280 height=300 id="_x0000_i1033" > src="guide_files/image007.jpg"></span></p> > > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=2 type=1> >- <li class=MsoNormal style='mso-list:l56 level1 lfo168;tab-stops:list .5in'>Through >+ <li class=MsoNormal style='mso-list:l55 level1 lfo168;tab-stops:list .5in'>Through > the Ecore editor and UML editor.</li> > </ol> > >@@ -8665,16 +8588,16 @@ > > <ol style='margin-top:0in' start=2 type=1> > <ol style='margin-top:0in' start=1 type=a> >- <li class=MsoNormal style='mso-list:l50 level2 lfo171;tab-stops:list 1.0in'>With >+ <li class=MsoNormal style='mso-list:l49 level2 lfo171;tab-stops:list 1.0in'>With > the examples plug-ins installed </li> > </ol> > </ol> > > <p class=MsoNormal style='margin-left:1.5in;text-indent:-1.5in'><span > style='font-size:7.0pt'> >-</span><span class=SpellE>i</span>.<span style='font-size:7.0pt'> >-</span>From the Ecore editor, on an Ecore package, select the Convert to UML >-model option.</p> >+</span>i.<span style='font-size:7.0pt'> </span>From >+the Ecore editor, on an Ecore package, select the Convert to UML model >+option.</p> > > <p class=MsoNormal style='margin-left:1.5in;text-indent:-1.5in'><span > style='font-size:7.0pt'> >@@ -8684,17 +8607,15 @@ > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=3 type=1> >- <li class=MsoNormal style='mso-list:l26 level1 lfo174;tab-stops:list .5in'><span >- class=SpellE>Programatically</span>.</li> >+ <li class=MsoNormal style='mso-list:l24 level1 lfo174;tab-stops:list .5in'>Programatically.</li> > </ol> > > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=3 type=1> > <ol style='margin-top:0in' start=1 type=a> >- <li class=MsoNormal style='mso-list:l87 level2 lfo177;tab-stops:list 1.0in'>The >- behavior for import/export is defined in <span class=SpellE><span >- style='font-family:"Courier New"'>UMLUtil</span></span>:</li> >+ <li class=MsoNormal style='mso-list:l86 level2 lfo177;tab-stops:list 1.0in'>The >+ behavior for import/export is defined in <span style='font-family:"Courier New"'>UMLUtil</span>:</li> > </ol> > </ol> > >@@ -8716,8 +8637,7 @@ > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>Collection >- <span class=SpellE>UMLUtil#convertFromEcore</span>(<span class=SpellE>EPackage</span> >- <span class=SpellE>ePackage</span>, Map options)</span></p> >+ UMLUtil#convertFromEcore(EPackage ePackage, Map options)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -8729,10 +8649,8 @@ > <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'> > <td width=324 valign=top style='width:243.0pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:10.0pt; >- font-family:"Courier New"'>UMLUtil#convertToEcore</span></span><span >- style='font-size:10.0pt;font-family:"Courier New"'>(org.eclipse.uml2.Package <span >- class=SpellE>package_,Map</span> options)</span></p> >+ <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'>UMLUtil#convertToEcore(org.eclipse.uml2.Package >+ package_,Map options)</span></p> > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> </span></p> > </td> > <td width=312 valign=top style='width:3.25in;border-top:none;border-left: >@@ -8751,34 +8669,34 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoBodyText>The latest UML2 API provides a means to automatically migrate >-existing models saved with the UML2 1.x schema. Simply right >-click (or double click) on your existing model (with .uml2 extension) and >-select <b>Open With > UML Model Editor</b></p> >+<p class=MsoBodyText>The latest UML2 API provides a means to automatically >+migrate existing models saved with the UML2 1.x schema. >+Simply right click (or double click) on your existing model (with .uml2 >+extension) and select <b>Open With > UML Model Editor</b></p> > > <p class=MsoNormal> </p> > > <p class=MsoNormal> >-<img border=0 width=172 height=209 id="_x0000_i1033" >+<img border=0 width=172 height=209 id="_x0000_i1034" > src="guide_files/image008.jpg"></p> > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l69 level1 lfo179; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l66 level1 lfo179; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>An in-memory > model will be created with the correct UML2 2.0 schema. </span></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l69 level1 lfo179; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l66 level1 lfo179; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>In addition, > all applied profiles will automatically be migrated. </span></p> > >-<p class=MsoListBullet style='margin-left:.75in;mso-list:l69 level1 lfo179; >+<p class=MsoListBullet style='margin-left:.75in;mso-list:l66 level1 lfo179; > tab-stops:list .75in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -8800,7 +8718,7 @@ > <p class=MsoNormal> </p> > > <p class=MsoNormal> >-<img border=0 width=176 height=225 id="_x0000_i1034" >+<img border=0 width=176 height=225 id="_x0000_i1035" > src="guide_files/image009.jpg"></p> > > <p class=MsoNormal> </p> >@@ -8818,7 +8736,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l9 level1 lfo181; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l7 level1 lfo181; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -8827,7 +8745,7 @@ > > <p class=MsoNormal style='text-indent:3.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l9 level1 lfo181; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l7 level1 lfo181; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -8836,7 +8754,7 @@ > > <p class=MsoListBullet style='margin-left:.25in;text-indent:3.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l9 level1 lfo181; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l7 level1 lfo181; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -8845,7 +8763,7 @@ > > <p class=MsoListBullet style='margin-left:.25in;text-indent:3.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l9 level1 lfo181; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l7 level1 lfo181; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -8857,11 +8775,11 @@ > <p class=MsoNormal> </p> > > <p class=MsoNormal>It is possible to stereotype a profile as an <span >-class=SpellE><span style='font-family:"Courier New"'>EPackage</span></span>.</p> >+style='font-family:"Courier New"'>EPackage</span>.</p> > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l44 level1 lfo183; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l43 level1 lfo183; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -8875,17 +8793,17 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l44 level1 lfo183; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l43 level1 lfo183; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >-</span></span></span><![endif]><span style='font-weight:normal'>Stereotype >-applications are now stored at the resource level instead of as annotations on >-the elements themselves.</span></p> >+</span></span></span><![endif]><span style='font-weight:normal'>Stereotype applications >+are now stored at the resource level instead of as annotations on the elements >+themselves.</span></p> > > <p class=MsoNormal style='text-indent:3.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l44 level1 lfo183; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l43 level1 lfo183; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> >@@ -8899,55 +8817,52 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l27 level1 lfo185; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l25 level1 lfo185; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>The current UML > API implements a versioning format that conforms to the latest UML >-specification and uses existing <span class=SpellE>nsURI</span> naming >-conventions.</span></p> >+specification and uses existing nsURI naming conventions.</span></p> > > <p class=MsoNormal style='margin-left:.25in;text-indent:3.0pt'><o:p> </o:p></p> > >-<p class=MsoListBullet style='margin-left:1.25in;mso-list:l27 level1 lfo185; >+<p class=MsoListBullet style='margin-left:1.25in;mso-list:l25 level1 lfo185; > tab-stops:list 1.25in'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>In the old >-schema, version information was stored as a prefix and in the <span >-class=SpellE>nsURI</span>. This was somewhat redundant.</span></p> >+schema, version information was stored as a prefix and in the nsURI. This >+was somewhat redundant.</span></p> > > <p class=MsoNormal> </p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New"'> >- <contents <span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>ecore:EPackage</span>" <span class=SpellE>xmi:id</span>="_6hd4tLRJEdqcc7lEDGpkMw" >-name="ProfileOne<span style='background:yellow'>_0</span>" >- <span class=SpellE><span style='background: >-yellow'>nsURI</span></span>="http:///ProfileOne<span style='background: >-yellow'>_0_</span>6hd4s7RJEdqcc7lEDGpkMw.profile.uml2" <span class=SpellE>nsPrefix</span>="ProfileOne<span >-style='background:yellow'>_0</span>"></span></p> >+ <contents xmi<span class=GramE>:type</span>="ecore:EPackage" >+xmi:id="_6hd4tLRJEdqcc7lEDGpkMw" name="ProfileOne<span >+style='background:yellow'>_0</span>" <span >+style='background:yellow'>nsURI</span>="http:///ProfileOne<span >+style='background:yellow'>_0_</span>6hd4s7RJEdqcc7lEDGpkMw.profile.uml2" >+nsPrefix="ProfileOne<span style='background:yellow'>_0</span>"></span></p> > > <p class=MsoNormal> </p> > >-<p class=MsoListBullet style='margin-left:91.5pt;mso-list:l13 level1 lfo187; >+<p class=MsoListBullet style='margin-left:91.5pt;mso-list:l10 level1 lfo187; > tab-stops:list 91.5pt'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial;font-weight:normal;mso-bidi-font-weight:bold'><span > style='mso-list:Ignore'>●<span style='font:7.0pt "Times New Roman"'> > </span></span></span><![endif]><span style='font-weight:normal'>In the new >-schema, version information is stored explicitly in the <span class=SpellE>nsURI</span></span></p> >+schema, version information is stored explicitly in the nsURI</span></p> > > <p class=MsoNormal> </p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <contents <span >-class=SpellE>xmi<span class=GramE>:type</span></span>="<span class=SpellE>ecore:EPackage</span>" >-<span class=SpellE>xmi:id</span>="_wRtnIOwjEdqsq-xx51kbkg" >-name="<span class=SpellE>ProfileOne</span>" <span class=SpellE>nsURI</span>="http:///schemas/ProfileOne/<span >-style='background:yellow'>1</span>" <span class=SpellE>nsPrefix</span>="<span >-class=SpellE>ProfileOne</span>"></span></p> >+font-family:"Courier New"'> <contents >+xmi<span class=GramE>:type</span>="ecore:EPackage" >+xmi:id="_wRtnIOwjEdqsq-xx51kbkg" name="ProfileOne" >+nsURI="http:///schemas/ProfileOne/<span style='background:yellow'>1</span>" >+nsPrefix="ProfileOne"></span></p> > > <p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"'> > </span></p> >@@ -8959,10 +8874,10 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoNormal>Users can simply <span class=GramE>migrate</span> the profiles >-on their own, but profiles dont exist in a vacuum. Profiles are applied >-to models. It is therefore expected that you will want to migrate the >-models on which the profile is applied at the same time as the profile is >+<p class=MsoNormal>Users can simply <span class=GramE>migrate</span> the >+profiles on their own, but profiles dont exist in a vacuum. Profiles are >+applied to models. It is therefore expected that you will want to migrate >+the models on which the profile is applied at the same time as the profile is > migrated. The various usecases are outlined below.</p> > > <p class=MsoNormal> </p> >@@ -8976,11 +8891,11 @@ > <p class=MsoNormal> </p> > > <ol style='margin-top:0in' start=1 type=1> >- <li class=MsoNormal style='mso-list:l45 level1 lfo190;tab-stops:list .5in'>Open >+ <li class=MsoNormal style='mso-list:l44 level1 lfo190;tab-stops:list .5in'>Open > your existing profile either by double clicking in the package explorer or > by right clicking and selecting the Open With > UML Model Editor</li> > <ol style='margin-top:0in' start=1 type=a> >- <li class=MsoNormal style='mso-list:l45 level2 lfo190;tab-stops:list 1.0in'>An >+ <li class=MsoNormal style='mso-list:l44 level2 lfo190;tab-stops:list 1.0in'>An > in-memory version converted to the new schema will now exist.</li> > </ol> > </ol> >@@ -8988,25 +8903,25 @@ > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=2 type=1> >- <li class=MsoNormal style='mso-list:l73 level1 lfo193;tab-stops:list .5in'>Select >+ <li class=MsoNormal style='mso-list:l70 level1 lfo193;tab-stops:list .5in'>Select > the profile in the UML editor.</li> > </ol> > > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=3 type=1> >- <li class=MsoNormal style='mso-list:l98 level1 lfo196;tab-stops:list .5in'>Select >+ <li class=MsoNormal style='mso-list:l95 level1 lfo196;tab-stops:list .5in'>Select > UML Editor > Profile > Define</li> > </ol> > > <p class=MsoNormal> >-<img border=0 width=492 height=272 id="_x0000_i1035" >+<img border=0 width=492 height=272 id="_x0000_i1036" > src="guide_files/image010.jpg"></p> > > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=4 type=1> >- <li class=MsoNormal style='mso-list:l72 level1 lfo199;tab-stops:list .5in'>Save >+ <li class=MsoNormal style='mso-list:l69 level1 lfo199;tab-stops:list .5in'>Save > your profile.</li> > </ol> > >@@ -9026,7 +8941,7 @@ > applied to them (<span style='font-family:"Courier New"'>Basic.profile.uml2</span>, > <span style='font-family:"Courier New"'>Intermediate.profile.uml2</span> or <span > style='font-family:"Courier New"'>Complete.profile.uml2</span>). Now, we have >-one standard profile called <span class=SpellE><span style='font-family:"Courier New"'>Standard.profile.uml</span></span>.</p> >+one standard profile called <span style='font-family:"Courier New"'>Standard.profile.uml</span>.</p> > > <p class=MsoNormal> </p> > >@@ -9041,102 +8956,97 @@ > encoding="UTF-8"?></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'><<span class=SpellE>uml<span class=GramE>:Model</span></span> >-<span class=SpellE>xmi:version</span>="2.0" <span class=SpellE>xmlns:xmi</span>="http://www.omg.org/XMI" >-<span class=SpellE>xmlns:xsi</span>="http://www.w3.org/2001/XMLSchema-instance" >-xmlns:Basic_0="http:///Basic_0.profile.uml2" <span class=SpellE>xmlns:uml</span>="http://www.eclipse.org/uml2/1.0.0/UML" >-<span class=SpellE>xsi:schemaLocation</span>="http:///Basic_0.profile.uml2 >-pathmap://UML2_PROFILES/Basic.profile.uml2#__LeIQK86Edih9-GG5afQ0g" <span >-class=SpellE>xmi:id</span>="_y8utoOv8Edqsq-xx51kbkg" <span >-class=SpellE>appliedProfile</span>="_DKmYgOv_Edqsq-xx51kbkg >+font-family:"Courier New"'><uml<span class=GramE>:Model</span> >+xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" >+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Basic_0="http:///Basic_0.profile.uml2" >+xmlns:uml="http://www.eclipse.org/uml2/1.0.0/UML" >+xsi:schemaLocation="http:///Basic_0.profile.uml2 >+pathmap://UML2_PROFILES/Basic.profile.uml2#__LeIQK86Edih9-GG5afQ0g" >+xmi:id="_y8utoOv8Edqsq-xx51kbkg" appliedProfile="_DKmYgOv_Edqsq-xx51kbkg > _dmLfcOv_Edqsq-xx51kbkg"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>packageImport</span> <span >-class=SpellE>xmi<span class=GramE>:type</span></span>="<span class=SpellE>uml:ProfileApplication</span>" >-<span class=SpellE>xmi:id</span>="_DKmYgOv_Edqsq-xx51kbkg"></span></p> >+font-family:"Courier New"'> <packageImport xmi<span class=GramE>:type</span>="uml:ProfileApplication" >+xmi:id="_DKmYgOv_Edqsq-xx51kbkg"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>eAnnotations</span> >-<span class=SpellE>xmi<span class=GramE>:id</span></span>="_DKmYgev_Edqsq-xx51kbkg" >+font-family:"Courier New"'> <eAnnotations xmi<span >+class=GramE>:id</span>="_DKmYgev_Edqsq-xx51kbkg" > source="attributes"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <details <span >-class=SpellE>xmi<span class=GramE>:id</span></span>="_DKmYguv_Edqsq-xx51kbkg" >-key="version" value="0"/></span></p> >+font-family:"Courier New"'> <details xmi<span >+class=GramE>:id</span>="_DKmYguv_Edqsq-xx51kbkg" key="version" >+value="0"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>eAnnotations</span>></span></p> >+font-family:"Courier New"'> </eAnnotations></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New"'> <span style='background:yellow'><<span >-class=SpellE><span class=GramE>importedPackage</span></span> >+class=GramE>importedPackage</span> > href="pathmap://UML2_PROFILES/Complete.profile.uml2#_M7pTkK87Edih9-GG5afQ0g"/></span></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New";background:yellow'> <<span >-class=SpellE><span class=GramE>importedProfile</span></span> >+class=GramE>importedProfile</span> > href="pathmap://UML2_PROFILES/Complete.profile.uml2#_M7pTkK87Edih9-GG5afQ0g"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>packageImport</span>></span></p> >+font-family:"Courier New"'> </packageImport></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>packageImport</span> <span >-class=SpellE>xmi<span class=GramE>:type</span></span>="<span class=SpellE>uml:ProfileApplication</span>" >-<span class=SpellE>xmi:id</span>="_dmLfcOv_Edqsq-xx51kbkg"></span></p> >+font-family:"Courier New"'> <packageImport xmi<span class=GramE>:type</span>="uml:ProfileApplication" >+xmi:id="_dmLfcOv_Edqsq-xx51kbkg"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>eAnnotations</span> >-<span class=SpellE>xmi<span class=GramE>:id</span></span>="_dmLfcev_Edqsq-xx51kbkg" >+font-family:"Courier New"'> <eAnnotations xmi<span >+class=GramE>:id</span>="_dmLfcev_Edqsq-xx51kbkg" > source="attributes"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <details <span >-class=SpellE>xmi<span class=GramE>:id</span></span>="_dmLfcuv_Edqsq-xx51kbkg" >+font-family:"Courier New"'> <details xmi<span >+class=GramE>:id</span>="_dmLfcuv_Edqsq-xx51kbkg" > key="version" value="0"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>eAnnotations</span>></span></p> >+font-family:"Courier New"'> </eAnnotations></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New"'> <span style='background:yellow'><<span >-class=SpellE><span class=GramE>importedPackage</span></span> >+class=GramE>importedPackage</span> > href="pathmap://UML2_PROFILES/Basic.profile.uml2#_6mFRgK86Edih9-GG5afQ0g"/></span></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New";background:yellow'> <<span >-class=SpellE><span class=GramE>importedProfile</span></span> >+class=GramE>importedProfile</span> > href="pathmap://UML2_PROFILES/Basic.profile.uml2#_6mFRgK86Edih9-GG5afQ0g"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New";background:yellow'> </<span class=SpellE>packageImport</span>></span></p> >+font-family:"Courier New";background:yellow'> </packageImport></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>ownedMember</span> <span >-class=SpellE>xmi<span class=GramE>:type</span></span>="<span class=SpellE>uml:Artifact</span>" >-<span class=SpellE>xmi:id</span>="_md9YcOv_Edqsq-xx51kbkg" >-name="artifact"></span></p> >+font-family:"Courier New"'> <ownedMember xmi<span class=GramE>:type</span>="uml:Artifact" >+xmi:id="_md9YcOv_Edqsq-xx51kbkg" name="artifact"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>eAnnotations</span> >-<span class=SpellE>xmi<span class=GramE>:id</span></span>="_o4MmQOv_Edqsq-xx51kbkg" >-source="<span class=SpellE>appliedStereotypes</span>"></span></p> >+font-family:"Courier New"'> <eAnnotations xmi<span >+class=GramE>:id</span>="_o4MmQOv_Edqsq-xx51kbkg" >+source="appliedStereotypes"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <contents <span >-class=SpellE>xmi<span class=GramE>:type</span></span>="Basic_0:Basic__Script" >-<span class=SpellE>xmi:id</span>="_o4MmQev_Edqsq-xx51kbkg"/></span></p> >+font-family:"Courier New"'> <contents xmi<span >+class=GramE>:type</span>="Basic_0:Basic__Script" >+xmi:id="_o4MmQev_Edqsq-xx51kbkg"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>eAnnotations</span>></span></p> >+font-family:"Courier New"'> </eAnnotations></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>ownedMember</span>></span></p> >+font-family:"Courier New"'> </ownedMember></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'></<span class=SpellE>uml<span class=GramE>:Model</span></span>></span></p> >+font-family:"Courier New"'></uml<span class=GramE>:Model</span>></span></p> > > <p class=MsoBodyText> </p> > >@@ -9152,66 +9062,61 @@ > encoding="UTF-8"?></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'><<span class=SpellE>xmi<span class=GramE>:XMI</span></span> >-<span class=SpellE>xmi:version</span>="2.1" <span class=SpellE>xmlns:xmi</span>="http://schema.omg.org/spec/XMI/2.1" >-<span class=SpellE>xmlns:xsi</span>="http://www.w3.org/2001/XMLSchema-instance" >-<span class=SpellE>xmlns:Standard</span>="http://www.eclipse.org/uml2/schemas/Standard/1" >-<span class=SpellE>xmlns:ecore</span>="http://www.eclipse.org/emf/2002/Ecore" >-<span class=SpellE>xmlns:uml</span>="http://www.eclipse.org/uml2/2.0.0/UML" >+font-family:"Courier New"'><xmi<span class=GramE>:XMI</span> xmi:version="2.1" >+xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" >+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >+xmlns:Standard="http://www.eclipse.org/uml2/schemas/Standard/1" >+xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" >+xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" > xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Standard/1 > pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>uml<span class=GramE>:Model</span></span> >-<span class=SpellE>xmi:id</span>="_y8utoOv8Edqsq-xx51kbkg"></span></p> >+font-family:"Courier New"'> <uml<span class=GramE>:Model</span> >+xmi:id="_y8utoOv8Edqsq-xx51kbkg"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>packagedElement</span> >-<span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>uml:Artifact</span>" <span class=SpellE>xmi:id</span>="_md9YcOv_Edqsq-xx51kbkg" >-name="artifact"/></span></p> >+font-family:"Courier New"'> <packagedElement xmi<span >+class=GramE>:type</span>="uml:Artifact" >+xmi:id="_md9YcOv_Edqsq-xx51kbkg" name="artifact"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>profileApplication</span> >-<span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>uml:ProfileApplication</span>" <span class=SpellE>xmi:id</span>="_3vnrsOw6Edqsq-xx51kbkg"></span></p> >+font-family:"Courier New"'> <profileApplication xmi<span >+class=GramE>:type</span>="uml:ProfileApplication" >+xmi:id="_3vnrsOw6Edqsq-xx51kbkg"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span >-class=SpellE>eAnnotations</span> <span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>ecore:EAnnotation</span>" <span class=SpellE>xmi:id</span>="_3vnrsew6Edqsq-xx51kbkg" >-source="http://www.eclipse.org/uml2/2.0.0/UML"></span></p> >+font-family:"Courier New"'> <eAnnotations xmi<span >+class=GramE>:type</span>="ecore:EAnnotation" >+xmi:id="_3vnrsew6Edqsq-xx51kbkg" source="http://www.eclipse.org/uml2/2.0.0/UML"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New"'> >-<references <span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>ecore:EPackage</span>" >+<references xmi<span class=GramE>:type</span>="ecore:EPackage" > href="pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span >-class=SpellE>eAnnotations</span>></span></p> >+font-family:"Courier New"'> </eAnnotations></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New"'> <span >-style='background:yellow'><<span class=SpellE>appliedProfile</span> <span >-class=SpellE>xmi<span class=GramE>:type</span></span>="<span class=SpellE>uml:Profile</span>" >-<span class=SpellE>href</span>="pathmap://UML_PROFILES/Standard.profile.uml#_0"/></span></span></p> >+style='background:yellow'><appliedProfile xmi<span class=GramE>:type</span>="uml:Profile" >+href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/></span></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New";background:yellow'> </<span >-class=SpellE>profileApplication</span>></span></p> >+font-family:"Courier New";background:yellow'> >+</profileApplication></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>uml<span class=GramE>:Model</span></span>></span></p> >+font-family:"Courier New"'> </uml<span class=GramE>:Model</span>></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>Standard<span >-class=GramE>:Script</span></span> <span class=SpellE>xmi:id</span>="_3vnrsuw6Edqsq-xx51kbkg" >-<span class=SpellE>base_Artifact</span>="_md9YcOv_Edqsq-xx51kbkg"/></span></p> >+font-family:"Courier New"'> <Standard<span class=GramE>:Script</span> >+xmi:id="_3vnrsuw6Edqsq-xx51kbkg" >+base_Artifact="_md9YcOv_Edqsq-xx51kbkg"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'></<span class=SpellE>xmi<span class=GramE>:XMI</span></span>></span></p> >+font-family:"Courier New"'></xmi<span class=GramE>:XMI</span>></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New"'> </span></p> >@@ -9236,19 +9141,19 @@ > > Apply Profile.</p> > > <p class=MsoNormal> >-<img border=0 width=348 height=225 id="_x0000_i1036" >+<img border=0 width=348 height=225 id="_x0000_i1037" > src="guide_files/image011.jpg"></p> > > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=2 type=1> >- <li class=MsoNormal style='mso-list:l39 level1 lfo205;tab-stops:list .5in'>Delete >+ <li class=MsoNormal style='mso-list:l36 level1 lfo205;tab-stops:list .5in'>Delete > the extra profile applications that are no longer required from your > existing model that might have been left as a result of multiple > predefined models (i.e. the <span style='font-family:"Courier New"'>Basic.profile.uml2</span>, > <span style='font-family:"Courier New"'>Intermediate.profile.uml2</span> > and <span style='font-family:"Courier New"'>Complete.profile.uml2</span>) >- being converted to <span class=SpellE><span style='font-family:"Courier New"'>Standard.profile.uml</span></span>.</li> >+ being converted to <span style='font-family:"Courier New"'>Standard.profile.uml</span>.</li> > </ol> > > <p class=MsoBodyText> </p> >@@ -9274,90 +9179,85 @@ > encoding="UTF-8"?></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'><<span class=SpellE>uml<span class=GramE>:Model</span></span> >-<span class=SpellE>xmi:version</span>="2.0" <span class=SpellE>xmlns:xmi</span>="http://www.omg.org/XMI" >-<span class=SpellE>xmlns:xsi</span>="http://www.w3.org/2001/XMLSchema-instance" >+font-family:"Courier New"'><uml<span class=GramE>:Model</span> >+xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" >+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > xmlns:ProfileOne_0="http:///ProfileOne_0_6hd4s7RJEdqcc7lEDGpkMw.profile.uml2" >-<span class=SpellE>xmlns:uml</span>="http://www.eclipse.org/uml2/1.0.0/UML" >+xmlns:uml="http://www.eclipse.org/uml2/1.0.0/UML" > xsi:schemaLocation="http:///ProfileOne_0_6hd4s7RJEdqcc7lEDGpkMw.profile.uml2 >-MyProfile.uml2#_6hd4tLRJEdqcc7lEDGpkMw" <span class=SpellE>xmi:id</span>="_HF4i4LRHEdqcc7lEDGpkMw" >-<span class=SpellE>appliedProfile</span>="_EMDHoLRKEdqcc7lEDGpkMw"></span></p> >+MyProfile.uml2#_6hd4tLRJEdqcc7lEDGpkMw" >+xmi:id="_HF4i4LRHEdqcc7lEDGpkMw" >+appliedProfile="_EMDHoLRKEdqcc7lEDGpkMw"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>packageImport</span> <span >-class=SpellE>xmi<span class=GramE>:type</span></span>="<span class=SpellE>uml:ProfileApplication</span>" >-<span class=SpellE>xmi:id</span>="_EMDHoLRKEdqcc7lEDGpkMw"></span></p> >+font-family:"Courier New"'> <packageImport xmi<span class=GramE>:type</span>="uml:ProfileApplication" >+xmi:id="_EMDHoLRKEdqcc7lEDGpkMw"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>eAnnotations</span> >-<span class=SpellE>xmi<span class=GramE>:id</span></span>="_EMDHobRKEdqcc7lEDGpkMw" >-source="attributes"></span></p> >+font-family:"Courier New"'> <eAnnotations xmi<span >+class=GramE>:id</span>="_EMDHobRKEdqcc7lEDGpkMw" source="attributes"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <details <span >-class=SpellE>xmi<span class=GramE>:id</span></span>="_EMDHorRKEdqcc7lEDGpkMw" >+font-family:"Courier New"'> <details xmi<span >+class=GramE>:id</span>="_EMDHorRKEdqcc7lEDGpkMw" > key="version" value="0"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>eAnnotations</span>></span></p> >+font-family:"Courier New"'> </eAnnotations></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>importedPackage</span> >-<span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>uml:Profile</span>" <span class=SpellE>href</span>="MyProfile.uml2#_NLpAMLRHEdqcc7lEDGpkMw"/></span></p> >+font-family:"Courier New"'> <importedPackage xmi<span >+class=GramE>:type</span>="uml:Profile" >+href="MyProfile.uml2#_NLpAMLRHEdqcc7lEDGpkMw"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>importedProfile</span> >-<span class=SpellE>href</span>="MyProfile.uml2#_NLpAMLRHEdqcc7lEDGpkMw"/></span></p> >+font-family:"Courier New"'> <importedProfile >+href="MyProfile.uml2#_NLpAMLRHEdqcc7lEDGpkMw"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>packageImport</span>></span></p> >+font-family:"Courier New"'> </packageImport></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <span style='background:yellow'><<span >-class=SpellE>ownedMember</span> <span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>uml:Class</span>" <span class=SpellE>xmi:id</span>="_H44GELRHEdqcc7lEDGpkMw" >-name="<span class=SpellE>MyClass</span>"></span></span></p> >+font-family:"Courier New"'> <span style='background:yellow'><ownedMember >+xmi<span class=GramE>:type</span>="uml:Class" >+xmi:id="_H44GELRHEdqcc7lEDGpkMw" name="MyClass"></span></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New";background:yellow'> <<span >-class=SpellE>eAnnotations</span> <span class=SpellE>xmi<span class=GramE>:id</span></span>="_HyseMLRKEdqcc7lEDGpkMw" >-source="<span class=SpellE>appliedStereotypes</span>"></span></p> >+font-family:"Courier New";background:yellow'> >+<eAnnotations xmi<span class=GramE>:id</span>="_HyseMLRKEdqcc7lEDGpkMw" >+source="appliedStereotypes"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New";background:yellow'> >-<contents <span class=SpellE>xmi<span class=GramE>:type</span></span>="ProfileOne_0:ProfileOne__StereotypeOne" >-<span class=SpellE>xmi:id</span>="_HyseMbRKEdqcc7lEDGpkMw" <span >-class=SpellE>MyProperty</span>="4"/></span></p> >+<contents xmi<span class=GramE>:type</span>="ProfileOne_0:ProfileOne__StereotypeOne" >+xmi:id="_HyseMbRKEdqcc7lEDGpkMw" MyProperty="4"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New";background:yellow'> </<span >-class=SpellE>eAnnotations</span>></span></p> >+font-family:"Courier New";background:yellow'> >+</eAnnotations></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>ownedAttribute</span> >-<span class=SpellE>xmi<span class=GramE>:id</span></span>="_b9cgQLRKEdqcc7lEDGpkMw" >-name="<span class=SpellE>PropertyOne</span>"/></span></p> >+font-family:"Courier New"'> <ownedAttribute xmi<span >+class=GramE>:id</span>="_b9cgQLRKEdqcc7lEDGpkMw" >+name="PropertyOne"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>ownedMember</span>></span></p> >+font-family:"Courier New"'> </ownedMember></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>ownedMember</span> <span >-class=SpellE>xmi<span class=GramE>:type</span></span>="<span class=SpellE>uml:Actor</span>" >-<span class=SpellE>xmi:id</span>="_ERmhcLqqEdqSyLEgG4orvQ" >-name="Actor"></span></p> >+font-family:"Courier New"'> <ownedMember xmi<span class=GramE>:type</span>="uml:Actor" >+xmi:id="_ERmhcLqqEdqSyLEgG4orvQ" name="Actor"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>eAnnotations</span> >-<span class=SpellE>xmi<span class=GramE>:id</span></span>="_ICL3ILqqEdqSyLEgG4orvQ" >+font-family:"Courier New"'> <eAnnotations xmi<span >+class=GramE>:id</span>="_ICL3ILqqEdqSyLEgG4orvQ" > source="keywords" value="blah"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>ownedMember</span>></span></p> >+font-family:"Courier New"'> </ownedMember></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'></<span class=SpellE>uml<span class=GramE>:Model</span></span>></span></p> >+font-family:"Courier New"'></uml<span class=GramE>:Model</span>></span></p> > > <p class=MsoNormal> </p> > >@@ -9371,93 +9271,83 @@ > encoding="UTF-8"?></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'><<span class=SpellE>xmi<span class=GramE>:XMI</span></span> >-<span class=SpellE>xmi:version</span>="2.1" <span class=SpellE>xmlns:xmi</span>="http://schema.omg.org/spec/XMI/2.1" >-<span class=SpellE>xmlns:xsi</span>="http://www.w3.org/2001/XMLSchema-instance" >-<span class=SpellE>xmlns:ProfileOne</span>="http:///schemas/ProfileOne/1" >-<span class=SpellE>xmlns:ecore</span>="http://www.eclipse.org/emf/2002/Ecore" >-<span class=SpellE>xmlns:uml</span>="http://www.eclipse.org/uml2/2.0.0/UML" >-<span class=SpellE>xsi:schemaLocation</span>="http:///schemas/ProfileOne/1 >+font-family:"Courier New"'><xmi<span class=GramE>:XMI</span> >+xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" >+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >+xmlns:ProfileOne="http:///schemas/ProfileOne/1" >+xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" >+xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xsi:schemaLocation="http:///schemas/ProfileOne/1 > MyProfile.uml#_wRtnIOwjEdqsq-xx51kbkg"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>uml<span class=GramE>:Model</span></span> >-<span class=SpellE>xmi:id</span>="_HF4i4LRHEdqcc7lEDGpkMw"></span></p> >+font-family:"Courier New"'> <uml<span class=GramE>:Model</span> >+xmi:id="_HF4i4LRHEdqcc7lEDGpkMw"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <span style='background:yellow'><<span >-class=SpellE>packagedElement</span> <span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>uml:Class</span>" <span class=SpellE>xmi:id</span>="_H44GELRHEdqcc7lEDGpkMw" >-name="<span class=SpellE>MyClass</span>"></span></span></p> >+font-family:"Courier New"'> <span style='background:yellow'><packagedElement >+xmi<span class=GramE>:type</span>="uml:Class" >+xmi:id="_H44GELRHEdqcc7lEDGpkMw" name="MyClass"></span></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New";background:yellow'> >-<<span class=SpellE>ownedAttribute</span> <span class=SpellE>xmi<span >-class=GramE>:type</span></span>="<span class=SpellE>uml:Property</span>" >-<span class=SpellE>xmi:id</span>="_b9cgQLRKEdqcc7lEDGpkMw" >-name="<span class=SpellE>PropertyOne</span>"/></span></p> >+<ownedAttribute xmi<span class=GramE>:type</span>="uml:Property" >+xmi:id="_b9cgQLRKEdqcc7lEDGpkMw" name="PropertyOne"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New";background:yellow'> </<span >-class=SpellE>packagedElement</span>></span></p> >+font-family:"Courier New";background:yellow'> >+</packagedElement></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>packagedElement</span> >-<span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>uml:Actor</span>" <span class=SpellE>xmi:id</span>="_ERmhcLqqEdqSyLEgG4orvQ" >-name="Actor"></span></p> >+font-family:"Courier New"'> <packagedElement xmi<span >+class=GramE>:type</span>="uml:Actor" >+xmi:id="_ERmhcLqqEdqSyLEgG4orvQ" name="Actor"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span >-class=SpellE>eAnnotations</span> <span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>ecore:EAnnotation</span>" <span class=SpellE>xmi:id</span>="_ICL3ILqqEdqSyLEgG4orvQ" >-source="http://www.eclipse.org/uml2/2.0.0/UML" >+font-family:"Courier New"'> <eAnnotations xmi<span >+class=GramE>:type</span>="ecore:EAnnotation" >+xmi:id="_ICL3ILqqEdqSyLEgG4orvQ" source="http://www.eclipse.org/uml2/2.0.0/UML" > value="blah"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>packagedElement</span>></span></p> >+font-family:"Courier New"'> </packagedElement></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <span style='background:yellow'><<span >-class=SpellE>profileApplication</span> <span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>uml:ProfileApplication</span>" <span class=SpellE>xmi:id</span>="_EMDHoLRKEdqcc7lEDGpkMw"></span></span></p> >+font-family:"Courier New"'> <span style='background:yellow'><profileApplication >+xmi<span class=GramE>:type</span>="uml:ProfileApplication" >+xmi:id="_EMDHoLRKEdqcc7lEDGpkMw"></span></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New";background:yellow'> >-<<span class=SpellE>eAnnotations</span> <span class=SpellE>xmi<span >-class=GramE>:type</span></span>="<span class=SpellE>ecore:EAnnotation</span>" >-<span class=SpellE>xmi:id</span>="_EMDHobRKEdqcc7lEDGpkMw" >-source="http://www.eclipse.org/uml2/2.0.0/UML"></span></p> >+<eAnnotations xmi<span class=GramE>:type</span>="ecore:EAnnotation" >+xmi:id="_EMDHobRKEdqcc7lEDGpkMw" source="http://www.eclipse.org/uml2/2.0.0/UML"></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New";background:yellow'> >-<references <span class=SpellE>xmi<span class=GramE>:type</span></span>="<span >-class=SpellE>ecore:EPackage</span>" <span class=SpellE>href</span>="MyProfile.uml#_wRtnIOwjEdqsq-xx51kbkg"/></span></p> >+<references xmi<span class=GramE>:type</span>="ecore:EPackage" >+href="MyProfile.uml#_wRtnIOwjEdqsq-xx51kbkg"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New";background:yellow'> >-</<span class=SpellE>eAnnotations</span>></span></p> >+</eAnnotations></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; > font-family:"Courier New";background:yellow'> >-<<span class=SpellE>appliedProfile</span> <span class=SpellE>xmi<span >-class=GramE>:type</span></span>="<span class=SpellE>uml:Profile</span>" >-<span class=SpellE>href</span>="MyProfile.uml#_NLpAMLRHEdqcc7lEDGpkMw"/></span></p> >+<appliedProfile xmi<span class=GramE>:type</span>="uml:Profile" >+href="MyProfile.uml#_NLpAMLRHEdqcc7lEDGpkMw"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New";background:yellow'> </<span >-class=SpellE>profileApplication</span>></span></p> >+font-family:"Courier New";background:yellow'> </profileApplication></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> </<span class=SpellE>uml<span class=GramE>:Model</span></span>></span></p> >+font-family:"Courier New"'> </uml<span class=GramE>:Model</span>></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'> <<span class=SpellE>ProfileOne<span >-class=GramE>:StereotypeOne</span></span> <span class=SpellE>xmi:id</span>="_AjMRkOwkEdqsq-xx51kbkg" >-<span class=SpellE>MyProperty</span>="4" <span class=SpellE>base_Class</span>="_H44GELRHEdqcc7lEDGpkMw"/></span></p> >+font-family:"Courier New"'> <ProfileOne<span class=GramE>:StereotypeOne</span> >+xmi:id="_AjMRkOwkEdqsq-xx51kbkg" MyProperty="4" >+base_Class="_H44GELRHEdqcc7lEDGpkMw"/></span></p> > > <p class=MsoNormal style='text-autospace:none'><span style='font-size:8.0pt; >-font-family:"Courier New"'></<span class=SpellE>xmi<span class=GramE>:XMI</span></span>></span></p> >+font-family:"Courier New"'></xmi<span class=GramE>:XMI</span>></span></p> > > <p class=MsoList2> </p> > >@@ -9469,23 +9359,23 @@ > <p class=MsoNormal> </p> > > <ol style='margin-top:0in' start=1 type=1> >- <li class=MsoNormal style='mso-list:l52 level1 lfo208;tab-stops:list .5in'>Open >- up your older model with the <span class=SpellE>UMLEditor</span>.</li> >+ <li class=MsoNormal style='mso-list:l51 level1 lfo208;tab-stops:list .5in'>Open >+ up your older model with the UMLEditor.</li> > </ol> > > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=1 type=1> > <ol style='margin-top:0in' start=1 type=a> >- <li class=MsoNormal style='mso-list:l97 level2 lfo211;tab-stops:list 1.0in'>Follow >+ <li class=MsoNormal style='mso-list:l94 level2 lfo211;tab-stops:list 1.0in'>Follow > rules for <a href="#_Migration">Model Artifact Migration</a>.</li> > </ol> > </ol> > > <p class=MsoNormal style='margin-left:1.5in;text-indent:-1.5in'><span > style='font-size:7.0pt'> >-</span><span class=SpellE>i</span>.<span style='font-size:7.0pt'> >-</span>An in memory version of your model will be created </p> >+</span>i.<span style='font-size:7.0pt'> </span>An >+in memory version of your model will be created </p> > > <p class=MsoNormal style='margin-left:1.5in;text-indent:-1.5in'><span > style='font-size:7.0pt'> >@@ -9500,7 +9390,7 @@ > likely not what you want)</p> > > <p class=MsoNormal> >-<img border=0 width=480 height=323 id="_x0000_i1037" >+<img border=0 width=480 height=323 id="_x0000_i1038" > src="guide_files/image012.jpg"></p> > > <p class=MsoNormal> </p> >@@ -9516,7 +9406,7 @@ > > <ol style='margin-top:0in' start=2 type=1> > <ol style='margin-top:0in' start=1 type=a> >- <li class=MsoNormal style='mso-list:l28 level2 lfo217;tab-stops:list 1.0in'>Select >+ <li class=MsoNormal style='mso-list:l26 level2 lfo217;tab-stops:list 1.0in'>Select > the applied user defined profile in the editor</li> > </ol> > </ol> >@@ -9526,15 +9416,15 @@ > <p class=MsoNormal><o:p> </o:p></p> > > <p class=MsoNormal> >-<img border=0 width=432 height=290 id="_x0000_i1038" >+<img border=0 width=432 height=290 id="_x0000_i1039" > src="guide_files/image013.jpg"></p> > > <p class=MsoNormal style='margin-left:.75in'> </p> > > <ol style='margin-top:0in' start=2 type=1> > <ol style='margin-top:0in' start=2 type=a> >- <li class=MsoNormal style='mso-list:l110 level2 lfo220;tab-stops:list 1.0in'>Select >- <span class=SpellE><b>UMLEditor</b></span><b> > Profile > Define</b></li> >+ <li class=MsoNormal style='mso-list:l109 level2 lfo220;tab-stops:list 1.0in'>Select >+ <b>UMLEditor > Profile > Define</b></li> > </ol> > </ol> > >@@ -9543,13 +9433,13 @@ > <p class=MsoNormal><o:p> </o:p></p> > > <p class=MsoNormal> >-<img border=0 width=479 height=324 id="_x0000_i1039" >+<img border=0 width=479 height=324 id="_x0000_i1040" > src="guide_files/image014.jpg"></p> > > <p class=MsoNormal> </p> > > <ol style='margin-top:0in' start=3 type=1> >- <li class=MsoNormal style='mso-list:l104 level1 lfo223;tab-stops:list .5in'>Re-apply >+ <li class=MsoNormal style='mso-list:l100 level1 lfo223;tab-stops:list .5in'>Re-apply > the newly migrated profile.</li> > </ol> > >@@ -9567,16 +9457,15 @@ > <p class=MsoNormal><o:p> </o:p></p> > > <p class=MsoNormal> >-<img border=0 width=468 height=315 id="_x0000_i1040" >+<img border=0 width=468 height=315 id="_x0000_i1041" > src="guide_files/image015.jpg"></p> > > <p class=MsoNormal><o:p> </o:p></p> > > <ol style='margin-top:0in' start=3 type=1> > <ol style='margin-top:0in' start=2 type=a> >- <li class=MsoNormal style='mso-list:l12 level2 lfo229;tab-stops:list 1.0in'>Select >- <span class=SpellE><b>UMLEditor</b></span><b> > Package > Apply >- Profile </b></li> >+ <li class=MsoNormal style='mso-list:l9 level2 lfo229;tab-stops:list 1.0in'>Select >+ <b>UMLEditor > Package > Apply Profile </b></li> > </ol> > </ol> > >@@ -9585,14 +9474,14 @@ > <p class=MsoNormal><o:p> </o:p></p> > > <p class=MsoNormal> >-<img border=0 width=491 height=331 id="_x0000_i1041" >+<img border=0 width=491 height=331 id="_x0000_i1042" > src="guide_files/image016.jpg"></p> > > <p class=MsoNormal><o:p> </o:p></p> > > <ol style='margin-top:0in' start=3 type=1> > <ol style='margin-top:0in' start=3 type=a> >- <li class=MsoNormal style='mso-list:l64 level2 lfo232;tab-stops:list 1.0in'>Select >+ <li class=MsoNormal style='mso-list:l62 level2 lfo232;tab-stops:list 1.0in'>Select > the profile in question and click Add then OK</li> > </ol> > </ol> >@@ -9602,13 +9491,13 @@ > <p class=MsoNormal><o:p> </o:p></p> > > <p class=MsoNormal> >-<img border=0 width=396 height=216 id="_x0000_i1042" >+<img border=0 width=396 height=216 id="_x0000_i1043" > src="guide_files/image017.jpg"></p> > > <p class=MsoNormal style='margin-left:.25in'> </p> > > <ol style='margin-top:0in' start=4 type=1> >- <li class=MsoNormal style='mso-list:l103 level1 lfo235;tab-stops:list .5in'>Save >+ <li class=MsoNormal style='mso-list:l99 level1 lfo235;tab-stops:list .5in'>Save > your resource</li> > </ol> > >@@ -9616,7 +9505,7 @@ > > <ol style='margin-top:0in' start=4 type=1> > <ol style='margin-top:0in' start=1 type=a> >- <li class=MsoNormal style='mso-list:l54 level2 lfo238;tab-stops:list 1.0in'>Simply >+ <li class=MsoNormal style='mso-list:l53 level2 lfo238;tab-stops:list 1.0in'>Simply > click Save.</li> > </ol> > </ol> >@@ -9628,7 +9517,7 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoNormal><img border=0 width=516 height=347 id="_x0000_i1043" >+<p class=MsoNormal><img border=0 width=516 height=347 id="_x0000_i1044" > src="guide_files/image018.jpg"></p> > > <p class=MsoNormal><br> >@@ -9637,6 +9526,351 @@ > > <p class=MsoNormal> </p> > >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<h2><!--[if gte vml 1]><v:shape id="_x0000_i1045" type="#_x0000_t75" alt="" >+ style='width:9.75pt;height:9.75pt'> >+ <v:imagedata src="guide_files/image001.gif" o:href="http://www.eclipse.org/uml2/docs/plans/new.gif"/> >+</v:shape><![endif]--><![if !vml]><img border=0 width=13 height=13 >+src="guide_files/image001.gif" v:shapes="_x0000_i1045"><![endif]><span >+style='mso-spacerun:yes'> </span>Programmatic Migration</h2> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<p class=MsoNormal>In order to migrate models programmatically, some setup is >+required in order to register mappings (already defined by UML).<span >+style='mso-spacerun:yes'> </span>These mappings will be used by the resource >+set during the loading stage and will perform the necessary in-memory migration.</p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<p class=MsoNormal>The example below demonstrates how one can <span >+class=GramE>migrate</span> models with a stand-alone application.</p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<p class=MsoNormal>Lets first start with our main method.</p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<h3 style='margin-left:0in;text-indent:0in'><st1:place>Main</st1:place></h3> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<pre style='margin-left:9.0pt'><b><span style='color:#7F0055'><span >+style='mso-tab-count:1'> </span><span class=GramE>public</span></span></b><span >+style='color:black'> </span><b><span style='color:#7F0055'>static</span></b><span >+style='color:black'> </span><b><span style='color:#7F0055'>void</span></b><span >+style='color:black'> main(String[] args) {</span><o:p></o:p></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span></span><span class=GramE><b><span style='color:#7F0055'>if</span></b></span><span >+style='color:black'> (args.</span><span style='color:#0000C0'>length</span><span >+style='color:black'> != 2) {</span><o:p></o:p></pre><pre style='margin-left: >+9.0pt'><span style='color:black'><span style='mso-tab-count:3'> </span>System.</span><i><span >+style='color:#0000C0'>out</span></i><o:p></o:p></pre><pre style='margin-left: >+9.0pt'><span style='color:black'><span style='mso-tab-count:4'> </span>.<span >+class=GramE>println(</span></span><span style='color:#2A00FF'>"Wrong number of arguments.\nFirst argument is path "</span><span >+style='color:black'> +</span><o:p></o:p></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><span style='mso-tab-count:6'> </span></span><span >+style='color:#2A00FF'>"<span class=GramE>of</span> file to migrate ie. C:/myModel.uml2, \nSecond <span >+class=GramE>"<span style='color:black'> +</span></span></span><o:p></o:p></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+6'> </span></span><span >+style='color:#2A00FF'>"<span class=GramE>argument</span> is workspace path "</span><span >+style='color:black'> +</span><o:p></o:p></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><span style='mso-tab-count:6'> </span></span><span >+style='color:#2A00FF'>"<span class=GramE>ie</span>. C<span class=GramE>:/</span>workspace/myWorkspace/"</span><span >+style='color:black'>);</span><o:p></o:p></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><span style='mso-tab-count:3'> </span></span><span >+class=GramE><b><span style='color:#7F0055'>return</span></b></span><span >+style='color:black'>;</span><o:p></o:p></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><span style='mso-tab-count:2'> </span>}</span><o:p></o:p></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>String fileToMigrate = <span class=GramE>args[</span>0];</span><o:p></o:p></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>String workspacePath = <span class=GramE>args[</span>1];</span><o:p></o:p></pre><pre >+style='margin-left:9.0pt'><o:p> </o:p></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><span style='mso-tab-count:2'> </span><span >+class=GramE><i>migrateModel</i>(</span>URI.<i>createFileURI</i>(fileToMigrate), URI</span><o:p></o:p></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>.<span class=GramE><i>createFileURI</i>(</span>workspacePath));</span><o:p></o:p></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span>}<o:p></o:p></span></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><o:p> </o:p></span></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><o:p> </o:p></span></pre> >+ >+<p class=MsoNormal><span class=GramE>Nothing very exciting here.</span><span >+style='mso-spacerun:yes'> </span>We simply pass the file to migrate as the >+first parameter, and the workspace path as the second.<span >+style='mso-spacerun:yes'> </span>Well see how these are used later on.</p> >+ >+<p class=MsoNormal>For stand-alone applications, it is required to register >+pathmaps, extensions and packages.<span style='mso-spacerun:yes'> </span></p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<h3 style='margin-left:0in;text-indent:0in'>Setup</h3> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<pre style='margin-left:9.0pt'><b><span style='color:black'><span >+style='mso-tab-count:1'> </span><span class=GramE>protected</span></span></b><span >+style='color:black'> <b>static</b> <b>void</b> registerPathmaps(URI workspaceURI) {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>URIConverter.<i>URI_<span class=GramE>MAP<span >+style='font-style:normal'>.put(</span></span></i>URI.<i>createURI</i>(UMLResource.<i>LIBRARIES_PATHMAP</i>),<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span></span><img border=0 width=24 height=14 id="_x0000_i1058" >+src="../../articles/Getting_Started_with_UML2/images/tag_1.gif" align=CENTER><span >+style='color:black'><span style='mso-tab-count:2'> </span><span >+class=GramE>workspaceURI.appendSegment(</span>"libraries").appendSegment(""));<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>URIConverter.<i>URI_<span class=GramE>MAP<span >+style='font-style:normal'>.put(</span></span></i>URI.<i>createURI</i>(UMLResource.<i>METAMODELS_PATHMAP</i>),<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span><span class=GramE>workspaceURI.appendSegment(</span>"metamodels").appendSegment(""));<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>URIConverter.<i>URI_<span class=GramE>MAP<span >+style='font-style:normal'>.put(</span></span></i>URI.<i>createURI</i>(UMLResource.<i>PROFILES_PATHMAP</i>),<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span><span class=GramE>workspaceURI.<u>appendSegment</u>(</span>"profiles").appendSegment(""));<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span>}<o:p></o:p></span></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><o:p> </o:p></span></pre> >+ >+<p class=MsoNormal>In the function above, we register the locations to the various >+pathmaps.<span style='mso-spacerun:yes'> </span>Here, we make use of the >+workspace URI <img border=0 width=24 height=14 id="_x0000_i1059" >+src="../../articles/Getting_Started_with_UML2/images/tag_1.gif" align=CENTER><span >+style='mso-spacerun:yes'> </span>passed in as a parameter to the <span >+class=GramE>main(</span>) function.</p> >+ >+<p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"; >+color:black'><o:p> </o:p></span></p> >+ >+<p class=MsoNormal><span style='font-size:10.0pt;font-family:"Courier New"; >+color:black'><o:p> </o:p></span></p> >+ >+<pre style='margin-left:9.0pt'><span style='color:black'><o:p> </o:p></span></pre><pre >+style='margin-left:9.0pt'><b><span style='color:black'><span style='mso-tab-count: >+1'> </span><span class=GramE>protected</span></span></b><span >+style='color:black'> <b>static</b> <b>void</b> registerExtensions() {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>Map extensionFactoryMap = Resource.Factory.Registry.<i>INSTANCE</i><o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>.<span class=GramE>getExtensionToFactoryMap(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE>extensionFactoryMap.put(</span>UMLResource.<i>FILE_EXTENSION</i>,<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>UMLResource.Factory.<i>INSTANCE</i>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span></span><img border=0 width=24 height=14 id="_x0000_i1054" >+src="../../articles/Getting_Started_with_UML2/images/tag_1.gif" align=CENTER><span >+style='color:black'><span style='mso-tab-count:1'> </span><span >+class=GramE>extensionFactoryMap.put(</span>Ecore2XMLResource.<i>FILE_EXTENSION</i>,<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>Ecore2XMLResource.Factory.<i>INSTANCE</i>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span></span><img border=0 width=24 height=14 id="_x0000_i1056" >+src="../../articles/Getting_Started_with_UML2/images/tag_2.gif" align=CENTER><span >+style='color:black'><span style='mso-tab-count:1'> </span><span >+class=GramE>extensionFactoryMap.put(</span>UML22UMLResource.<i>FILE_EXTENSION</i>,<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>UML22UMLResource.Factory.<i>INSTANCE</i>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span>}<o:p></o:p></span></pre> >+ >+<p class=MsoNormal>In the function above, we register the <img border=0 >+width=24 height=14 id="_x0000_i1055" >+src="../../articles/Getting_Started_with_UML2/images/tag_1.gif" align=CENTER><span >+style='mso-spacerun:yes'> </span>.ecore2xml and <img border=0 width=24 >+height=14 id="_x0000_i1057" >+src="../../articles/Getting_Started_with_UML2/images/tag_2.gif" align=CENTER><span >+style='mso-spacerun:yes'> </span>.uml2 extensions used by the resource set for >+conversion purposes.</p> >+ >+<pre style='margin-left:9.0pt'><span style='color:black'><o:p> </o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><o:p> </o:p></span></pre><pre >+style='margin-left:9.0pt'><b><span style='color:black'><span style='mso-tab-count: >+1'> </span><span class=GramE>protected</span></span></b><span >+style='color:black'> <b>static</b> <b>void</b> registerPackages(ResourceSet resourceSet) {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>Map packageRegistry = <span class=GramE>resourceSet.getPackageRegistry(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE>packageRegistry.put(</span>EcorePackage.<i>eNS_URI</i>, EcorePackage.<i>eINSTANCE</i>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE>packageRegistry.put(</span>Ecore2XMLPackage.<i>eNS_URI</i>,<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>Ecore2XMLPackage.<i>eINSTANCE</i>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE>packageRegistry.put(</span>UMLPackage.<i>eNS_URI</i>, UMLPackage.<i>eINSTANCE</i>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span>}<o:p></o:p></span></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><o:p> </o:p></span></pre> >+ >+<p class=MsoNormal>Stand alone applications require registration of >+Packages.<span style='mso-spacerun:yes'> </span>Eclipse based plugins are not >+required to register packages since packages are registered via an extension.</p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<h3 style='margin-left:0in;text-indent:0in'>Migration</h3> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<p class=MsoNormal>Now we get to the interesting part.<span >+style='mso-spacerun:yes'> </span></p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<pre style='margin-left:9.0pt'><b><span style='color:black'><span >+style='mso-tab-count:1'> </span><span class=GramE>public</span></span></b><span >+style='color:black'> <b>static</b> <b>void</b> migrateModel(URI resourceURI, URI workspaceURI) {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE>System.<i>out</i>.println(</span>"Migrating file " + resourceURI.toFileString());<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><o:p> </o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>ResourceSet resourceSet = <b>new</b> <span class=GramE>ResourceSetImpl(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><o:p> </o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='mso-tab-count:1'> </span><img >+border=0 width=24 height=14 id="_x0000_i1046" >+src="../../articles/Getting_Started_with_UML2/images/tag_1.gif" align=CENTER><span >+style='color:black'><span style='mso-tab-count:1'> </span><span >+class=GramE><i>registerPathmaps</i>(</span>workspaceURI);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE><i>registerPackages</i>(</span>resourceSet);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE><i>registerExtensions</i>(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><o:p> </o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>// Map references to legacy (1.x) model elements to their new locations.<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>Map uriMap = <span class=GramE>UML22UMLExtendedMetaData.<i>getURIMap</i>(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE>resourceSet.getURIConverter(</span>).getURIMap().putAll(uriMap);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><o:p> </o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>// <span class=GramE>For</span> a stand alone application, it is necessary to map the platform<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>// plugin URI scheme to the workspace location.<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>URIConverter.<i>URI_<span class=GramE>MAP<span >+style='font-style:normal'>.put(</span></span></i>URI.<i>createURI</i>("platform:/plugin/"),<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span><span class=GramE>workspaceURI</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><o:p> </o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>// Load a resource in the resource set.<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE><b>try</b></span> {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span></span><img border=0 width=24 height=14 id="_x0000_i1048" >+src="../../articles/Getting_Started_with_UML2/images/tag_2.gif" align=CENTER><span >+style='mso-tab-count:1'> </span><span style='color:black'><span >+style='mso-tab-count:1'> </span><span class=GramE>resourceSet.getResource(</span>resourceURI, <b>true</b>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>} <b>catch</b> (Exception e) {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span><span class=GramE>System.<i>out</i>.println(</span>e.getMessage());<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span><span class=GramE><b>return</b></span>;<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>}<o:p></o:p></span></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><o:p> </o:p></span></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><span style='mso-tab-count:2'> </span>// Replace the .uml2 extension with .uml if necessary.<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>Map resourceToURIMap = <b>new</b> <span class=GramE>HashMap(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>EList resources = <span class=GramE>resourceSet.getResources(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span></span><img border=0 width=24 height=14 id="_x0000_i1051" >+src="../../articles/Getting_Started_with_UML2/images/tag_3.gif" align=CENTER><span >+style='color:black'><span style='mso-tab-count:1'> </span><span >+class=GramE><b>for</b></span> (<b>int</b> i = 0; i < resources.size(); i++) {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>Resource resource = (Resource) <span >+class=GramE>resources.get(</span>i);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>URI uri = <span class=GramE>resource.getURI(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span><span class=GramE><b>if</b></span> (UML22UMLResource.<i>FILE_EXTENSION</i>.equals(uri.fileExtension())) {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+4'> </span><span class=GramE>uri</span> = uri.trimFileExtension().appendFileExtension(<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+5'> </span>UMLResource.<i>FILE_EXTENSION</i>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+4'> </span>// <span class=GramE>resolveAll(</span>) will cause any referenced models to be loaded<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+4'> </span>// and migrated.<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+4'> </span><span class=GramE>EcoreUtil.<i>resolveAll</i>(</span>resource);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>}<o:p></o:p></span></pre><pre style='margin-left: >+9.0pt'><span style='color:black'><span style='mso-tab-count:3'> </span><span >+class=GramE>resourceToURIMap.put(</span>resource, uri);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span>}<o:p></o:p></span></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><span style='mso-tab-count:2'> </span>// Save all the resources with updated extension.<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+2'> </span><span class=GramE><b>for</b></span> (Iterator entries = resourceToURIMap.entrySet().iterator(); entries<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>.<span class=GramE>hasNext(</span>);) {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>Map.Entry entry = (Map.Entry) <span class=GramE>entries.next(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>Resource saveResource = (Resource) <span >+class=GramE>entry.getKey(</span>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span><span class=GramE>saveResource.setURI(</span>(URI) entry.getValue());<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span><span class=GramE><b>try</b></span> {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span></span><img border=0 width=24 height=14 id="_x0000_i1052" >+src="../../articles/Getting_Started_with_UML2/images/tag_4.gif" align=CENTER><span >+style='color:black'><span style='mso-tab-count:3'> </span><span >+class=GramE>saveResource.save(</span><b>null</b>);<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+4'> </span><span class=GramE>System.<i>out</i>.println(</span>"Saving migrated resource: "<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+5'> </span>+ <span class=GramE>saveResource.getURI(</span>).toString());<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>} <b>catch</b> (IOException ioe) {<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+4'> </span><span class=GramE>System.<i>out</i>.println(</span>ioe.getMessage());<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+3'> </span>}<o:p></o:p></span></pre><pre style='margin-left: >+9.0pt'><span style='color:black'><span style='mso-tab-count:2'> </span>}<o:p></o:p></span></pre><pre >+style='margin-left:9.0pt'><span style='color:black'><span style='mso-tab-count: >+1'> </span>}<o:p></o:p></span></pre><pre style='margin-left:9.0pt'><span >+style='color:black'><o:p> </o:p></span></pre> >+ >+<p class=MsoNormal>First, we register all required pathmaps, packages and >+extensions <img border=0 width=24 height=14 id="_x0000_i1047" >+src="../../articles/Getting_Started_with_UML2/images/tag_1.gif" align=CENTER><span >+style='mso-spacerun:yes'> </span>required <span class=GramE>for a stand-alone >+applications</span>.<span style='mso-spacerun:yes'> </span>Next, we simply call >+upon the resource set <img border=0 width=24 height=14 id="_x0000_i1049" >+src="../../articles/Getting_Started_with_UML2/images/tag_2.gif" align=CENTER><span >+style='mso-spacerun:yes'> </span>to open the file.<span >+style='mso-spacerun:yes'> </span>The previously registered mappings will be >+used when opening the resource.<span style='mso-spacerun:yes'> </span><span >+style='mso-spacerun:yes'> </span>After the call to <span class=GramE>getResource(</span>) >+the code is migrated in memory.<span style='mso-spacerun:yes'> </span>The only >+thing left to do before saving back out to disk is to <img border=0 width=24 >+height=14 id="_x0000_i1050" >+src="../../articles/Getting_Started_with_UML2/images/tag_3.gif" align=CENTER><span >+style='mso-spacerun:yes'> </span>change the extension from .uml2 to .uml. <span >+style='mso-spacerun:yes'> </span>And finally <img border=0 width=24 height=14 >+id="_x0000_i1053" >+src="../../articles/Getting_Started_with_UML2/images/tag_4.gif" align=CENTER><span >+style='mso-spacerun:yes'> </span>save to disk.</p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ >+<p class=MsoNormal><o:p> </o:p></p> >+ > <h2>API Migration</h2> > > <p class=MsoNormal> </p> >@@ -9695,8 +9929,8 @@ > <tr style='mso-yfti-irow:3'> > <td width=367 valign=top style='width:275.4pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:9.0pt'>Different handling of derived >- properties and sub-collections</span></p> >+ <p class=MsoNormal><span style='font-size:9.0pt'>Different handling of >+ derived properties and sub-collections</span></p> > </td> > <td width=300 valign=top style='width:225.0pt;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; >@@ -9744,7 +9978,8 @@ > <td width=300 valign=top style='width:225.0pt;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; > padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:9.0pt'>Significant performance improvement</span></p> >+ <p class=MsoNormal><span style='font-size:9.0pt'>Significant performance >+ improvement</span></p> > <p class=MsoNormal><span style='font-size:9.0pt'> </span></p> > </td> > </tr> >@@ -9776,8 +10011,8 @@ > <tr style='mso-yfti-irow:9'> > <td width=367 valign=top style='width:275.4pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:9.0pt'>Opaque Expression now >- supports multiple languages and bodies</span></p> >+ <p class=MsoNormal><span style='font-size:9.0pt'>Opaque Expression now supports >+ multiple languages and bodies</span></p> > <p class=MsoNormal><span style='font-size:9.0pt'> </span></p> > </td> > <td width=300 valign=top style='width:225.0pt;border-top:none;border-left: >@@ -9816,9 +10051,8 @@ > <tr style='mso-yfti-irow:12'> > <td width=367 valign=top style='width:275.4pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:9.0pt'>Number of <span >- class=SpellE>metaclasses</span> and properties have been renamed >- or removed</span></p> >+ <p class=MsoNormal><span style='font-size:9.0pt'>Number of metaclasses >+ and properties have been renamed or removed</span></p> > <p class=MsoNormal><span style='font-size:9.0pt'> </span></p> > </td> > <td width=300 valign=top style='width:225.0pt;border-top:none;border-left: >@@ -9830,8 +10064,8 @@ > <tr style='mso-yfti-irow:13'> > <td width=367 valign=top style='width:275.4pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span style='font-size:9.0pt'>New <span class=SpellE>metaclasses</span> >- (18), properties (25) and operations (4).</span></p> >+ <p class=MsoNormal><span style='font-size:9.0pt'>New metaclasses (18), >+ properties (25) and operations (4).</span></p> > </td> > <td width=300 valign=top style='width:225.0pt;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; >@@ -9869,7 +10103,7 @@ > <td width=367 valign=top style='width:275.4pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> > <p class=MsoNormal><span style='font-size:9.0pt'>Stereotype attributes can >- now reference <span class=SpellE>metaclasses</span></span></p> >+ now reference metaclasses</span></p> > <p class=MsoNormal><span style='font-size:9.0pt'> </span></p> > </td> > <td width=300 valign=top style='width:225.0pt;border-top:none;border-left: >@@ -9881,8 +10115,8 @@ > <tr style='mso-yfti-irow:16'> > <td width=367 valign=top style='width:275.4pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:9.0pt'>UMLUtil</span></span><span >- style='font-size:9.0pt'> class has utility methods to perform Package Merge</span></p> >+ <p class=MsoNormal><span style='font-size:9.0pt'>UMLUtil class has utility >+ methods to perform Package Merge</span></p> > <p class=MsoNormal><span style='font-size:9.0pt'> </span></p> > </td> > <td width=300 valign=top style='width:225.0pt;border-top:none;border-left: >@@ -9907,9 +10141,8 @@ > <tr style='mso-yfti-irow:18;mso-yfti-lastrow:yes'> > <td width=367 valign=top style='width:275.4pt;border:solid black 1.0pt; > border-top:none;padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal><span class=SpellE><span style='font-size:9.0pt'>UMLUtil</span></span><span >- style='font-size:9.0pt'> class has improved utility methods for export/import >- to Ecore format</span></p> >+ <p class=MsoNormal><span style='font-size:9.0pt'>UMLUtil class has improved >+ utility methods for export/import to Ecore format</span></p> > </td> > <td width=300 valign=top style='width:225.0pt;border-top:none;border-left: > none;border-bottom:solid black 1.0pt;border-right:solid black 1.0pt; >@@ -9935,28 +10168,23 @@ > > <p class=MsoBodyText>Convenience methods regarding manipulation of profiles:</p> > >-<p class=MsoListBullet2 style='margin-left:91.5pt;mso-list:l13 level1 lfo187; >+<p class=MsoListBullet2 style='margin-left:91.5pt;mso-list:l10 level1 lfo187; > tab-stops:list 91.5pt'><![if !supportLists]><span style='font-family:Arial; > mso-fareast-font-family:Arial'><span style='mso-list:Ignore'>●<span > style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>To > ensure the latest version of the profile is applied, there are newly introduced >-convenience methods. Simply call <span class=SpellE><span >-style='font-family:"Courier New"'>ProfileApplication#<span class=GramE>getAppliedDefinition</span></span></span><span >-class=GramE><span style='font-family:"Courier New"'>(</span></span><span >-style='font-family:"Courier New"'>)</span> and compare the result to <span >-class=SpellE><span style='font-family:"Courier New"'>Profile#getDefinition</span></span><span >-style='font-family:"Courier New"'>()</span>. <span class=SpellE><span >-style='font-family:"Courier New"'>Profile#<span class=GramE>getDefinition</span></span></span><span >-class=GramE><span style='font-family:"Courier New"'>(</span></span><span >-style='font-family:"Courier New"'>)</span> will always return the latest >-version.</p> >+convenience methods. Simply call <span style='font-family:"Courier New"'>ProfileApplication#<span >+class=GramE>getAppliedDefinition(</span>)</span> and compare the result to <span >+style='font-family:"Courier New"'>Profile#getDefinition()</span>. <span >+style='font-family:"Courier New"'>Profile#<span class=GramE>getDefinition(</span>)</span> >+will always return the latest version.</p> > > <p class=MsoBodyText> </p> > > <p class=MsoBodyText><a name="_Semantic_changes"></a><a > name="_7637_Additional_events"></a>The tables below provide the basis of API >-migration work. They summarize the changes to the <span class=SpellE>metamodel</span> >-and give you an understanding of the kind of modifications required: </p> >+migration work. They summarize the changes to the metamodel and give you >+an understanding of the kind of modifications required: </p> > > <p class=MsoNormal><span style='font-size:10.0pt;font-family:Helv;color:black'> </span></p> > >@@ -9979,8 +10207,8 @@ > <tr style='mso-yfti-irow:1;height:17.1pt'> > <td width=162 valign=top style='width:121.65pt;border:none;border-left:solid black 1.0pt; > padding:0in 5.4pt 0in 5.4pt;height:17.1pt'> >- <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >- class=SpellE><b><u><span style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b></span><b><span >+ <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><b><u><span >+ style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b><b><span > style='font-size:10.0pt;font-family:Helv'>:</span></b></p> > <p class=MsoNormal> > <b><i><span style='font-size:10.0pt;font-family:Helvetica'>Added</span></i></b></p> >@@ -9990,45 +10218,38 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ActionExecutionSpecification</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ActionExecutionSpecification >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ActionInputPin</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ActionInputPin >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>BehaviorExecutionSpecification</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>BehaviorExecutionSpecification >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ConsiderIgnoreFragment</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ConsiderIgnoreFragment >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>CreationEvent</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>CreationEvent >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>DestructionEvent</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>DestructionEvent >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>SendOperationEvent</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>SendOperationEvent >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >@@ -10036,26 +10257,22 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ExecutionEvent</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ExecutionEvent >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ExecutionOccurrenceSpecification</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ExecutionOccurrenceSpecification >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ExecutionSpecification</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ExecutionSpecification >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>FunctionBehavior</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>FunctionBehavior</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >@@ -10063,87 +10280,70 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>MessageOccurrenceSpecification</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>MessageOccurrenceSpecification >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>OpaqueAction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>OpaqueAction</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>OpaqueBehavior</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>OpaqueBehavior</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>SequenceNode</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>SequenceNode</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>UnmarshallAction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>UnmarshallAction</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ValueSpecificationAction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ValueSpecificationAction</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>MessageEvent</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>MessageEvent >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>SendSignalEvent</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>SendSignalEvent >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>CallEvent</span></span><span style='font-size:9.0pt;font-family: >- Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>CallEvent </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ChangeEvent</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ChangeEvent</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>SignalEvent</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>SignalEvent</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>AnyReceiveEvent</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>AnyReceiveEvent</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>LinkEndDestructionData</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>LinkEndDestructionData</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>StartClassifierBehaviorAction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>StartClassifierBehaviorAction</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ComponentRealization</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ComponentRealization</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>TimeEvent</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>TimeEvent</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -10151,8 +10351,8 @@ > <tr style='mso-yfti-irow:2'> > <td width=162 valign=top style='width:121.65pt;border:none;border-left:solid black 1.0pt; > padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >- class=SpellE><b><u><span style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b></span><b><span >+ <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><b><u><span >+ style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b><b><span > style='font-size:10.0pt;font-family:Helv'>: </span></b></p> > <p class=MsoNormal> > <b><i><span style='font-size:10.0pt;font-family:Helvetica'>Removed</span></i></b></p> >@@ -10162,8 +10362,7 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ApplyFunctionAction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ApplyFunctionAction</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >@@ -10171,8 +10370,7 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>PrimitiveFunction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>PrimitiveFunction</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >@@ -10180,58 +10378,47 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>MessageTrigger</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>MessageTrigger >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>CallTrigger</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>CallTrigger >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ChageTrigger</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ChageTrigger >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>SignalTrigger</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>SignalTrigger >+ </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>AnyTrigger</span></span><span style='font-size:9.0pt;font-family: >- Helv;color:black'> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>AnyTrigger </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>TimeTrigger</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>TimeTrigger</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ParameterableClassifier</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ParameterableClassifier</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>TemplateableClassifier</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>TemplateableClassifier</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>RemoveVariableValueAction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>RemoveVariableValueAction</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>StartOwnedBehaviorAction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>StartOwnedBehaviorAction</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -10239,8 +10426,8 @@ > <tr style='mso-yfti-irow:3'> > <td width=162 valign=top style='width:121.65pt;border:none;border-left:solid black 1.0pt; > padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >- class=SpellE><b><u><span style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b></span><b><span >+ <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><b><u><span >+ style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b><b><span > style='font-size:10.0pt;font-family:Helv'>: </span></b></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><b><span > style='font-size:10.0pt;font-family:Helv'> >@@ -10251,49 +10438,41 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>CollaborationOccurrence</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> -> <span >- class=SpellE>CollaborationUse</span> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>CollaborationOccurrence >+ -> CollaborationUse </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>EventOccurrence</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> -> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>EventOccurrence >+ -> > >- <span class=SpellE>ExecutionOccurrenceSpecification</span> </span></p> >+ ExecutionOccurrenceSpecification </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ExecutionOccurrence</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> -> >- <span >- class=SpellE>ExecutionSpecification</span> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ExecutionOccurrence >+ -> >+ ExecutionSpecification </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> > </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Implementation > -> > >- <span class=SpellE>InterfaceRealization</span> </span></p> >+ InterfaceRealization </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>InteractionOccurrence</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> >- -> <span >- class=SpellE>InteractionUse</span> </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>InteractionOccurrence >+ -> >+ InteractionUse </span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>StartOwnedBehaviorAction</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> -> <span class=SpellE>StartClassifierBehaviorAction</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>StartOwnedBehaviorAction >+ -> StartClassifierBehaviorAction</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >@@ -10303,8 +10482,8 @@ > <tr style='mso-yfti-irow:4'> > <td width=162 valign=top style='width:121.65pt;border:none;border-left:solid black 1.0pt; > padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >- class=SpellE><b><u><span style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b></span><b><span >+ <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><b><u><span >+ style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b><b><span > style='font-size:10.0pt;font-family:Helv'>: </span></b></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><b><span > style='font-size:10.0pt;font-family:Helv'> >@@ -10319,8 +10498,7 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ExecutionOccurrence</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ExecutionOccurrence</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >@@ -10331,8 +10509,8 @@ > <td width=162 valign=top style='width:121.65pt;border-top:none;border-left: > solid black 1.0pt;border-bottom:solid black 1.5pt;border-right:none; > padding:0in 5.4pt 0in 5.4pt'> >- <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >- class=SpellE><b><u><span style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b></span><b><span >+ <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><b><u><span >+ style='font-size:10.0pt;font-family:Helv'>Metaclasses</span></u></b><b><span > style='font-size:10.0pt;font-family:Helv'>: </span></b></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><b><span > style='font-size:10.0pt;font-family:Helv'> >@@ -10390,181 +10568,137 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>AcceptEventAction::isUnmarshall</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> : Boolean = false</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>AcceptEventAction::isUnmarshall >+ : Boolean = false</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Activity::<span class=GramE>variable</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> Variable [0..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Activity::<span >+ class=GramE>variable :</span> Variable [0..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Association::<span class=GramE>navigableOwnedEnd</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> Property [0..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Association::<span >+ class=GramE>navigableOwnedEnd :</span> Property [0..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>BehavioralFeature::<span class=GramE>ownedParameterSet</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> <span class=SpellE>ParameterSet</span> >- [0..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>BehavioralFeature::<span >+ class=GramE>ownedParameterSet :</span> ParameterSet [0..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>DestroyLinkAction::<span class=GramE>endData</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> <span class=SpellE>LinkEndDesctructionData</span> >- [2..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>DestroyLinkAction::<span >+ class=GramE>endData :</span> LinkEndDesctructionData [2..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>EventOccurrence::event</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> : Event [1..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>EventOccurrence::event >+ : Event [1..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ExecutionOccurrence::action</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> : Action [0..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ExecutionOccurrence::action >+ : Action [0..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>InformationFlow::<span class=GramE>realizingActivityEdge</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> <span class=SpellE>ActivityEdge</span> >- [0..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>InformationFlow::<span >+ class=GramE>realizingActivityEdge :</span> ActivityEdge [0..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>InformationFlow::<span class=GramE>realizingConnector</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> Connector [0..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>InformationFlow::<span >+ class=GramE>realizingConnector :</span> Connector [0..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>InformationFlow::<span class=GramE>realizingMessage</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> Message [0..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>InformationFlow::<span >+ class=GramE>realizingMessage :</span> Message [0..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>InformationFlow::source</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'>: <span class=SpellE>NamedElement</span> >- [1<span class=GramE>..*</span>]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>InformationFlow::source: >+ NamedElement [1<span class=GramE>..*</span>]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>InformationFlow::target</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'>: <span class=SpellE>NamedElement</span> >- [1<span class=GramE>..*</span>]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>InformationFlow::target: >+ NamedElement [1<span class=GramE>..*</span>]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>MessageEnd::message</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> : Message [1..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>MessageEnd::message >+ : Message [1..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ObjectNode::isControlType</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> : Boolean = false</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ObjectNode::isControlType >+ : Boolean = false</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Operation::interface</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> : Interface [0..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Operation::interface >+ : Interface [0..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Pin::isControl</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> : Boolean</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Pin::isControl >+ : Boolean</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>RemoveStructuralFeatureValueAction::isRemoveDuplicates</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> : Boolean</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>RemoveStructuralFeatureValueAction::isRemoveDuplicates >+ : Boolean</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>RemoveStructuralFeatureValueAction::removeAt</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> : <span class=SpellE>InputPin</span> >- [0..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>RemoveStructuralFeatureValueAction::removeAt >+ : InputPin [0..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>RemoveVariableValueAction::isRemoveDuplicates</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> : Boolean</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>RemoveVariableValueAction::isRemoveDuplicates >+ : Boolean</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>RemoveVariableValueAction::removeAt</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> : <span class=SpellE>InputPin</span> >- [0..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>RemoveVariableValueAction::removeAt >+ : InputPin [0..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>State::<span class=GramE>connectionPoint</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> <span class=SpellE>Pseudostate</span> >- [0..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>State::<span >+ class=GramE>connectionPoint :</span> Pseudostate [0..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Stereotype::<span class=GramE>icon</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> Image [0..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Stereotype::<span >+ class=GramE>icon :</span> Image [0..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Trigger::event</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> : Event [1..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Trigger::event >+ : Event [1..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Variable::activityScope</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> : Activity [0..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Variable::activityScope >+ : Activity [0..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ExtensionPoint::useCase</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> : <span class=SpellE>UseCase</span>[1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ExtensionPoint::useCase >+ : UseCase[1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>RemoveVariableValueAction::isRemoveDuplicates:Boolean</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>RemoveVariableValueAction::isRemoveDuplicates:Boolean</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>RemoveVariableValueAction::removeAt</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'>: <span class=SpellE>InputPin</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>RemoveVariableValueAction::removeAt: >+ InputPin</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -10584,74 +10718,60 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Behavior::formalParameter</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Behavior::formalParameter</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Behavior::parameter</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Behavior::parameter</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Behavior::returnResult</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Behavior::returnResult</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>BehavioralFeature::parameter</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>BehavioralFeature::parameter</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>BehavioralFeature::returnResult</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>BehavioralFeature::returnResult</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>BehavioredClassifier::ownedStateMachine</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>BehavioredClassifier::ownedStateMachine</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>EventOccurrence::finishExec</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>EventOccurrence::finishExec</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>EventOccurrence::startExec</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>EventOccurrence::startExec</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>MessageEnd::sendMessage</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>MessageEnd::sendMessage</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>MessageEnd::receiveMessage</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>MessageEnd::receiveMessage</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Package::packageExtension</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Package::packageExtension</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>StructuralFeature::isReadOnly</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>StructuralFeature::isReadOnly</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol'>·</span><span > style='font-size:7.0pt'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>NamedElement::namespace</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>NamedElement::namespace</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol'>·</span><span > style='font-size:7.0pt'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Comment::bodyExpression</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> *</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Comment::bodyExpression >+ *</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -10671,30 +10791,23 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>BehavioralFeature::formalParameter</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> -> <span >- class=SpellE>ownedParameter</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>BehavioralFeature::formalParameter >+ -> ownedParameter</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>BehavioredClassifier::implementation</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> -> <span >- class=SpellE>interfaceRealization</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>BehavioredClassifier::implementation >+ -> interfaceRealization</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Classifier::occurrence</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> -> <span class=SpellE>collaborationUse</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Classifier::occurrence >+ -> collaborationUse</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol'>·</span><span > style='font-size:7.0pt'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>PackageMerge::mergingPackage</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> -> <span >- class=SpellE>receivingPackage</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>PackageMerge::mergingPackage >+ -> receivingPackage</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -10716,10 +10829,8 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ReplyAction::replyToCall</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> : <span class=SpellE>CallTrigger</span> >- -> Trigger</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ReplyAction::replyToCall >+ : CallTrigger -> Trigger</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:10.0pt;font-family:Symbol'>·</span><span > style='font-size:7.0pt'> </span><span >@@ -10767,7 +10878,7 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:10.0pt;font-family:Symbol'>·</span><span > style='font-size:7.0pt'> </span><span >- class=SpellE><span style='font-size:9.0pt;font-family:Helv;color:black'>Behavior::context</span></span></p> >+ style='font-size:9.0pt;font-family:Helv;color:black'>Behavior::context</span></p> > </td> > </tr> > <tr style='mso-yfti-irow:2;height:17.1pt'> >@@ -10785,13 +10896,11 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ConnectionPointReference::state</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ConnectionPointReference::state</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Pseudostate::stateMachine</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Pseudostate::stateMachine</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -10811,73 +10920,59 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ApplyFunctionAction::argument</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ApplyFunctionAction::argument</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Association::endType</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Association::endType</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>CombinedFragment::operand</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>CombinedFragment::operand</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ConnectableElement::end</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ConnectableElement::end</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>InteractionOccurrence::argument</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>InteractionOccurrence::argument</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Message::argument</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Message::argument</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>StructuredClassifier::ownedAttribute</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>StructuredClassifier::ownedAttribute</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>TemplateSignature::parameter</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>TemplateSignature::parameter</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>DataType::ownedAttribute</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>DataType::ownedAttribute</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>DataType::ownedOperation</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>DataType::ownedOperation</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>OpaqueAction::body</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>OpaqueAction::body</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>OpaqueAction::language</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>OpaqueAction::language</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>LoopNode::result</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>LoopNode::result</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>LoopNode::loopVariable</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>LoopNode::loopVariable</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >@@ -10949,88 +11044,62 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>AcceptCallAction::trigger</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> : <span class=SpellE>CallTrigger</span> >- [0..*] -> 1..1</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>AcceptCallAction::trigger >+ : CallTrigger [0..*] -> 1..1</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>AcceptEventAction::<span class=GramE>trigger</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> Trigger [0..*] -> >- 1..*</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>AcceptEventAction::<span >+ class=GramE>trigger :</span> Trigger [0..*] -> 1..*</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ConnectorEnd::role</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> : <span class=SpellE>ConnectableElement</span> >- [0..1] -> 1..1</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ConnectorEnd::role >+ : ConnectableElement [0..1] -> 1..1</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Lifeline::represents</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> : <span class=SpellE>ConnectableElement</span> >- [1..1] -> 0..1</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Lifeline::represents >+ : ConnectableElement [1..1] -> 0..1</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Variable::scope</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> : <span class=SpellE>StructuredActivityNode</span> >- [1..1] -> 0..1</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Variable::scope >+ : StructuredActivityNode [1..1] -> 0..1</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ConnectionPointReference::<span class=GramE>entry</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> <span class=SpellE>Elist</span>[1..*]-> >- *</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ConnectionPointReference::<span >+ class=GramE>entry :</span> Elist[1..*]-> *</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ConnectionPointReference::<span class=GramE>exit</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> <span class=SpellE>Elist</span>[1..*]->*</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ConnectionPointReference::<span >+ class=GramE>exit :</span> Elist[1..*]->*</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>InstanceSpecification::specification</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> : <span class=SpellE>ValueSpecification</span>::[0..1] >- ->1</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>InstanceSpecification::specification >+ : ValueSpecification::[0..1] ->1</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>BehaviorExecutionSpecification::behavior</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> : Behavior [1] -> >- 0..1</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>BehaviorExecutionSpecification::behavior >+ : Behavior [1] -> 0..1</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Message::message</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'>[1]->[0..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Message::message[1]->[0..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ConnectionPointReference::<span class=GramE>entry</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> <span class=SpellE>Pseudostate</span>[1..*]->[*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ConnectionPointReference::<span >+ class=GramE>entry :</span> Pseudostate[1..*]->[*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ConnectionPointReference::<span class=GramE>exit</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> <span class=SpellE>Pseudostate</span>[1..*]->[*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ConnectionPointReference::<span >+ class=GramE>exit :</span> Pseudostate[1..*]->[*]</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span >@@ -11038,76 +11107,57 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>DurationObservationAction::duration</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'>[*] ->[1] </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>DurationObservationAction::duration[*] >+ ->[1] </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ExecutionOccurrence::behavior</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> : Behavior[0..*] </span><span >- class=SpellE><span style='font-size:9.0pt;font-family:"Courier New"; >- color:black'>à</span></span><span style='font-size:9.0pt;font-family:Helv; >- color:black'> <span class=SpellE>BehaviorExecutionSpecification::behavior</span>[0..1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ExecutionOccurrence::behavior >+ : Behavior[0..*] </span><span style='font-size:9.0pt;font-family:"Courier New"; >+ color:black'>à</span><span style='font-size:9.0pt;font-family:Helv; >+ color:black'> BehaviorExecutionSpecification::behavior[0..1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Interval::min</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'>: <span class=SpellE>ValueSpecification</span>[0..*] >- -> [1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Interval::min: >+ ValueSpecification[0..*] -> [1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Interval::max</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'>: <span class=SpellE>ValueSpecification</span>[0..*]->[1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Interval::max: >+ ValueSpecification[0..*]->[1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>TimeObservationAction::now</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'>[*] ->[1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>TimeObservationAction::now[*] >+ ->[1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>EventOccurrence::startExec</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'>[*] -> <span class=SpellE>ExecutionSpecification::start</span>: >- <span class=SpellE>ExecutionOccurrence</span>[1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>EventOccurrence::startExec[*] >+ -> ExecutionSpecification::start: ExecutionOccurrence[1]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>EventOccurrence::finishExec</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'>[*] -> <span class=SpellE>ExecutionSpecification::finish:ExecutionOccurrence</span>[1]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>EventOccurrence::finishExec[*] >+ -> ExecutionSpecification::finish:ExecutionOccurrence[1]</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:9.0pt;font-family:Helv;color:black'> </span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Activity::<span class=GramE>body</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> String[1] -> <span >- class=SpellE>OpaqueBehavior::body:String</span>[1..*]</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Activity::<span >+ class=GramE>body :</span> String[1] -> OpaqueBehavior::body:String[1..*]</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>OpaqueExpression::<span class=GramE>body</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> String [0..1] -> >- 1..*</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>OpaqueExpression::<span >+ class=GramE>body :</span> String [0..1] -> 1..*</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>OpaqueExpression::<span class=GramE>language</span></span></span><span >- class=GramE><span style='font-size:9.0pt;font-family:Helv;color:black'> :</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'> String [0..1] -> >- 0..*</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>OpaqueExpression::<span >+ class=GramE>language :</span> String [0..1] -> 0..*</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -11162,9 +11212,8 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>CallAction.isSynchronous</span></span><span style='font-size: >- 9.0pt;font-family:Helv;color:black'> = true </span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>CallAction.isSynchronous >+ = true </span></p> > </td> > </tr> > </table> >@@ -11218,27 +11267,23 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Property::isNavigable</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'>() : Boolean</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Property::isNavigable() >+ : Boolean</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Region::containingStateMachine</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'>() : <span class=SpellE>StateMachine</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Region::containingStateMachine() >+ : StateMachine</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Transition::containingStateMachine</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'>() : <span class=SpellE>StateMachine</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Transition::containingStateMachine() >+ : StateMachine</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>Vertex::containingStateMachine</span></span><span >- style='font-size:9.0pt;font-family:Helv;color:black'>() : <span class=SpellE>StateMachine</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>Vertex::containingStateMachine() >+ : StateMachine</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -11280,8 +11325,8 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in'><span > style='font-size:9.0pt;font-family:Symbol'>·</span><span style='font-size: > 7.0pt'> </span><span >- class=SpellE><span style='font-size:9.0pt;font-family:Helvetica'>InteractionOperator</span></span><span >- style='font-size:9.0pt'> -> <span class=SpellE>InteractionOperatorKind</span></span></p> >+ style='font-size:9.0pt;font-family:Helvetica'>InteractionOperator</span><span >+ style='font-size:9.0pt'> -> InteractionOperatorKind</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -11303,8 +11348,7 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>MessageSort::synchSignal</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>MessageSort::synchSignal</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -11348,33 +11392,28 @@ > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ChangeTrigger</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> :: Event</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ChangeTrigger >+ :: Event</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>MessageTrigger</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> :: Event</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>MessageTrigger >+ :: Event</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>TimeTrigger</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> :: Event</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>TimeTrigger >+ :: Event</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>StringExpression</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> :: Expression</span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>StringExpression >+ :: Expression</span></p> > <p class=MsoNormal style='margin-left:.25in;text-indent:-.25in;line-height: > 12.0pt;text-autospace:none'><span style='font-size:9.0pt;font-family:Symbol; > color:black'>·</span><span style='font-size:7.0pt;color:black'> >- </span><span class=SpellE><span style='font-size:9.0pt;font-family:Helv; >- color:black'>ValueSpecification</span></span><span style='font-size:9.0pt; >- font-family:Helv;color:black'> :: <span class=SpellE>PackageableElement</span></span></p> >+ </span><span style='font-size:9.0pt;font-family:Helv;color:black'>ValueSpecification >+ :: PackageableElement</span></p> > <p class=MsoNormal style='line-height:12.0pt;text-autospace:none'><span > style='font-size:10.0pt;font-family:Helv'> </span></p> > </td> >@@ -11387,43 +11426,31 @@ > > <p class=MsoNormal> </p> > >-<p class=MsoNormal><b>Q.</b> What does <span class=SpellE><span >-style='font-family:"Courier New"'>MultiplicityElement.UNLIMITED_UPPER_BOUND</span></span> >+<p class=MsoNormal><b>Q.</b> What does <span style='font-family:"Courier New"'>MultiplicityElement.UNLIMITED_UPPER_BOUND</span> > map to?</p> > >-<p class=MsoNormal><b>A.</b> <span class=SpellE><span style='font-family: >-"Courier New"'>LiteralUnlimitedNatureal.UNBOUNDED</span></span>.</p> >+<p class=MsoNormal><b>A.</b> <span style='font-family:"Courier New"'>LiteralUnlimitedNatureal.UNBOUNDED</span>.</p> > > <p class=MsoNormal> </p> > >-<p class=MsoNormal><b>Q.</b> What does <span class=SpellE>Activity::body</span> >-map to?</p> >+<p class=MsoNormal><b>Q.</b> What does Activity::body map to?</p> > >-<p class=MsoNormal><b>A</b>. Create an <span class=SpellE>OpaqueBehavior::body</span>. >-Both <span class=SpellE>OpaqueBehavior</span> and Activity now are >-specializations of Behavior.</p> >+<p class=MsoNormal><b>A</b>. Create an OpaqueBehavior::body. Both >+OpaqueBehavior and Activity now are specializations of Behavior.</p> > > <p class=MsoNormal> </p> > >-<p class=MsoNormal><b>Q.</b> What is the difference between <span class=SpellE><span >-class=GramE><span style='font-family:"Courier New"'>getUpperBound</span></span></span><span >-class=GramE><span style='font-family:"Courier New"'>(</span></span><span >-style='font-family:"Courier New"'>)</span> and <span class=SpellE><span >-style='font-family:"Courier New"'>getUpper</span></span><span style='font-family: >-"Courier New"'>()</span> and <span class=SpellE><span style='font-family:"Courier New"'>getUpperValue</span></span><span >-style='font-family:"Courier New"'>()</span> on a pin?</p> >- >-<p class=MsoNormal><b>A</b>. <span class=SpellE><span class=GramE><span >-style='font-family:"Courier New"'>getUpperBound</span></span></span><span >-class=GramE><span style='font-family:"Courier New"'>(</span></span><span >+<p class=MsoNormal><b>Q.</b> What is the difference between <span class=GramE><span >+style='font-family:"Courier New"'>getUpperBound(</span></span><span >+style='font-family:"Courier New"'>)</span> and <span style='font-family:"Courier New"'>getUpper()</span> >+and <span style='font-family:"Courier New"'>getUpperValue()</span> on a pin?</p> >+ >+<p class=MsoNormal><b>A</b>. <span class=GramE><span style='font-family:"Courier New"'>getUpperBound(</span></span><span > style='font-family:"Courier New"'>)</span> on a pin is a convenience method >-that deals with tokens. The <span class=SpellE><span class=GramE><span >-style='font-family:"Courier New"'>getUpper</span></span></span><span >-class=GramE><span style='font-family:"Courier New"'>(</span></span><span >-style='font-family:"Courier New"'>)</span> and <span class=SpellE><span >-style='font-family:"Courier New"'>getUpperValue</span></span><span >-style='font-family:"Courier New"'>()</span> is part of <span class=SpellE><span >-style='font-family:"Courier New"'>MultiplicityElement</span></span>.</p> >+that deals with tokens. The <span class=GramE><span style='font-family: >+"Courier New"'>getUpper(</span></span><span style='font-family:"Courier New"'>)</span> >+and <span style='font-family:"Courier New"'>getUpperValue()</span> is part of <span >+style='font-family:"Courier New"'>MultiplicityElement</span>.</p> > > <p class=MsoNormal> </p> > >Index: .project >=================================================================== >RCS file: .project >diff -N .project >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ .project 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,11 @@ >+<?xml version="1.0" encoding="UTF-8"?> >+<projectDescription> >+ <name>docs</name> >+ <comment></comment> >+ <projects> >+ </projects> >+ <buildSpec> >+ </buildSpec> >+ <natures> >+ </natures> >+</projectDescription>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 77413
:
42660
|
43099
|
43100
|
44308
|
44312
| 46371 |
55336
|
55337
|
57812
|
57911
|
60230
|
61171
|
72730
|
73587
|
74838
|
78642