diff options
| author | wpiers | 2009-11-03 16:15:46 +0000 |
|---|---|---|
| committer | wpiers | 2009-11-03 16:15:46 +0000 |
| commit | 906d4fd01bd9917b7d73939abe2919a0fb30ad7b (patch) | |
| tree | 763b5166c0e0c788b928f9a73ee0962f832f1dee /tests/org.eclipse.m2m.atl.tests/data/expected | |
| parent | 09761152cd4eba4d556182165ac01673b4b5a7c5 (diff) | |
| download | org.eclipse.atl-906d4fd01bd9917b7d73939abe2919a0fb30ad7b.tar.gz org.eclipse.atl-906d4fd01bd9917b7d73939abe2919a0fb30ad7b.tar.xz org.eclipse.atl-906d4fd01bd9917b7d73939abe2919a0fb30ad7b.zip | |
updated tests
Diffstat (limited to 'tests/org.eclipse.m2m.atl.tests/data/expected')
33 files changed, 5735 insertions, 2860 deletions
diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/291626/291626.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/291626/291626.atl.xmi new file mode 100644 index 00000000..dd3233de --- /dev/null +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/291626/291626.atl.xmi @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="Cp1252"?> +<atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="3:1-14:2" name="TestAllInstancesCache"> + <commentsBefore>-- @nsURI UML=http://www.eclipse.org/uml2/3.0.0/UML</commentsBefore> + <inModels location="4:23-4:31" name="IN"> + <metamodel href="new-model#/1"/> + </inModels> + <outModels location="4:8-4:17" name="OUT"> + <metamodel href="new-model#/0"/> + </outModels> + <elements xsi:type="atl:CalledRule" location="6:1-14:2" name="Main" isEntrypoint="true"> + <outPattern location="8:2-8:45"> + <elements xsi:type="atl:SimpleOutPatternElement" location="8:5-8:24" varName="p1" variableExp="//@elements.0/@actionBlock/@statements.0/@expression/@source"> + <type xsi:type="ocl:OclModelElement" location="8:10-8:21" name="Package"> + <model href="new-model#/2"/> + </type> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="8:26-8:45" varName="p2" variableExp="//@elements.0/@actionBlock/@statements.2/@expression/@source"> + <type xsi:type="ocl:OclModelElement" location="8:31-8:42" name="Package"> + <model href="new-model#/3"/> + </type> + </elements> + </outPattern> + <actionBlock location="9:1-13:2"> + <statements xsi:type="atl:ExpressionStat" location="10:2-10:90"> + <expression xsi:type="ocl:OperationCallExp" location="10:2-10:89" operationName="refSetValue"> + <source xsi:type="ocl:VariableExp" location="10:2-10:4" referredVariable="//@elements.0/@outPattern/@elements.0"/> + <arguments xsi:type="ocl:StringExp" location="10:17-10:23" stringSymbol="name"/> + <arguments xsi:type="ocl:OperatorCallExp" location="10:25-10:88" operationName="+"> + <source xsi:type="ocl:StringExp" location="10:25-10:34" stringSymbol="before_"/> + <arguments xsi:type="ocl:OperationCallExp" location="10:37-10:88" operationName="toString"> + <source xsi:type="ocl:OperationCallExp" location="10:37-10:77" operationName="size"> + <source xsi:type="ocl:OperationCallExp" location="10:37-10:70" operationName="allInstancesFrom"> + <source xsi:type="ocl:OclModelElement" location="10:37-10:46" name="Class"> + <model href="new-model#/4"/> + </source> + <arguments xsi:type="ocl:StringExp" location="10:64-10:69" stringSymbol="OUT"/> + </source> + </source> + </arguments> + </arguments> + </expression> + </statements> + <statements xsi:type="atl:ExpressionStat" location="11:2-11:26"> + <expression xsi:type="ocl:OperationCallExp" location="11:2-11:25" operationName="newInstance"> + <source xsi:type="ocl:OclModelElement" location="11:2-11:11" name="Class"> + <model href="new-model#/5"/> + </source> + </expression> + </statements> + <statements xsi:type="atl:ExpressionStat" location="12:2-12:89"> + <expression xsi:type="ocl:OperationCallExp" location="12:2-12:88" operationName="refSetValue"> + <source xsi:type="ocl:VariableExp" location="12:2-12:4" referredVariable="//@elements.0/@outPattern/@elements.1"/> + <arguments xsi:type="ocl:StringExp" location="12:17-12:23" stringSymbol="name"/> + <arguments xsi:type="ocl:OperatorCallExp" location="12:25-12:87" operationName="+"> + <source xsi:type="ocl:StringExp" location="12:25-12:33" stringSymbol="after_"/> + <arguments xsi:type="ocl:OperationCallExp" location="12:36-12:87" operationName="toString"> + <source xsi:type="ocl:OperationCallExp" location="12:36-12:76" operationName="size"> + <source xsi:type="ocl:OperationCallExp" location="12:36-12:69" operationName="allInstancesFrom"> + <source xsi:type="ocl:OclModelElement" location="12:36-12:45" name="Class"> + <model href="new-model#/6"/> + </source> + <arguments xsi:type="ocl:StringExp" location="12:63-12:68" stringSymbol="OUT"/> + </source> + </source> + </arguments> + </arguments> + </expression> + </statements> + </actionBlock> + </elements> +</atl:Module> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/ATL2Problem/ATL2Problem.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/ATL2Problem/ATL2Problem.atl.xmi index 534630a4..8dbb505c 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/ATL2Problem/ATL2Problem.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/ATL2Problem/ATL2Problem.atl.xmi @@ -1,12 +1,23 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-925:2" name="ATL2Problem"> <inModels location="2:27-2:35" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:21" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="12:1-16:4"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper provides a set containing the name of the IteratorExp elements</commentsBefore> + <commentsBefore>-- that accepts a single Iterator.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Set(String)</commentsBefore> + <commentsAfter>-- This helper provides a set containing the name of the IteratorExp elements</commentsAfter> + <commentsAfter>-- for which several Iterators may be declared according to the OCL spec.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Set(String)</commentsAfter> <definition location="12:8-16:3"> <feature xsi:type="ocl:Attribute" location="12:13-16:3" name="singleIteratorExps"> <initExpression xsi:type="ocl:SetExp" location="13:2-16:3"> @@ -26,6 +37,14 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="23:1-23:71"> + <commentsBefore>-- This helper provides a set containing the name of the IteratorExp elements</commentsBefore> + <commentsBefore>-- for which several Iterators may be declared according to the OCL spec.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Set(String)</commentsBefore> + <commentsAfter>-- This helper computes the set of existing CollectionType elements within the</commentsAfter> + <commentsAfter>-- input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Set(ATL!CollectionType)</commentsAfter> <definition location="23:8-23:70"> <feature xsi:type="ocl:Attribute" location="23:13-23:70" name="multiIteratorExps"> <initExpression xsi:type="ocl:SetExp" location="23:47-23:70"> @@ -39,34 +58,51 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="30:1-31:36"> + <commentsBefore>-- This helper computes the set of existing CollectionType elements within the</commentsBefore> + <commentsBefore>-- input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Set(ATL!CollectionType)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the OclModel elements that</commentsAfter> + <commentsAfter>-- are used in the input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!OclModel)</commentsAfter> <definition location="30:8-31:35"> <feature xsi:type="ocl:Attribute" location="30:13-31:35" name="collectionTypes"> <initExpression xsi:type="ocl:OperationCallExp" location="31:2-31:35" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="31:2-31:20" name="CollectionType"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </source> </initExpression> <type xsi:type="ocl:SetType" location="30:31-30:54"> <elementType xsi:type="ocl:OclModelElement" location="30:35-30:53" name="CollectionType"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="38:1-45:15"> + <commentsBefore>-- This helper computes a sequence containing all the OclModel elements that</commentsBefore> + <commentsBefore>-- are used in the input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!OclModel)</commentsBefore> + <commentsAfter>-- This helper computes the Query element that corresponds to the input ATL</commentsAfter> + <commentsAfter>-- Unit. If the input ATL Unit corresponds to a Module (eg a transformation),</commentsAfter> + <commentsAfter>-- the computed value is OclUndefined.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	ATL!Query</commentsAfter> <definition location="38:8-45:14"> <feature xsi:type="ocl:Attribute" location="38:13-45:14" name="allModels"> <initExpression xsi:type="ocl:LetExp" location="39:2-45:14"> <variable location="39:6-40:51" varName="atlModule" variableExp="//@elements.3/@definition/@feature/@initExpression/@in_/@source/@elements.0/@source //@elements.3/@definition/@feature/@initExpression/@in_/@source/@elements.1/@source"> <type xsi:type="ocl:OclModelElement" location="39:18-39:28" name="Module"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="40:3-40:51" operationName="first"> <source xsi:type="ocl:CollectionOperationCallExp" location="40:3-40:42" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="40:3-40:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="40:3-40:13" name="Module"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </source> </source> </source> @@ -85,175 +121,270 @@ </initExpression> <type xsi:type="ocl:SequenceType" location="38:25-38:47"> <elementType xsi:type="ocl:OclModelElement" location="38:34-38:46" name="OclModel"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="53:1-54:50"> + <commentsBefore>-- This helper computes the Query element that corresponds to the input ATL</commentsBefore> + <commentsBefore>-- Unit. If the input ATL Unit corresponds to a Module (eg a transformation),</commentsBefore> + <commentsBefore>-- the computed value is OclUndefined.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	ATL!Query</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the Binding elements that</commentsAfter> + <commentsAfter>-- are defined in the input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!Binding)</commentsAfter> <definition location="53:8-54:49"> <feature xsi:type="ocl:Attribute" location="53:13-54:49" name="queryElt"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="54:2-54:49" operationName="first"> <source xsi:type="ocl:CollectionOperationCallExp" location="54:2-54:40" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="54:2-54:26" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="54:2-54:11" name="Query"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </source> </source> </source> </initExpression> <type xsi:type="ocl:OclModelElement" location="53:24-53:33" name="Query"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="61:1-62:43"> + <commentsBefore>-- This helper computes a sequence containing all the Binding elements that</commentsBefore> + <commentsBefore>-- are defined in the input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!Binding)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the Pattern elements that</commentsAfter> + <commentsAfter>-- are defined in the input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!InPattern)</commentsAfter> <definition location="61:8-62:42"> <feature xsi:type="ocl:Attribute" location="61:13-62:42" name="allBindings"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="62:2-62:42" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="62:2-62:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="62:2-62:13" name="Binding"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </source> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="61:27-61:48"> <elementType xsi:type="ocl:OclModelElement" location="61:36-61:47" name="Binding"> - <model href="temp#/1"/> + <model href="new-model#/9"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="69:1-70:45"> + <commentsBefore>-- This helper computes a sequence containing all the Pattern elements that</commentsBefore> + <commentsBefore>-- are defined in the input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!InPattern)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the InPatternElement elements</commentsAfter> + <commentsAfter>-- that are defined in the input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!InPatternElement)</commentsAfter> <definition location="69:8-70:44"> <feature xsi:type="ocl:Attribute" location="69:13-70:44" name="allInPatterns"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="70:2-70:44" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="70:2-70:30" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="70:2-70:15" name="InPattern"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </source> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="69:29-69:52"> <elementType xsi:type="ocl:OclModelElement" location="69:38-69:51" name="InPattern"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="77:1-78:52"> + <commentsBefore>-- This helper computes a sequence containing all the InPatternElement elements</commentsBefore> + <commentsBefore>-- that are defined in the input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!InPatternElement)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the OutPatternElement</commentsAfter> + <commentsAfter>-- elements that are defined in the input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!OutPatternElement)</commentsAfter> <definition location="77:8-78:51"> <feature xsi:type="ocl:Attribute" location="77:13-78:51" name="allInPatternElts"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="78:2-78:51" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="78:2-78:37" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="78:2-78:22" name="InPatternElement"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </source> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="77:32-77:62"> <elementType xsi:type="ocl:OclModelElement" location="77:41-77:61" name="InPatternElement"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="85:1-86:53"> + <commentsBefore>-- This helper computes a sequence containing all the OutPatternElement</commentsBefore> + <commentsBefore>-- elements that are defined in the input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!OutPatternElement)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the Rule elements that are</commentsAfter> + <commentsAfter>-- defined in the input ATL Unit. If the input Unit is a query, the computed</commentsAfter> + <commentsAfter>-- sequence is empty.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!Rule)</commentsAfter> <definition location="85:8-86:52"> <feature xsi:type="ocl:Attribute" location="85:13-86:52" name="allOutPatternElts"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="86:2-86:52" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="86:2-86:38" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="86:2-86:23" name="OutPatternElement"> - <model href="temp#/1"/> + <model href="new-model#/16"/> </source> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="85:33-85:64"> <elementType xsi:type="ocl:OclModelElement" location="85:42-85:63" name="OutPatternElement"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="94:1-95:40"> + <commentsBefore>-- This helper computes a sequence containing all the Rule elements that are</commentsBefore> + <commentsBefore>-- defined in the input ATL Unit. If the input Unit is a query, the computed</commentsBefore> + <commentsBefore>-- sequence is empty.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!Rule)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the Helper elements that are</commentsAfter> + <commentsAfter>-- defined in the input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!Helper)</commentsAfter> <definition location="94:8-95:39"> <feature xsi:type="ocl:Attribute" location="94:13-95:39" name="allRules"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="95:2-95:39" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="95:2-95:25" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="95:2-95:10" name="Rule"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </source> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="94:24-94:42"> <elementType xsi:type="ocl:OclModelElement" location="94:33-94:41" name="Rule"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="102:1-103:42"> + <commentsBefore>-- This helper computes a sequence containing all the Helper elements that are</commentsBefore> + <commentsBefore>-- defined in the input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!Helper)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the LoopExp elements that are</commentsAfter> + <commentsAfter>-- defined in the input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!LoopExp)</commentsAfter> <definition location="102:8-103:41"> <feature xsi:type="ocl:Attribute" location="102:13-103:41" name="allHelpers"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="103:2-103:41" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="103:2-103:27" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="103:2-103:12" name="Helper"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </source> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="102:26-102:46"> <elementType xsi:type="ocl:OclModelElement" location="102:35-102:45" name="Helper"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="110:1-111:43"> + <commentsBefore>-- This helper computes a sequence containing all the LoopExp elements that are</commentsBefore> + <commentsBefore>-- defined in the input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!LoopExp)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the IterateExp elements that</commentsAfter> + <commentsAfter>-- are defined in the input ATL Unit.</commentsAfter> + <commentsAfter>-- CONTEXT:	thisModule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!IterateExp)</commentsAfter> <definition location="110:8-111:42"> <feature xsi:type="ocl:Attribute" location="110:13-111:42" name="allLoopExps"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="111:2-111:42" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="111:2-111:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="111:2-111:13" name="LoopExp"> - <model href="temp#/1"/> + <model href="new-model#/22"/> </source> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="110:27-110:48"> <elementType xsi:type="ocl:OclModelElement" location="110:36-110:47" name="LoopExp"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="118:1-119:46"> + <commentsBefore>-- This helper computes a sequence containing all the IterateExp elements that</commentsBefore> + <commentsBefore>-- are defined in the input ATL Unit.</commentsBefore> + <commentsBefore>-- CONTEXT:	thisModule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!IterateExp)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing all the VariableDeclaration</commentsAfter> + <commentsAfter>-- elements that are associated with the contextual Rule. These declarations</commentsAfter> + <commentsAfter>-- can be of 3 different kinds:</commentsAfter> + <commentsAfter>-- * the variables declared for the rule;</commentsAfter> + <commentsAfter>-- * the OutPatternElements of the rule;</commentsAfter> + <commentsAfter>-- * the InPatternElements of the rule if this last is a MatchedRule.</commentsAfter> + <commentsAfter>-- CONTEXT:	ATL!Rule</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!VariableDeclaration)</commentsAfter> <definition location="118:8-119:45"> <feature xsi:type="ocl:Attribute" location="118:13-119:45" name="allIterateExps"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="119:2-119:45" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="119:2-119:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="119:2-119:16" name="IterateExp"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </source> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="118:30-118:54"> <elementType xsi:type="ocl:OclModelElement" location="118:39-118:53" name="IterateExp"> - <model href="temp#/1"/> + <model href="new-model#/23"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="130:1-141:15"> + <commentsBefore>-- This helper computes a sequence containing all the VariableDeclaration</commentsBefore> + <commentsBefore>-- elements that are associated with the contextual Rule. These declarations</commentsBefore> + <commentsBefore>-- can be of 3 different kinds:</commentsBefore> + <commentsBefore>-- * the variables declared for the rule;</commentsBefore> + <commentsBefore>-- * the OutPatternElements of the rule;</commentsBefore> + <commentsBefore>-- * the InPatternElements of the rule if this last is a MatchedRule.</commentsBefore> + <commentsBefore>-- CONTEXT:	ATL!Rule</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!VariableDeclaration)</commentsBefore> + <commentsAfter>-- This helper computes the Rule element in which the contextual PatterElement</commentsAfter> + <commentsAfter>-- is declared. This is achieved by returning the Rule referred by the "rule"</commentsAfter> + <commentsAfter>-- reference of the Pattern that conatins the contexual PatternElement. This </commentsAfter> + <commentsAfter>-- last one is accessed through the "outPattern" reference if the contextual</commentsAfter> + <commentsAfter>-- PatternElement is an OutPatternElement, throught the "inPattern" if it is</commentsAfter> + <commentsAfter>-- an InPatternElement.</commentsAfter> + <commentsAfter>-- CONTEXT:	ATL!PatternElement</commentsAfter> + <commentsAfter>-- RETURN:	ATL!Rule</commentsAfter> <definition location="130:8-141:14"> <feature xsi:type="ocl:Attribute" location="131:7-141:14" name="namedElements"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="132:2-141:14" operationName="flatten"> @@ -263,17 +394,17 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="135:4-135:27" name="elements"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="135:4-135:18" name="inPattern"> <source xsi:type="ocl:VariableExp" location="135:4-135:8"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/29"/> </source> </source> </source> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="133:6-133:39" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="133:6-133:10"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/27"/> </source> <arguments xsi:type="ocl:OclModelElement" location="133:23-133:38" name="MatchedRule"> - <model href="temp#/1"/> + <model href="new-model#/28"/> </arguments> </condition> <elseExpression xsi:type="ocl:SequenceExp" location="137:4-137:14"/> @@ -281,7 +412,7 @@ <elements xsi:type="ocl:CollectionOperationCallExp" location="139:3-139:31" operationName="asSequence"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="139:3-139:17" name="variables"> <source xsi:type="ocl:VariableExp" location="139:3-139:7"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/30"/> </source> </source> </elements> @@ -289,7 +420,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="140:3-140:27" name="elements"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="140:3-140:18" name="outPattern"> <source xsi:type="ocl:VariableExp" location="140:3-140:7"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/31"/> </source> </source> </source> @@ -298,69 +429,147 @@ </initExpression> <type xsi:type="ocl:SequenceType" location="131:23-131:56"> <elementType xsi:type="ocl:OclModelElement" location="131:32-131:55" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/26"/> </elementType> </type> </feature> <context_ location="130:8-130:24"> <context_ xsi:type="ocl:OclModelElement" location="130:16-130:24" name="Rule"> - <model href="temp#/1"/> + <model href="new-model#/25"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="152:1-158:8"> + <commentsBefore>-- This helper computes the Rule element in which the contextual PatterElement</commentsBefore> + <commentsBefore>-- is declared. This is achieved by returning the Rule referred by the "rule"</commentsBefore> + <commentsBefore>-- reference of the Pattern that conatins the contexual PatternElement. This </commentsBefore> + <commentsBefore>-- last one is accessed through the "outPattern" reference if the contextual</commentsBefore> + <commentsBefore>-- PatternElement is an OutPatternElement, throught the "inPattern" if it is</commentsBefore> + <commentsBefore>-- an InPatternElement.</commentsBefore> + <commentsBefore>-- CONTEXT:	ATL!PatternElement</commentsBefore> + <commentsBefore>-- RETURN:	ATL!Rule</commentsBefore> + <commentsAfter>-- This helper returns the immediate composite (container) of the contextual</commentsAfter> + <commentsAfter>-- VariableDeclaration.</commentsAfter> + <commentsAfter>-- If the "letExp" reference of the contextual VariableDeclaration is not</commentsAfter> + <commentsAfter>-- undefined, the helper returns the pointed LetExp.</commentsAfter> + <commentsAfter>-- Otherwise, if the "letExp" reference of the contextual VD is not undefined,</commentsAfter> + <commentsAfter>-- the helper returns the pointed IterateExp.</commentsAfter> + <commentsAfter>-- Otherwise, if the contextual VD is an InPatternElement, the helper returns</commentsAfter> + <commentsAfter>-- the InPattern in which it is contained.</commentsAfter> + <commentsAfter>-- Otherwise, if the contextual VD is an OutPatternElement, the helper returns</commentsAfter> + <commentsAfter>-- the OutPattern in which it is contained.</commentsAfter> + <commentsAfter>-- Otherwise, if there exists a LoopExp element that contains the contextual VD</commentsAfter> + <commentsAfter>-- as an iterator, the helper returns this LoopExp.</commentsAfter> + <commentsAfter>-- Otherwise, if there exists an IterateExp element that contains the contextual</commentsAfter> + <commentsAfter>-- VD as its result, the helper returns this IterateExp.</commentsAfter> + <commentsAfter>-- Otherwise, if there exists a Rule element that contains the contextual VD</commentsAfter> + <commentsAfter>-- as a rule variable iterator, the helper returns this Rule element.</commentsAfter> + <commentsAfter>-- Otherwise, the helper returns OclUndefined as a default value.</commentsAfter> + <commentsAfter>-- CONTEXT:	ATL!VariableDeclaration</commentsAfter> + <commentsAfter>-- RETURN:	ATL!Element</commentsAfter> <definition location="152:8-158:7"> <feature xsi:type="ocl:Attribute" location="152:40-158:7" name="rule"> <initExpression xsi:type="ocl:IfExp" location="153:2-158:7"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="155:3-155:25" name="rule"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="155:3-155:18" name="outPattern"> <source xsi:type="ocl:VariableExp" location="155:3-155:7"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/36"/> </source> </source> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="153:5-153:44" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="153:5-153:9"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/34"/> </source> <arguments xsi:type="ocl:OclModelElement" location="153:22-153:43" name="OutPatternElement"> - <model href="temp#/1"/> + <model href="new-model#/35"/> </arguments> </condition> <elseExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="157:3-157:24" name="rule"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="157:3-157:17" name="inPattern"> <source xsi:type="ocl:VariableExp" location="157:3-157:7"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/37"/> </source> </source> </elseExpression> </initExpression> <type xsi:type="ocl:OclModelElement" location="152:49-152:57" name="Rule"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </type> </feature> <context_ location="152:8-152:34"> <context_ xsi:type="ocl:OclModelElement" location="152:16-152:34" name="PatternElement"> - <model href="temp#/1"/> + <model href="new-model#/32"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="180:1-201:44"> + <commentsBefore>-- This helper returns the immediate composite (container) of the contextual</commentsBefore> + <commentsBefore>-- VariableDeclaration.</commentsBefore> + <commentsBefore>-- If the "letExp" reference of the contextual VariableDeclaration is not</commentsBefore> + <commentsBefore>-- undefined, the helper returns the pointed LetExp.</commentsBefore> + <commentsBefore>-- Otherwise, if the "letExp" reference of the contextual VD is not undefined,</commentsBefore> + <commentsBefore>-- the helper returns the pointed IterateExp.</commentsBefore> + <commentsBefore>-- Otherwise, if the contextual VD is an InPatternElement, the helper returns</commentsBefore> + <commentsBefore>-- the InPattern in which it is contained.</commentsBefore> + <commentsBefore>-- Otherwise, if the contextual VD is an OutPatternElement, the helper returns</commentsBefore> + <commentsBefore>-- the OutPattern in which it is contained.</commentsBefore> + <commentsBefore>-- Otherwise, if there exists a LoopExp element that contains the contextual VD</commentsBefore> + <commentsBefore>-- as an iterator, the helper returns this LoopExp.</commentsBefore> + <commentsBefore>-- Otherwise, if there exists an IterateExp element that contains the contextual</commentsBefore> + <commentsBefore>-- VD as its result, the helper returns this IterateExp.</commentsBefore> + <commentsBefore>-- Otherwise, if there exists a Rule element that contains the contextual VD</commentsBefore> + <commentsBefore>-- as a rule variable iterator, the helper returns this Rule element.</commentsBefore> + <commentsBefore>-- Otherwise, the helper returns OclUndefined as a default value.</commentsBefore> + <commentsBefore>-- CONTEXT:	ATL!VariableDeclaration</commentsBefore> + <commentsBefore>-- RETURN:	ATL!Element</commentsBefore> + <commentsAfter>-- This helper returns the immediate composite (container) of the contextual</commentsAfter> + <commentsAfter>-- OclExpression.</commentsAfter> + <commentsAfter>-- If the one of the "ifExp1", "ifExp2" and "ifExp3" references of the</commentsAfter> + <commentsAfter>-- contextual OclExpression is not undefined, the helper returns the pointed</commentsAfter> + <commentsAfter>-- IfExp.</commentsAfter> + <commentsAfter>-- Otherwise, if its "attribute" is not undefined, the helper returns the</commentsAfter> + <commentsAfter>-- pointed Attribute.</commentsAfter> + <commentsAfter>-- Otherwise, if its "operation" is not undefined, the helper returns the</commentsAfter> + <commentsAfter>-- pointed Operation.</commentsAfter> + <commentsAfter>-- Otherwise, if its "initializedVariable" is not undefined, the helper returns</commentsAfter> + <commentsAfter>-- the pointed VariableDeclaration.</commentsAfter> + <commentsAfter>-- Otherwise, if its "parentOperation" is not undefined, the helper returns the</commentsAfter> + <commentsAfter>-- pointed OperationCallExp.</commentsAfter> + <commentsAfter>-- Otherwise, if its "loopExp" is not undefined, the helper returns the pointed</commentsAfter> + <commentsAfter>-- LoopExp.</commentsAfter> + <commentsAfter>-- Otherwise, if its "letExp" is not undefined, the helper returns the</commentsAfter> + <commentsAfter>-- pointed LetExp.</commentsAfter> + <commentsAfter>-- Otherwise, if its "collection" is not undefined, the helper returns the</commentsAfter> + <commentsAfter>-- pointed CollectionExp.</commentsAfter> + <commentsAfter>-- Otherwise, if its "appliedProperty" is not undefined, the helper returns the</commentsAfter> + <commentsAfter>-- pointed PropertyCallExp.</commentsAfter> + <commentsAfter>-- Otherwise, if its "operation" is not undefined, the helper returns the</commentsAfter> + <commentsAfter>-- pointed Operation.</commentsAfter> + <commentsAfter>-- Otherwise, if there exists an InPattern that has the contextual OclExp as</commentsAfter> + <commentsAfter>-- filter, the helper returns this InPattern.</commentsAfter> + <commentsAfter>-- Otherwise, if there exists a Binding that has the contextual OclExp as</commentsAfter> + <commentsAfter>-- value, the helper returns this Binding.</commentsAfter> + <commentsAfter>-- Otherwise, if there exists a Query that has the contextual OclExp as body,</commentsAfter> + <commentsAfter>-- the helper returns this Query.</commentsAfter> + <commentsAfter>-- Otherwise, the helper retuns OclUndefined as default value.</commentsAfter> + <commentsAfter>-- CONTEXT:	ATL!OclExpression</commentsAfter> + <commentsAfter>-- RETURN:	ATL!Element</commentsAfter> <definition location="180:8-201:43"> <feature xsi:type="ocl:Attribute" location="180:45-201:43" name="immediateComposite"> <initExpression xsi:type="ocl:IfExp" location="181:2-201:43"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="182:3-182:14" name="letExp"> <source xsi:type="ocl:VariableExp" location="182:3-182:7"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/41"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="181:5-181:37" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="181:9-181:37" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="181:9-181:20" name="letExp"> <source xsi:type="ocl:VariableExp" location="181:9-181:13"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/40"/> </source> </source> </source> @@ -368,14 +577,14 @@ <elseExpression xsi:type="ocl:IfExp" location="183:7-201:37"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="184:3-184:15" name="baseExp"> <source xsi:type="ocl:VariableExp" location="184:3-184:7"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/43"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="183:10-183:43" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="183:14-183:43" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="183:14-183:26" name="baseExp"> <source xsi:type="ocl:VariableExp" location="183:14-183:18"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/42"/> </source> </source> </source> @@ -386,13 +595,13 @@ <source xsi:type="ocl:IteratorExp" location="186:3-186:52" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="186:3-186:30" name="allInPatternElts"> <source xsi:type="ocl:VariableExp" location="186:3-186:13"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/46"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="186:43-186:51" operationName="="> <source xsi:type="ocl:VariableExp" location="186:43-186:44" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@thenExpression/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:VariableExp" location="186:47-186:51"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/47"/> </arguments> </body> <iterators location="186:39-186:40" varName="e" variableExp="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@thenExpression/@source/@source/@body/@source"/> @@ -402,13 +611,13 @@ <condition xsi:type="ocl:IteratorExp" location="185:10-185:59" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="185:10-185:37" name="allInPatternElts"> <source xsi:type="ocl:VariableExp" location="185:10-185:20"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/44"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="185:50-185:58" operationName="="> <source xsi:type="ocl:VariableExp" location="185:50-185:51" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@condition/@iterators.0"/> <arguments xsi:type="ocl:VariableExp" location="185:54-185:58"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/45"/> </arguments> </body> <iterators location="185:46-185:47" varName="e" variableExp="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@condition/@body/@source"/> @@ -419,13 +628,13 @@ <source xsi:type="ocl:IteratorExp" location="188:3-188:53" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="188:3-188:31" name="allOutPatternElts"> <source xsi:type="ocl:VariableExp" location="188:3-188:13"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/50"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="188:44-188:52" operationName="="> <source xsi:type="ocl:VariableExp" location="188:44-188:45" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:VariableExp" location="188:48-188:52"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/51"/> </arguments> </body> <iterators location="188:40-188:41" varName="e" variableExp="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@source/@body/@source"/> @@ -435,13 +644,13 @@ <condition xsi:type="ocl:IteratorExp" location="187:10-187:60" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="187:10-187:38" name="allOutPatternElts"> <source xsi:type="ocl:VariableExp" location="187:10-187:20"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/48"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="187:51-187:59" operationName="="> <source xsi:type="ocl:VariableExp" location="187:51-187:52" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@iterators.0"/> <arguments xsi:type="ocl:VariableExp" location="187:55-187:59"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/49"/> </arguments> </body> <iterators location="187:47-187:48" varName="e" variableExp="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@body/@source"/> @@ -451,7 +660,7 @@ <source xsi:type="ocl:IteratorExp" location="191:3-192:51" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="191:3-191:25" name="allLoopExps"> <source xsi:type="ocl:VariableExp" location="191:3-191:13"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/54"/> </source> </source> <body xsi:type="ocl:IteratorExp" location="192:17-192:50" name="exists"> @@ -460,7 +669,7 @@ </source> <body xsi:type="ocl:OperatorCallExp" location="192:41-192:49" operationName="="> <source xsi:type="ocl:VariableExp" location="192:41-192:45"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/55"/> </source> <arguments xsi:type="ocl:VariableExp" location="192:48-192:49" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@body/@iterators.0"/> </body> @@ -472,7 +681,7 @@ <condition xsi:type="ocl:IteratorExp" location="189:10-190:52" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="189:10-189:32" name="allLoopExps"> <source xsi:type="ocl:VariableExp" location="189:10-189:20"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/52"/> </source> </source> <body xsi:type="ocl:IteratorExp" location="190:18-190:51" name="exists"> @@ -481,7 +690,7 @@ </source> <body xsi:type="ocl:OperatorCallExp" location="190:42-190:50" operationName="="> <source xsi:type="ocl:VariableExp" location="190:42-190:46"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/53"/> </source> <arguments xsi:type="ocl:VariableExp" location="190:49-190:50" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@body/@iterators.0"/> </body> @@ -494,12 +703,12 @@ <source xsi:type="ocl:IteratorExp" location="194:3-194:57" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="194:3-194:28" name="allIterateExps"> <source xsi:type="ocl:VariableExp" location="194:3-194:13"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/58"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="194:41-194:56" operationName="="> <source xsi:type="ocl:VariableExp" location="194:41-194:45"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/59"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="194:48-194:56" name="result"> <source xsi:type="ocl:VariableExp" location="194:48-194:49" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@iterators.0"/> @@ -511,12 +720,12 @@ <condition xsi:type="ocl:IteratorExp" location="193:10-193:64" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="193:10-193:35" name="allIterateExps"> <source xsi:type="ocl:VariableExp" location="193:10-193:20"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/56"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="193:48-193:63" operationName="="> <source xsi:type="ocl:VariableExp" location="193:48-193:52"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/57"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="193:55-193:63" name="result"> <source xsi:type="ocl:VariableExp" location="193:55-193:56" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@iterators.0"/> @@ -529,7 +738,7 @@ <source xsi:type="ocl:IteratorExp" location="197:3-198:51" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="197:3-197:22" name="allRules"> <source xsi:type="ocl:VariableExp" location="197:3-197:13"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/62"/> </source> </source> <body xsi:type="ocl:IteratorExp" location="198:17-198:50" name="exists"> @@ -538,7 +747,7 @@ </source> <body xsi:type="ocl:OperatorCallExp" location="198:41-198:49" operationName="="> <source xsi:type="ocl:VariableExp" location="198:41-198:45"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/63"/> </source> <arguments xsi:type="ocl:VariableExp" location="198:48-198:49" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@body/@iterators.0"/> </body> @@ -550,7 +759,7 @@ <condition xsi:type="ocl:IteratorExp" location="195:10-196:52" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="195:10-195:29" name="allRules"> <source xsi:type="ocl:VariableExp" location="195:10-195:20"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/60"/> </source> </source> <body xsi:type="ocl:IteratorExp" location="196:18-196:51" name="exists"> @@ -559,7 +768,7 @@ </source> <body xsi:type="ocl:OperatorCallExp" location="196:42-196:50" operationName="="> <source xsi:type="ocl:VariableExp" location="196:42-196:46"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/61"/> </source> <arguments xsi:type="ocl:VariableExp" location="196:49-196:50" referredVariable="//@elements.15/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@body/@iterators.0"/> </body> @@ -576,30 +785,76 @@ </elseExpression> </initExpression> <type xsi:type="ocl:OclModelElement" location="180:66-180:77" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/39"/> </type> </feature> <context_ location="180:8-180:39"> <context_ xsi:type="ocl:OclModelElement" location="180:16-180:39" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/38"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="236:1-266:38"> + <commentsBefore>-- This helper returns the immediate composite (container) of the contextual</commentsBefore> + <commentsBefore>-- OclExpression.</commentsBefore> + <commentsBefore>-- If the one of the "ifExp1", "ifExp2" and "ifExp3" references of the</commentsBefore> + <commentsBefore>-- contextual OclExpression is not undefined, the helper returns the pointed</commentsBefore> + <commentsBefore>-- IfExp.</commentsBefore> + <commentsBefore>-- Otherwise, if its "attribute" is not undefined, the helper returns the</commentsBefore> + <commentsBefore>-- pointed Attribute.</commentsBefore> + <commentsBefore>-- Otherwise, if its "operation" is not undefined, the helper returns the</commentsBefore> + <commentsBefore>-- pointed Operation.</commentsBefore> + <commentsBefore>-- Otherwise, if its "initializedVariable" is not undefined, the helper returns</commentsBefore> + <commentsBefore>-- the pointed VariableDeclaration.</commentsBefore> + <commentsBefore>-- Otherwise, if its "parentOperation" is not undefined, the helper returns the</commentsBefore> + <commentsBefore>-- pointed OperationCallExp.</commentsBefore> + <commentsBefore>-- Otherwise, if its "loopExp" is not undefined, the helper returns the pointed</commentsBefore> + <commentsBefore>-- LoopExp.</commentsBefore> + <commentsBefore>-- Otherwise, if its "letExp" is not undefined, the helper returns the</commentsBefore> + <commentsBefore>-- pointed LetExp.</commentsBefore> + <commentsBefore>-- Otherwise, if its "collection" is not undefined, the helper returns the</commentsBefore> + <commentsBefore>-- pointed CollectionExp.</commentsBefore> + <commentsBefore>-- Otherwise, if its "appliedProperty" is not undefined, the helper returns the</commentsBefore> + <commentsBefore>-- pointed PropertyCallExp.</commentsBefore> + <commentsBefore>-- Otherwise, if its "operation" is not undefined, the helper returns the</commentsBefore> + <commentsBefore>-- pointed Operation.</commentsBefore> + <commentsBefore>-- Otherwise, if there exists an InPattern that has the contextual OclExp as</commentsBefore> + <commentsBefore>-- filter, the helper returns this InPattern.</commentsBefore> + <commentsBefore>-- Otherwise, if there exists a Binding that has the contextual OclExp as</commentsBefore> + <commentsBefore>-- value, the helper returns this Binding.</commentsBefore> + <commentsBefore>-- Otherwise, if there exists a Query that has the contextual OclExp as body,</commentsBefore> + <commentsBefore>-- the helper returns this Query.</commentsBefore> + <commentsBefore>-- Otherwise, the helper retuns OclUndefined as default value.</commentsBefore> + <commentsBefore>-- CONTEXT:	ATL!OclExpression</commentsBefore> + <commentsBefore>-- RETURN:	ATL!Element</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing the VariableDeclarations that</commentsAfter> + <commentsAfter>-- precede the contextual VariableDeclaration in its namespace.</commentsAfter> + <commentsAfter>-- If the contextual VariableDeclaration is a PatternElement, the helper only</commentsAfter> + <commentsAfter>-- returns this VD.</commentsAfter> + <commentsAfter>-- Otherwise, it computes the container of the contextual VD. If the container</commentsAfter> + <commentsAfter>-- is a LetExp, it returns a Sequence composed of the VD, and the results of</commentsAfter> + <commentsAfter>-- the calls of the getUpD helper on the calculated container.</commentsAfter> + <commentsAfter>-- If the container is an IteratorExp, the helper returns a Sequence composed</commentsAfter> + <commentsAfter>-- of the VD and the results of the call of getUpD on the computed container.</commentsAfter> + <commentsAfter>-- If the container is an IterateExp, the helper a Sequence containing the same</commentsAfter> + <commentsAfter>-- elements that the one computed for an IteratorExp.</commentsAfter> + <commentsAfter>-- Otherwise, the helper returns the only contextual VD as default value.</commentsAfter> + <commentsAfter>-- CONTEXT:	ATL!VariableDeclaration</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!VariableDeclaration)</commentsAfter> <definition location="236:8-266:37"> <feature xsi:type="ocl:Attribute" location="236:39-266:37" name="immediateComposite"> <initExpression xsi:type="ocl:IfExp" location="237:2-266:37"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="237:43-237:54" name="ifExp1"> <source xsi:type="ocl:VariableExp" location="237:43-237:47"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/67"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="237:5-237:37" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="237:9-237:37" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="237:9-237:20" name="ifExp1"> <source xsi:type="ocl:VariableExp" location="237:9-237:13"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/66"/> </source> </source> </source> @@ -607,14 +862,14 @@ <elseExpression xsi:type="ocl:IfExp" location="238:7-266:31"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="238:48-238:59" name="ifExp2"> <source xsi:type="ocl:VariableExp" location="238:48-238:52"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/69"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="238:10-238:42" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="238:14-238:42" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="238:14-238:25" name="ifExp2"> <source xsi:type="ocl:VariableExp" location="238:14-238:18"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/68"/> </source> </source> </source> @@ -622,14 +877,14 @@ <elseExpression xsi:type="ocl:IfExp" location="239:7-266:25"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="239:48-239:59" name="ifExp3"> <source xsi:type="ocl:VariableExp" location="239:48-239:52"> - <referredVariable href="temp#/38"/> + <referredVariable href="new-model#/71"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="239:10-239:42" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="239:14-239:42" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="239:14-239:25" name="ifExp3"> <source xsi:type="ocl:VariableExp" location="239:14-239:18"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/70"/> </source> </source> </source> @@ -637,14 +892,14 @@ <elseExpression xsi:type="ocl:IfExp" location="240:7-266:19"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="240:53-240:69" name="attribute"> <source xsi:type="ocl:VariableExp" location="240:53-240:57"> - <referredVariable href="temp#/40"/> + <referredVariable href="new-model#/73"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="240:10-240:47" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="240:14-240:47" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="240:14-240:30" name="attribute"> <source xsi:type="ocl:VariableExp" location="240:14-240:18"> - <referredVariable href="temp#/39"/> + <referredVariable href="new-model#/72"/> </source> </source> </source> @@ -652,14 +907,14 @@ <elseExpression xsi:type="ocl:IfExp" location="241:7-266:13"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="241:53-241:69" name="operation"> <source xsi:type="ocl:VariableExp" location="241:53-241:57"> - <referredVariable href="temp#/42"/> + <referredVariable href="new-model#/75"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="241:10-241:47" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="241:14-241:47" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="241:14-241:30" name="operation"> <source xsi:type="ocl:VariableExp" location="241:14-241:18"> - <referredVariable href="temp#/41"/> + <referredVariable href="new-model#/74"/> </source> </source> </source> @@ -667,14 +922,14 @@ <elseExpression xsi:type="ocl:IfExp" location="242:7-266:7"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="243:8-243:32" name="initializedVariable"> <source xsi:type="ocl:VariableExp" location="243:8-243:12"> - <referredVariable href="temp#/44"/> + <referredVariable href="new-model#/77"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="242:10-242:55" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="242:14-242:55" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="242:14-242:38" name="initializedVariable"> <source xsi:type="ocl:VariableExp" location="242:14-242:18"> - <referredVariable href="temp#/43"/> + <referredVariable href="new-model#/76"/> </source> </source> </source> @@ -682,14 +937,14 @@ <elseExpression xsi:type="ocl:IfExp" location="244:7-265:43"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="244:57-244:77" name="parentOperation"> <source xsi:type="ocl:VariableExp" location="244:57-244:61"> - <referredVariable href="temp#/46"/> + <referredVariable href="new-model#/79"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="244:10-244:51" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="244:14-244:51" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="244:14-244:34" name="parentOperation"> <source xsi:type="ocl:VariableExp" location="244:14-244:18"> - <referredVariable href="temp#/45"/> + <referredVariable href="new-model#/78"/> </source> </source> </source> @@ -697,14 +952,14 @@ <elseExpression xsi:type="ocl:IfExp" location="245:7-265:37"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="245:49-245:61" name="loopExp"> <source xsi:type="ocl:VariableExp" location="245:49-245:53"> - <referredVariable href="temp#/48"/> + <referredVariable href="new-model#/81"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="245:10-245:43" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="245:14-245:43" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="245:14-245:26" name="loopExp"> <source xsi:type="ocl:VariableExp" location="245:14-245:18"> - <referredVariable href="temp#/47"/> + <referredVariable href="new-model#/80"/> </source> </source> </source> @@ -712,14 +967,14 @@ <elseExpression xsi:type="ocl:IfExp" location="246:7-265:31"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="246:48-246:59" name="letExp"> <source xsi:type="ocl:VariableExp" location="246:48-246:52"> - <referredVariable href="temp#/50"/> + <referredVariable href="new-model#/83"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="246:10-246:42" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="246:14-246:42" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="246:14-246:25" name="letExp"> <source xsi:type="ocl:VariableExp" location="246:14-246:18"> - <referredVariable href="temp#/49"/> + <referredVariable href="new-model#/82"/> </source> </source> </source> @@ -727,14 +982,14 @@ <elseExpression xsi:type="ocl:IfExp" location="247:7-265:25"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="247:52-247:67" name="collection"> <source xsi:type="ocl:VariableExp" location="247:52-247:56"> - <referredVariable href="temp#/52"/> + <referredVariable href="new-model#/85"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="247:10-247:46" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="247:14-247:46" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="247:14-247:29" name="collection"> <source xsi:type="ocl:VariableExp" location="247:14-247:18"> - <referredVariable href="temp#/51"/> + <referredVariable href="new-model#/84"/> </source> </source> </source> @@ -742,14 +997,14 @@ <elseExpression xsi:type="ocl:IfExp" location="248:7-265:19"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="248:57-248:77" name="appliedProperty"> <source xsi:type="ocl:VariableExp" location="248:57-248:61"> - <referredVariable href="temp#/54"/> + <referredVariable href="new-model#/87"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="248:10-248:51" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="248:14-248:51" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="248:14-248:34" name="appliedProperty"> <source xsi:type="ocl:VariableExp" location="248:14-248:18"> - <referredVariable href="temp#/53"/> + <referredVariable href="new-model#/86"/> </source> </source> </source> @@ -759,7 +1014,7 @@ <source xsi:type="ocl:IteratorExp" location="250:8-250:61" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="250:8-250:32" name="allInPatterns"> <source xsi:type="ocl:VariableExp" location="250:8-250:18"> - <referredVariable href="temp#/57"/> + <referredVariable href="new-model#/90"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="250:45-250:60" operationName="="> @@ -767,7 +1022,7 @@ <source xsi:type="ocl:VariableExp" location="250:45-250:46" referredVariable="//@elements.16/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="250:56-250:60"> - <referredVariable href="temp#/58"/> + <referredVariable href="new-model#/91"/> </arguments> </body> <iterators location="250:41-250:42" varName="e" variableExp="//@elements.16/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@body/@source/@source"/> @@ -776,7 +1031,7 @@ <condition xsi:type="ocl:IteratorExp" location="249:10-249:63" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="249:10-249:34" name="allInPatterns"> <source xsi:type="ocl:VariableExp" location="249:10-249:20"> - <referredVariable href="temp#/55"/> + <referredVariable href="new-model#/88"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="249:47-249:62" operationName="="> @@ -784,7 +1039,7 @@ <source xsi:type="ocl:VariableExp" location="249:47-249:48" referredVariable="//@elements.16/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="249:58-249:62"> - <referredVariable href="temp#/56"/> + <referredVariable href="new-model#/89"/> </arguments> </body> <iterators location="249:43-249:44" varName="e" variableExp="//@elements.16/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@body/@source/@source"/> @@ -794,7 +1049,7 @@ <source xsi:type="ocl:IteratorExp" location="252:8-252:58" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="252:8-252:30" name="allBindings"> <source xsi:type="ocl:VariableExp" location="252:8-252:18"> - <referredVariable href="temp#/61"/> + <referredVariable href="new-model#/94"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="252:43-252:57" operationName="="> @@ -802,7 +1057,7 @@ <source xsi:type="ocl:VariableExp" location="252:43-252:44" referredVariable="//@elements.16/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="252:53-252:57"> - <referredVariable href="temp#/62"/> + <referredVariable href="new-model#/95"/> </arguments> </body> <iterators location="252:39-252:40" varName="e" variableExp="//@elements.16/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@body/@source/@source"/> @@ -811,7 +1066,7 @@ <condition xsi:type="ocl:IteratorExp" location="251:10-251:60" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="251:10-251:32" name="allBindings"> <source xsi:type="ocl:VariableExp" location="251:10-251:20"> - <referredVariable href="temp#/59"/> + <referredVariable href="new-model#/92"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="251:45-251:59" operationName="="> @@ -819,7 +1074,7 @@ <source xsi:type="ocl:VariableExp" location="251:45-251:46" referredVariable="//@elements.16/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="251:55-251:59"> - <referredVariable href="temp#/60"/> + <referredVariable href="new-model#/93"/> </arguments> </body> <iterators location="251:41-251:42" varName="e" variableExp="//@elements.16/@definition/@feature/@initExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@body/@source/@source"/> @@ -828,19 +1083,19 @@ <thenExpression xsi:type="ocl:IfExp" location="256:4-261:9"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="258:5-258:24" name="queryElt"> <source xsi:type="ocl:VariableExp" location="258:5-258:15"> - <referredVariable href="temp#/66"/> + <referredVariable href="new-model#/99"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="256:7-256:38" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="256:7-256:31" name="body"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="256:7-256:26" name="queryElt"> <source xsi:type="ocl:VariableExp" location="256:7-256:17"> - <referredVariable href="temp#/64"/> + <referredVariable href="new-model#/97"/> </source> </source> </source> <arguments xsi:type="ocl:VariableExp" location="256:34-256:38"> - <referredVariable href="temp#/65"/> + <referredVariable href="new-model#/98"/> </arguments> </condition> <elseExpression xsi:type="ocl:OclUndefinedExp" location="260:5-260:17"/> @@ -849,7 +1104,7 @@ <source xsi:type="ocl:OperationCallExp" location="254:10-254:46" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="254:10-254:29" name="queryElt"> <source xsi:type="ocl:VariableExp" location="254:10-254:20"> - <referredVariable href="temp#/63"/> + <referredVariable href="new-model#/96"/> </source> </source> </source> @@ -870,46 +1125,85 @@ </elseExpression> </initExpression> <type xsi:type="ocl:OclModelElement" location="236:60-236:71" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/65"/> </type> </feature> <context_ location="236:8-236:33"> <context_ xsi:type="ocl:OclModelElement" location="236:16-236:33" name="OclExpression"> - <model href="temp#/1"/> + <model href="new-model#/64"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="283:1-317:8"> + <commentsBefore>-- This helper computes a sequence containing the VariableDeclarations that</commentsBefore> + <commentsBefore>-- precede the contextual VariableDeclaration in its namespace.</commentsBefore> + <commentsBefore>-- If the contextual VariableDeclaration is a PatternElement, the helper only</commentsBefore> + <commentsBefore>-- returns this VD.</commentsBefore> + <commentsBefore>-- Otherwise, it computes the container of the contextual VD. If the container</commentsBefore> + <commentsBefore>-- is a LetExp, it returns a Sequence composed of the VD, and the results of</commentsBefore> + <commentsBefore>-- the calls of the getUpD helper on the calculated container.</commentsBefore> + <commentsBefore>-- If the container is an IteratorExp, the helper returns a Sequence composed</commentsBefore> + <commentsBefore>-- of the VD and the results of the call of getUpD on the computed container.</commentsBefore> + <commentsBefore>-- If the container is an IterateExp, the helper a Sequence containing the same</commentsBefore> + <commentsBefore>-- elements that the one computed for an IteratorExp.</commentsBefore> + <commentsBefore>-- Otherwise, the helper returns the only contextual VD as default value.</commentsBefore> + <commentsBefore>-- CONTEXT:	ATL!VariableDeclaration</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!VariableDeclaration)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing the VariableDeclarations that are</commentsAfter> + <commentsAfter>-- defined higher than the contextual OclExpression in its namespace tree.</commentsAfter> + <commentsAfter>-- The helper first computes the container of the contextual OclExp. If this</commentsAfter> + <commentsAfter>-- container is undefined, it retuns an empty sequence.</commentsAfter> + <commentsAfter>-- Otherwise, if this container is not an OclExpression:</commentsAfter> + <commentsAfter>-- * If the container is a RuleVariableDeclaration, the helper returns a</commentsAfter> + <commentsAfter>-- sequence containing all the named elements of the rule that contains this</commentsAfter> + <commentsAfter>-- InPattern.</commentsAfter> + <commentsAfter>-- * If the container is a Binding, the helper returns a sequence containing</commentsAfter> + <commentsAfter>-- all the named elements of the rule that contains this Binding.</commentsAfter> + <commentsAfter>-- Otherwise, if the computed container is an OclExpression:</commentsAfter> + <commentsAfter>-- * If the container is a LetExp, the helper returns a sequence composed of</commentsAfter> + <commentsAfter>-- the LetExp variable and the result of its recursive call on the LetExp.</commentsAfter> + <commentsAfter>-- * If the container is an IfExp, the helper returns a sequence composed of</commentsAfter> + <commentsAfter>-- the result of its recursive call on the IfExp.</commentsAfter> + <commentsAfter>-- * If the container is an IteratorExp, if the contextual OclExp is the</commentsAfter> + <commentsAfter>-- source of the IteratorExp then the helper returns the result of its</commentsAfter> + <commentsAfter>-- recursive call on the IteratorExp, else it returns this result with the</commentsAfter> + <commentsAfter>-- "iterators" elements of the IteratorExp.</commentsAfter> + <commentsAfter>-- * If the container is an IterateExp, the helper returns the same sequences</commentsAfter> + <commentsAfter>-- that for an IteratorExp, with the additional "result" element in case the</commentsAfter> + <commentsAfter>-- contextual OclExp is not the source of the IterateExp.</commentsAfter> + <commentsAfter>-- Otherwise, the helper returns an empty sequence as default value.</commentsAfter> + <commentsAfter>-- CONTEXT:	ATL!OclExpression</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!VariableDeclaration)</commentsAfter> <definition location="283:8-317:7"> <feature xsi:type="ocl:Operation" location="284:7-317:7" name="getDeclarations"> <returnType xsi:type="ocl:SequenceType" location="284:27-284:60"> <elementType xsi:type="ocl:OclModelElement" location="284:36-284:59" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/101"/> </elementType> </returnType> <body xsi:type="ocl:IfExp" location="285:2-317:7"> <thenExpression xsi:type="ocl:SequenceExp" location="287:3-287:17"> <elements xsi:type="ocl:VariableExp" location="287:12-287:16"> - <referredVariable href="temp#/68"/> + <referredVariable href="new-model#/104"/> </elements> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="285:5-285:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="285:5-285:9"> - <referredVariable href="temp#/67"/> + <referredVariable href="new-model#/102"/> </source> <arguments xsi:type="ocl:OclModelElement" location="285:22-285:40" name="PatternElement"> - <model href="temp#/1"/> + <model href="new-model#/103"/> </arguments> </condition> <elseExpression xsi:type="ocl:LetExp" location="289:3-316:8"> <variable location="289:7-289:56" varName="container" variableExp="//@elements.17/@definition/@feature/@body/@elseExpression/@in_/@condition/@source //@elements.17/@definition/@feature/@body/@elseExpression/@in_/@thenExpression/@source/@elements.1/@source //@elements.17/@definition/@feature/@body/@elseExpression/@in_/@elseExpression/@condition/@source //@elements.17/@definition/@feature/@body/@elseExpression/@in_/@elseExpression/@thenExpression/@source/@elements.1/@source //@elements.17/@definition/@feature/@body/@elseExpression/@in_/@elseExpression/@elseExpression/@condition/@source //@elements.17/@definition/@feature/@body/@elseExpression/@in_/@elseExpression/@elseExpression/@thenExpression/@source/@elements.1/@source"> <type xsi:type="ocl:OclModelElement" location="289:19-289:30" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/105"/> </type> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="289:33-289:56" name="immediateComposite"> <source xsi:type="ocl:VariableExp" location="289:33-289:37"> - <referredVariable href="temp#/69"/> + <referredVariable href="new-model#/106"/> </source> </initExpression> </variable> @@ -917,7 +1211,7 @@ <thenExpression xsi:type="ocl:CollectionOperationCallExp" location="292:4-295:16" operationName="flatten"> <source xsi:type="ocl:SequenceExp" location="292:4-295:5"> <elements xsi:type="ocl:VariableExp" location="293:5-293:9"> - <referredVariable href="temp#/70"/> + <referredVariable href="new-model#/108"/> </elements> <elements xsi:type="ocl:OperationCallExp" location="294:5-294:23" operationName="getUpD"> <source xsi:type="ocl:VariableExp" location="294:5-294:14" referredVariable="//@elements.17/@definition/@feature/@body/@elseExpression/@variable"/> @@ -927,14 +1221,14 @@ <condition xsi:type="ocl:OperationCallExp" location="290:6-290:39" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="290:6-290:15" referredVariable="//@elements.17/@definition/@feature/@body/@elseExpression/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="290:28-290:38" name="LetExp"> - <model href="temp#/1"/> + <model href="new-model#/107"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="297:4-315:9"> <thenExpression xsi:type="ocl:CollectionOperationCallExp" location="299:5-302:17" operationName="flatten"> <source xsi:type="ocl:SequenceExp" location="299:5-302:6"> <elements xsi:type="ocl:VariableExp" location="300:6-300:10"> - <referredVariable href="temp#/71"/> + <referredVariable href="new-model#/110"/> </elements> <elements xsi:type="ocl:OperationCallExp" location="301:6-301:24" operationName="getUpD"> <source xsi:type="ocl:VariableExp" location="301:6-301:15" referredVariable="//@elements.17/@definition/@feature/@body/@elseExpression/@variable"/> @@ -944,14 +1238,14 @@ <condition xsi:type="ocl:OperationCallExp" location="297:7-297:45" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="297:7-297:16" referredVariable="//@elements.17/@definition/@feature/@body/@elseExpression/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="297:29-297:44" name="IteratorExp"> - <model href="temp#/1"/> + <model href="new-model#/109"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="304:5-314:10"> <thenExpression xsi:type="ocl:CollectionOperationCallExp" location="306:6-309:18" operationName="flatten"> <source xsi:type="ocl:SequenceExp" location="306:6-309:7"> <elements xsi:type="ocl:VariableExp" location="307:7-307:11"> - <referredVariable href="temp#/72"/> + <referredVariable href="new-model#/112"/> </elements> <elements xsi:type="ocl:OperationCallExp" location="308:7-308:25" operationName="getUpD"> <source xsi:type="ocl:VariableExp" location="308:7-308:16" referredVariable="//@elements.17/@definition/@feature/@body/@elseExpression/@variable"/> @@ -961,13 +1255,13 @@ <condition xsi:type="ocl:OperationCallExp" location="304:8-304:45" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="304:8-304:17" referredVariable="//@elements.17/@definition/@feature/@body/@elseExpression/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="304:30-304:44" name="IterateExp"> - <model href="temp#/1"/> + <model href="new-model#/111"/> </arguments> </condition> <elseExpression xsi:type="ocl:CollectionOperationCallExp" location="311:6-313:18" operationName="flatten"> <source xsi:type="ocl:SequenceExp" location="311:6-313:7"> <elements xsi:type="ocl:VariableExp" location="312:7-312:11"> - <referredVariable href="temp#/73"/> + <referredVariable href="new-model#/113"/> </elements> </source> </elseExpression> @@ -979,27 +1273,108 @@ </feature> <context_ location="283:8-283:39"> <context_ xsi:type="ocl:OclModelElement" location="283:16-283:39" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/100"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="345:1-401:38"> + <commentsBefore>-- This helper computes a sequence containing the VariableDeclarations that are</commentsBefore> + <commentsBefore>-- defined higher than the contextual OclExpression in its namespace tree.</commentsBefore> + <commentsBefore>-- The helper first computes the container of the contextual OclExp. If this</commentsBefore> + <commentsBefore>-- container is undefined, it retuns an empty sequence.</commentsBefore> + <commentsBefore>-- Otherwise, if this container is not an OclExpression:</commentsBefore> + <commentsBefore>-- * If the container is a RuleVariableDeclaration, the helper returns a</commentsBefore> + <commentsBefore>-- sequence containing all the named elements of the rule that contains this</commentsBefore> + <commentsBefore>-- InPattern.</commentsBefore> + <commentsBefore>-- * If the container is a Binding, the helper returns a sequence containing</commentsBefore> + <commentsBefore>-- all the named elements of the rule that contains this Binding.</commentsBefore> + <commentsBefore>-- Otherwise, if the computed container is an OclExpression:</commentsBefore> + <commentsBefore>-- * If the container is a LetExp, the helper returns a sequence composed of</commentsBefore> + <commentsBefore>-- the LetExp variable and the result of its recursive call on the LetExp.</commentsBefore> + <commentsBefore>-- * If the container is an IfExp, the helper returns a sequence composed of</commentsBefore> + <commentsBefore>-- the result of its recursive call on the IfExp.</commentsBefore> + <commentsBefore>-- * If the container is an IteratorExp, if the contextual OclExp is the</commentsBefore> + <commentsBefore>-- source of the IteratorExp then the helper returns the result of its</commentsBefore> + <commentsBefore>-- recursive call on the IteratorExp, else it returns this result with the</commentsBefore> + <commentsBefore>-- "iterators" elements of the IteratorExp.</commentsBefore> + <commentsBefore>-- * If the container is an IterateExp, the helper returns the same sequences</commentsBefore> + <commentsBefore>-- that for an IteratorExp, with the additional "result" element in case the</commentsBefore> + <commentsBefore>-- contextual OclExp is not the source of the IterateExp.</commentsBefore> + <commentsBefore>-- Otherwise, the helper returns an empty sequence as default value.</commentsBefore> + <commentsBefore>-- CONTEXT:	ATL!OclExpression</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!VariableDeclaration)</commentsBefore> + <commentsAfter>-- This helper computes a sequence containing the VariableDeclarations that are</commentsAfter> + <commentsAfter>-- defined lower than the contextual OclExpression in its namespace tree.</commentsAfter> + <commentsAfter>-- If the contextual OclExpression is a LetExp, the helper returns a sequence</commentsAfter> + <commentsAfter>-- composed of the LetExp variable and the result of its recursive call on the</commentsAfter> + <commentsAfter>-- "in_" reference of the LetExp.</commentsAfter> + <commentsAfter>-- Otherwise, if the contextual OclExpression is a IfExp, the helper returns a</commentsAfter> + <commentsAfter>-- sequence composed of the results of its recursive calls on the "condition",</commentsAfter> + <commentsAfter>-- "thenExpression" and "elseExpression" references of the IfExp.</commentsAfter> + <commentsAfter>-- Otherwise, if the contextual OclExpression is an IteratorExp, the helper</commentsAfter> + <commentsAfter>-- returns a sequence composed of the IteratorExp iterators along with the</commentsAfter> + <commentsAfter>-- results of its recursive calls on the "source" and the "body" references</commentsAfter> + <commentsAfter>-- of the IteratorExp.</commentsAfter> + <commentsAfter>-- Otherwise, if the contextual OclExpression is an IterateExp, the helper</commentsAfter> + <commentsAfter>-- returns the sequence returned for an IteratorExp with its additional result</commentsAfter> + <commentsAfter>-- element.</commentsAfter> + <commentsAfter>-- Otherwise, the helper returns an empty sequence as default value.</commentsAfter> + <commentsAfter>-- CONTEXT:	ATL!OclExpression</commentsAfter> + <commentsAfter>-- RETURN:	Sequence(ATL!VariableDeclaration)</commentsAfter> + <commentsAfter>--helper context ATL!OclExpression</commentsAfter> + <commentsAfter>--	def: getDownD() : Sequence(ATL!VariableDeclaration) =</commentsAfter> + <commentsAfter>--	if self.oclIsTypeOf(ATL!LetExp) then</commentsAfter> + <commentsAfter>--		Sequence{</commentsAfter> + <commentsAfter>--			self.variable,</commentsAfter> + <commentsAfter>--			self.in_.getDownD()</commentsAfter> + <commentsAfter>--		}->flatten()</commentsAfter> + <commentsAfter>--	else if self.oclIsTypeOf(ATL!IfExp) then</commentsAfter> + <commentsAfter>--		Sequence{</commentsAfter> + <commentsAfter>--			self.condition.getDownD(),</commentsAfter> + <commentsAfter>--			self.thenExpression.getDownD(),</commentsAfter> + <commentsAfter>--			self.elseExpression.getDownD()</commentsAfter> + <commentsAfter>--		}->flatten()</commentsAfter> + <commentsAfter>--	else if self.oclIsTypeOf(ATL!IteratorExp) then</commentsAfter> + <commentsAfter>--		Sequence{</commentsAfter> + <commentsAfter>--			self.iterators,</commentsAfter> + <commentsAfter>--			self.source.getDownD(),</commentsAfter> + <commentsAfter>--			self.body.getDownD()</commentsAfter> + <commentsAfter>--		}->flatten()</commentsAfter> + <commentsAfter>--	else if self.oclIsTypeOf(ATL!IterateExp) then</commentsAfter> + <commentsAfter>--		Sequence{</commentsAfter> + <commentsAfter>--			self.iterators,</commentsAfter> + <commentsAfter>--			self.result,</commentsAfter> + <commentsAfter>--			self.source.getDownD(),</commentsAfter> + <commentsAfter>--			self.body.getDownD()</commentsAfter> + <commentsAfter>--		}->flatten()</commentsAfter> + <commentsAfter>--	else Sequence{}</commentsAfter> + <commentsAfter>--	endif endif endif endif;</commentsAfter> + <commentsAfter>-- This helper returns the root composite (container) of the contextual</commentsAfter> + <commentsAfter>-- OclExpression. For this purpose, the helper first computes the immediate</commentsAfter> + <commentsAfter>-- composite of the contextual OclExpression.</commentsAfter> + <commentsAfter>-- If this container is undefined, the helper returns OclUndefined.</commentsAfter> + <commentsAfter>-- Otherwise, if it is a kind of OclExpression, the helper returns the value</commentsAfter> + <commentsAfter>-- provided by its recursive call on the computed container.</commentsAfter> + <commentsAfter>-- Finally, if this container is not an OclExpression, the root composite has</commentsAfter> + <commentsAfter>-- been reached (Binding/InPattern/Operation/Query/Attribute) and is returned.</commentsAfter> + <commentsAfter>-- CONTEXT:	ATL!OclExpression</commentsAfter> + <commentsAfter>-- RETURN:	ATL!Element</commentsAfter> <definition location="345:8-401:37"> <feature xsi:type="ocl:Operation" location="346:7-401:37" name="getUpD"> <returnType xsi:type="ocl:SequenceType" location="346:18-346:51"> <elementType xsi:type="ocl:OclModelElement" location="346:27-346:50" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/115"/> </elementType> </returnType> <body xsi:type="ocl:LetExp" location="347:2-401:37"> <variable location="347:6-347:55" varName="container" variableExp="//@elements.18/@definition/@feature/@body/@in_/@condition/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@condition/@source/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@thenExpression/@condition/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@thenExpression/@thenExpression/@source/@elements.0/@source/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@thenExpression/@elseExpression/@condition/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@thenExpression/@elseExpression/@thenExpression/@source/@elements.0/@source/@source/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@condition/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@thenExpression/@source/@elements.0/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@thenExpression/@source/@elements.1/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@condition/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source/@elements.0/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@condition/@source/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@thenExpression/@source/@elements.0/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@elseExpression/@source/@elements.0/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@elseExpression/@source/@elements.1/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@condition/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@condition/@source/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@thenExpression/@source/@elements.0/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@elseExpression/@source/@elements.0/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@elseExpression/@source/@elements.1/@source //@elements.18/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@elseExpression/@source/@elements.2/@source"> <type xsi:type="ocl:OclModelElement" location="347:18-347:29" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/116"/> </type> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="347:32-347:55" name="immediateComposite"> <source xsi:type="ocl:VariableExp" location="347:32-347:36"> - <referredVariable href="temp#/74"/> + <referredVariable href="new-model#/117"/> </source> </initExpression> </variable> @@ -1022,7 +1397,7 @@ <condition xsi:type="ocl:OperationCallExp" location="351:6-351:56" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="351:6-351:15" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="351:28-351:55" name="RuleVariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/119"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="357:4-364:9"> @@ -1040,7 +1415,7 @@ <condition xsi:type="ocl:OperationCallExp" location="357:7-357:41" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="357:7-357:16" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="357:29-357:40" name="Binding"> - <model href="temp#/1"/> + <model href="new-model#/120"/> </arguments> </condition> <elseExpression xsi:type="ocl:SequenceExp" location="363:5-363:15"/> @@ -1050,7 +1425,7 @@ <source xsi:type="ocl:OperationCallExp" location="350:14-350:54" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="350:14-350:23" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="350:36-350:53" name="OclExpression"> - <model href="temp#/1"/> + <model href="new-model#/118"/> </arguments> </source> </condition> @@ -1068,7 +1443,7 @@ <condition xsi:type="ocl:OperationCallExp" location="366:10-366:43" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="366:10-366:19" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="366:32-366:42" name="LetExp"> - <model href="temp#/1"/> + <model href="new-model#/121"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="371:7-401:19"> @@ -1082,7 +1457,7 @@ <condition xsi:type="ocl:OperationCallExp" location="371:10-371:42" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="371:10-371:19" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="371:32-371:41" name="IfExp"> - <model href="temp#/1"/> + <model href="new-model#/122"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="375:7-401:13"> @@ -1099,7 +1474,7 @@ <source xsi:type="ocl:VariableExp" location="376:6-376:15" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> </source> <arguments xsi:type="ocl:VariableExp" location="376:25-376:29"> - <referredVariable href="temp#/75"/> + <referredVariable href="new-model#/124"/> </arguments> </condition> <elseExpression xsi:type="ocl:CollectionOperationCallExp" location="382:4-385:16" operationName="flatten"> @@ -1116,7 +1491,7 @@ <condition xsi:type="ocl:OperationCallExp" location="375:10-375:48" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="375:10-375:19" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="375:32-375:47" name="IteratorExp"> - <model href="temp#/1"/> + <model href="new-model#/123"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="387:7-401:7"> @@ -1133,7 +1508,7 @@ <source xsi:type="ocl:VariableExp" location="388:6-388:15" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> </source> <arguments xsi:type="ocl:VariableExp" location="388:25-388:29"> - <referredVariable href="temp#/76"/> + <referredVariable href="new-model#/126"/> </arguments> </condition> <elseExpression xsi:type="ocl:CollectionOperationCallExp" location="394:4-398:16" operationName="flatten"> @@ -1153,7 +1528,7 @@ <condition xsi:type="ocl:OperationCallExp" location="387:10-387:47" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="387:10-387:19" referredVariable="//@elements.18/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="387:32-387:46" name="IterateExp"> - <model href="temp#/1"/> + <model href="new-model#/125"/> </arguments> </condition> <elseExpression xsi:type="ocl:SequenceExp" location="400:7-400:17"/> @@ -1167,25 +1542,90 @@ </feature> <context_ location="345:8-345:33"> <context_ xsi:type="ocl:OclModelElement" location="345:16-345:33" name="OclExpression"> - <model href="temp#/1"/> + <model href="new-model#/114"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="462:1-475:8"> + <commentsBefore>-- This helper computes a sequence containing the VariableDeclarations that are</commentsBefore> + <commentsBefore>-- defined lower than the contextual OclExpression in its namespace tree.</commentsBefore> + <commentsBefore>-- If the contextual OclExpression is a LetExp, the helper returns a sequence</commentsBefore> + <commentsBefore>-- composed of the LetExp variable and the result of its recursive call on the</commentsBefore> + <commentsBefore>-- "in_" reference of the LetExp.</commentsBefore> + <commentsBefore>-- Otherwise, if the contextual OclExpression is a IfExp, the helper returns a</commentsBefore> + <commentsBefore>-- sequence composed of the results of its recursive calls on the "condition",</commentsBefore> + <commentsBefore>-- "thenExpression" and "elseExpression" references of the IfExp.</commentsBefore> + <commentsBefore>-- Otherwise, if the contextual OclExpression is an IteratorExp, the helper</commentsBefore> + <commentsBefore>-- returns a sequence composed of the IteratorExp iterators along with the</commentsBefore> + <commentsBefore>-- results of its recursive calls on the "source" and the "body" references</commentsBefore> + <commentsBefore>-- of the IteratorExp.</commentsBefore> + <commentsBefore>-- Otherwise, if the contextual OclExpression is an IterateExp, the helper</commentsBefore> + <commentsBefore>-- returns the sequence returned for an IteratorExp with its additional result</commentsBefore> + <commentsBefore>-- element.</commentsBefore> + <commentsBefore>-- Otherwise, the helper returns an empty sequence as default value.</commentsBefore> + <commentsBefore>-- CONTEXT:	ATL!OclExpression</commentsBefore> + <commentsBefore>-- RETURN:	Sequence(ATL!VariableDeclaration)</commentsBefore> + <commentsBefore>--helper context ATL!OclExpression</commentsBefore> + <commentsBefore>--	def: getDownD() : Sequence(ATL!VariableDeclaration) =</commentsBefore> + <commentsBefore>--	if self.oclIsTypeOf(ATL!LetExp) then</commentsBefore> + <commentsBefore>--		Sequence{</commentsBefore> + <commentsBefore>--			self.variable,</commentsBefore> + <commentsBefore>--			self.in_.getDownD()</commentsBefore> + <commentsBefore>--		}->flatten()</commentsBefore> + <commentsBefore>--	else if self.oclIsTypeOf(ATL!IfExp) then</commentsBefore> + <commentsBefore>--		Sequence{</commentsBefore> + <commentsBefore>--			self.condition.getDownD(),</commentsBefore> + <commentsBefore>--			self.thenExpression.getDownD(),</commentsBefore> + <commentsBefore>--			self.elseExpression.getDownD()</commentsBefore> + <commentsBefore>--		}->flatten()</commentsBefore> + <commentsBefore>--	else if self.oclIsTypeOf(ATL!IteratorExp) then</commentsBefore> + <commentsBefore>--		Sequence{</commentsBefore> + <commentsBefore>--			self.iterators,</commentsBefore> + <commentsBefore>--			self.source.getDownD(),</commentsBefore> + <commentsBefore>--			self.body.getDownD()</commentsBefore> + <commentsBefore>--		}->flatten()</commentsBefore> + <commentsBefore>--	else if self.oclIsTypeOf(ATL!IterateExp) then</commentsBefore> + <commentsBefore>--		Sequence{</commentsBefore> + <commentsBefore>--			self.iterators,</commentsBefore> + <commentsBefore>--			self.result,</commentsBefore> + <commentsBefore>--			self.source.getDownD(),</commentsBefore> + <commentsBefore>--			self.body.getDownD()</commentsBefore> + <commentsBefore>--		}->flatten()</commentsBefore> + <commentsBefore>--	else Sequence{}</commentsBefore> + <commentsBefore>--	endif endif endif endif;</commentsBefore> + <commentsBefore>-- This helper returns the root composite (container) of the contextual</commentsBefore> + <commentsBefore>-- OclExpression. For this purpose, the helper first computes the immediate</commentsBefore> + <commentsBefore>-- composite of the contextual OclExpression.</commentsBefore> + <commentsBefore>-- If this container is undefined, the helper returns OclUndefined.</commentsBefore> + <commentsBefore>-- Otherwise, if it is a kind of OclExpression, the helper returns the value</commentsBefore> + <commentsBefore>-- provided by its recursive call on the computed container.</commentsBefore> + <commentsBefore>-- Finally, if this container is not an OclExpression, the root composite has</commentsBefore> + <commentsBefore>-- been reached (Binding/InPattern/Operation/Query/Attribute) and is returned.</commentsBefore> + <commentsBefore>-- CONTEXT:	ATL!OclExpression</commentsBefore> + <commentsBefore>-- RETURN:	ATL!Element</commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- Rule 'FreeVariableIsSelfOrThisModule'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each VariableDeclaration that has</commentsAfter> + <commentsAfter>-- no composite, and whose name is different from both 'self' and 'thisModule'.</commentsAfter> + <commentsAfter>-- The VariableExps that have not been previously declared in an ATL file are</commentsAfter> + <commentsAfter>-- associated with a new VariableDeclaration without any composite in the</commentsAfter> + <commentsAfter>-- correspoding ATL model.</commentsAfter> <definition location="462:8-475:7"> <feature xsi:type="ocl:Operation" location="462:39-475:7" name="getRootComposite"> <returnType xsi:type="ocl:OclModelElement" location="462:60-462:71" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/128"/> </returnType> <body xsi:type="ocl:LetExp" location="463:2-475:7"> <variable location="463:6-463:55" varName="container" variableExp="//@elements.19/@definition/@feature/@body/@in_/@condition/@source //@elements.19/@definition/@feature/@body/@in_/@elseExpression/@condition/@source //@elements.19/@definition/@feature/@body/@in_/@elseExpression/@thenExpression/@source //@elements.19/@definition/@feature/@body/@in_/@elseExpression/@elseExpression"> <type xsi:type="ocl:OclModelElement" location="463:18-463:29" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/129"/> </type> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="463:32-463:55" name="immediateComposite"> <source xsi:type="ocl:VariableExp" location="463:32-463:36"> - <referredVariable href="temp#/77"/> + <referredVariable href="new-model#/130"/> </source> </initExpression> </variable> @@ -1201,7 +1641,7 @@ <condition xsi:type="ocl:OperationCallExp" location="469:6-469:46" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="469:6-469:15" referredVariable="//@elements.19/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="469:28-469:45" name="OclExpression"> - <model href="temp#/1"/> + <model href="new-model#/131"/> </arguments> </condition> <elseExpression xsi:type="ocl:VariableExp" location="473:4-473:13" referredVariable="//@elements.19/@definition/@feature/@body/@variable"/> @@ -1211,16 +1651,28 @@ </feature> <context_ location="462:8-462:33"> <context_ xsi:type="ocl:OclModelElement" location="462:16-462:33" name="OclExpression"> - <model href="temp#/1"/> + <model href="new-model#/127"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="488:1-506:2" name="FreeVariableIsSelfOrThisModule"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- Rule 'FreeVariableIsSelfOrThisModule'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each VariableDeclaration that has</commentsBefore> + <commentsBefore>-- no composite, and whose name is different from both 'self' and 'thisModule'.</commentsBefore> + <commentsBefore>-- The VariableExps that have not been previously declared in an ATL file are</commentsBefore> + <commentsBefore>-- associated with a new VariableDeclaration without any composite in the</commentsBefore> + <commentsBefore>-- correspoding ATL model.</commentsBefore> + <commentsAfter>-- Rule 'ModelNameIsUnique'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem when there exists models that have</commentsAfter> + <commentsAfter>-- the same name that the checked model.</commentsAfter> <outPattern location="494:2-505:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="495:3-505:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="495:7-495:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/133"/> </type> <bindings location="496:4-496:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="496:16-496:22" name="error"/> @@ -1260,7 +1712,7 @@ <inPattern location="489:2-493:4"> <elements xsi:type="atl:SimpleInPatternElement" location="490:3-490:30" varName="s" variableExp="//@elements.20/@inPattern/@filter/@source/@source/@source/@source //@elements.20/@inPattern/@filter/@source/@arguments.0/@source/@source //@elements.20/@inPattern/@filter/@arguments.0/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@condition/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@thenExpression/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@elseExpression/@source/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="490:7-490:30" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/132"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="491:4-492:53" operationName="and"> @@ -1287,10 +1739,16 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="511:1-522:2" name="ModelNameIsUnique"> + <commentsBefore>-- Rule 'ModelNameIsUnique'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem when there exists models that have</commentsBefore> + <commentsBefore>-- the same name that the checked model.</commentsBefore> + <commentsAfter>-- Rule 'RuleNameIsUnique'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem when there exists rules that have</commentsAfter> + <commentsAfter>-- the same name that the checked rule.</commentsAfter> <outPattern location="516:2-521:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="517:3-521:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="517:7-517:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/136"/> </type> <bindings location="518:4-518:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="518:16-518:22" name="error"/> @@ -1316,13 +1774,13 @@ <inPattern location="512:2-515:4"> <elements xsi:type="atl:SimpleInPatternElement" location="513:3-513:19" varName="s" variableExp="//@elements.21/@inPattern/@filter/@body/@source/@arguments.0/@source //@elements.21/@inPattern/@filter/@body/@arguments.0/@arguments.0 //@elements.21/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.21/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="513:7-513:19" name="OclModel"> - <model href="temp#/1"/> + <model href="new-model#/134"/> </type> </elements> <filter xsi:type="ocl:IteratorExp" location="514:4-514:64" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="514:4-514:24" name="allModels"> <source xsi:type="ocl:VariableExp" location="514:4-514:14"> - <referredVariable href="temp#/78"/> + <referredVariable href="new-model#/135"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="514:37-514:63" operationName="and"> @@ -1344,10 +1802,18 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="527:1-538:2" name="RuleNameIsUnique"> + <commentsBefore>-- Rule 'RuleNameIsUnique'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem when there exists rules that have</commentsBefore> + <commentsBefore>-- the same name that the checked rule.</commentsBefore> + <commentsAfter>-- Rule 'HelperSignatureIsUnique'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem when there exists helpers that have</commentsAfter> + <commentsAfter>-- the same signature that the checked helper.</commentsAfter> + <commentsAfter>-- Note that in current implementation, the helper signature corresponds to the</commentsAfter> + <commentsAfter>-- name and the context of the helper.</commentsAfter> <outPattern location="532:2-537:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="533:3-537:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="533:7-533:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/139"/> </type> <bindings location="534:4-534:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="534:16-534:22" name="error"/> @@ -1373,13 +1839,13 @@ <inPattern location="528:2-531:4"> <elements xsi:type="atl:SimpleInPatternElement" location="529:3-529:15" varName="s" variableExp="//@elements.22/@inPattern/@filter/@body/@source/@arguments.0/@source //@elements.22/@inPattern/@filter/@body/@arguments.0/@arguments.0 //@elements.22/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.22/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="529:7-529:15" name="Rule"> - <model href="temp#/1"/> + <model href="new-model#/137"/> </type> </elements> <filter xsi:type="ocl:IteratorExp" location="530:4-530:63" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="530:4-530:23" name="allRules"> <source xsi:type="ocl:VariableExp" location="530:4-530:14"> - <referredVariable href="temp#/79"/> + <referredVariable href="new-model#/138"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="530:36-530:62" operationName="and"> @@ -1401,10 +1867,18 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="545:1-584:2" name="HelperSignatureIsUnique"> + <commentsBefore>-- Rule 'HelperSignatureIsUnique'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem when there exists helpers that have</commentsBefore> + <commentsBefore>-- the same signature that the checked helper.</commentsBefore> + <commentsBefore>-- Note that in current implementation, the helper signature corresponds to the</commentsBefore> + <commentsBefore>-- name and the context of the helper.</commentsBefore> + <commentsAfter>-- Rule 'BindingNameIsUniqueInPattern'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem when there exists, in a same pattern,</commentsAfter> + <commentsAfter>-- bindings that have the same name that the checked binding.</commentsAfter> <outPattern location="577:2-583:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="578:3-583:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="578:7-578:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/142"/> </type> <bindings location="579:4-579:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="579:16-579:22" name="error"/> @@ -1434,13 +1908,13 @@ <inPattern location="546:2-576:4"> <elements xsi:type="atl:SimpleInPatternElement" location="547:3-547:17" varName="s" variableExp="//@elements.23/@inPattern/@filter/@body/@source/@source/@arguments.0 //@elements.23/@inPattern/@filter/@body/@source/@arguments.0/@source/@source/@source/@source //@elements.23/@inPattern/@filter/@body/@arguments.0/@condition/@source/@source/@source/@source //@elements.23/@inPattern/@filter/@body/@arguments.0/@thenExpression/@thenExpression/@condition/@source/@source/@source/@source/@source/@source //@elements.23/@inPattern/@filter/@body/@arguments.0/@thenExpression/@thenExpression/@thenExpression/@thenExpression/@source/@source/@source/@source/@source //@elements.23/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.23/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="547:7-547:17" name="Helper"> - <model href="temp#/1"/> + <model href="new-model#/140"/> </type> </elements> <filter xsi:type="ocl:IteratorExp" location="548:4-575:6" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="548:4-548:25" name="allHelpers"> <source xsi:type="ocl:VariableExp" location="548:4-548:14"> - <referredVariable href="temp#/80"/> + <referredVariable href="new-model#/141"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="550:6-574:8" operationName="and"> @@ -1564,10 +2038,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="589:1-602:2" name="BindingNameIsUniqueInPattern"> + <commentsBefore>-- Rule 'BindingNameIsUniqueInPattern'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem when there exists, in a same pattern,</commentsBefore> + <commentsBefore>-- bindings that have the same name that the checked binding.</commentsBefore> + <commentsAfter>-- Rule 'PatternNameIsUniqueInRule'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem when there exists, in a same rule,</commentsAfter> + <commentsAfter>-- some named elements (InPatternElement/OutPatternElement/</commentsAfter> + <commentsAfter>-- RuleVariableDeclaration) that have the same name that the checked pattern.</commentsAfter> <outPattern location="595:2-601:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="596:3-601:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="596:7-596:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/144"/> </type> <bindings location="597:4-597:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="597:16-597:22" name="error"/> @@ -1593,7 +2074,7 @@ <inPattern location="590:2-594:4"> <elements xsi:type="atl:SimpleInPatternElement" location="591:3-591:18" varName="s" variableExp="//@elements.24/@inPattern/@filter/@source/@source/@source //@elements.24/@inPattern/@filter/@body/@source/@arguments.0/@source //@elements.24/@inPattern/@filter/@body/@arguments.0/@arguments.0 //@elements.24/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.24/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="591:7-591:18" name="Binding"> - <model href="temp#/1"/> + <model href="new-model#/143"/> </type> </elements> <filter xsi:type="ocl:IteratorExp" location="592:4-593:61" name="exists"> @@ -1621,10 +2102,19 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="608:1-622:2" name="PatternNameIsUniqueInRule"> + <commentsBefore>-- Rule 'PatternNameIsUniqueInRule'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem when there exists, in a same rule,</commentsBefore> + <commentsBefore>-- some named elements (InPatternElement/OutPatternElement/</commentsBefore> + <commentsBefore>-- RuleVariableDeclaration) that have the same name that the checked pattern.</commentsBefore> + <commentsAfter>-- Rule 'VariableNameIsUniqueInRule'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem when there exists, in a same rule,</commentsAfter> + <commentsAfter>-- some named elements (InPatternElement/OutPatternElement/</commentsAfter> + <commentsAfter>-- RuleVariableDeclaration) that have the same name that the checked rule</commentsAfter> + <commentsAfter>-- variable declaration.</commentsAfter> <outPattern location="614:2-621:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="615:3-621:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="615:7-615:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/146"/> </type> <bindings location="616:4-616:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="616:16-616:22" name="error"/> @@ -1650,7 +2140,7 @@ <inPattern location="609:2-613:4"> <elements xsi:type="atl:SimpleInPatternElement" location="610:3-610:25" varName="s" variableExp="//@elements.25/@inPattern/@filter/@source/@source/@source //@elements.25/@inPattern/@filter/@body/@source/@arguments.0/@source //@elements.25/@inPattern/@filter/@body/@arguments.0/@arguments.0 //@elements.25/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.25/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="610:7-610:25" name="PatternElement"> - <model href="temp#/1"/> + <model href="new-model#/145"/> </type> </elements> <filter xsi:type="ocl:IteratorExp" location="611:4-612:51" name="exists"> @@ -1678,10 +2168,20 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="629:1-643:2" name="VariableNameIsUniqueInRule"> + <commentsBefore>-- Rule 'VariableNameIsUniqueInRule'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem when there exists, in a same rule,</commentsBefore> + <commentsBefore>-- some named elements (InPatternElement/OutPatternElement/</commentsBefore> + <commentsBefore>-- RuleVariableDeclaration) that have the same name that the checked rule</commentsBefore> + <commentsBefore>-- variable declaration.</commentsBefore> + <commentsAfter>-- Rule 'NoHelperWithCollectionAsContext'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each Helper defined with a</commentsAfter> + <commentsAfter>-- collection type as context.</commentsAfter> + <commentsAfter>-- Note that this problem is due to the limitations of the current</commentsAfter> + <commentsAfter>-- implementation</commentsAfter> <outPattern location="635:2-642:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="636:3-642:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="636:7-636:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/148"/> </type> <bindings location="637:4-637:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="637:16-637:22" name="error"/> @@ -1707,7 +2207,7 @@ <inPattern location="630:2-634:4"> <elements xsi:type="atl:SimpleInPatternElement" location="631:3-631:34" varName="s" variableExp="//@elements.26/@inPattern/@filter/@source/@source/@source //@elements.26/@inPattern/@filter/@body/@source/@arguments.0/@source //@elements.26/@inPattern/@filter/@body/@arguments.0/@arguments.0 //@elements.26/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.26/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="631:7-631:34" name="RuleVariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/147"/> </type> </elements> <filter xsi:type="ocl:IteratorExp" location="632:4-633:51" name="exists"> @@ -1735,10 +2235,22 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="650:1-670:2" name="NoHelperWithCollectionAsContext"> + <commentsBefore>-- Rule 'NoHelperWithCollectionAsContext'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each Helper defined with a</commentsBefore> + <commentsBefore>-- collection type as context.</commentsBefore> + <commentsBefore>-- Note that this problem is due to the limitations of the current</commentsBefore> + <commentsBefore>-- implementation</commentsBefore> + <commentsAfter>-- Rule 'NoSelfOrThisModuleVariableDeclaration'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each declaration of a variable</commentsAfter> + <commentsAfter>-- named 'self' or 'thisModule' in the ATL program.</commentsAfter> + <commentsAfter>-- Considered variable declarations must have a non-undefined immediate</commentsAfter> + <commentsAfter>-- composite since the input ATL model may already include a 'self' and a</commentsAfter> + <commentsAfter>-- 'thisModule' VD without any immediate composite that correspond to the</commentsAfter> + <commentsAfter>-- global declarations of the 'self' and 'thisModule' variables.</commentsAfter> <outPattern location="661:2-669:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="662:3-669:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="662:7-662:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/151"/> </type> <bindings location="663:4-663:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="663:16-663:22" name="error"/> @@ -1771,7 +2283,7 @@ <inPattern location="651:2-660:4"> <elements xsi:type="atl:SimpleInPatternElement" location="652:3-652:17" varName="s" variableExp="//@elements.27/@inPattern/@filter/@condition/@source/@source/@source //@elements.27/@inPattern/@filter/@elseExpression/@body/@source/@source/@source/@source //@elements.27/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.27/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@arguments.0/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="652:7-652:17" name="Helper"> - <model href="temp#/1"/> + <model href="new-model#/149"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="653:4-659:9"> @@ -1786,7 +2298,7 @@ <elseExpression xsi:type="ocl:IteratorExp" location="657:5-658:54" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="657:5-657:31" name="collectionTypes"> <source xsi:type="ocl:VariableExp" location="657:5-657:15"> - <referredVariable href="temp#/81"/> + <referredVariable href="new-model#/150"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="658:19-658:53" operationName="="> @@ -1805,10 +2317,20 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="679:1-692:2" name="NoSelfOrThisModuleVariableDeclaration"> + <commentsBefore>-- Rule 'NoSelfOrThisModuleVariableDeclaration'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each declaration of a variable</commentsBefore> + <commentsBefore>-- named 'self' or 'thisModule' in the ATL program.</commentsBefore> + <commentsBefore>-- Considered variable declarations must have a non-undefined immediate</commentsBefore> + <commentsBefore>-- composite since the input ATL model may already include a 'self' and a</commentsBefore> + <commentsBefore>-- 'thisModule' VD without any immediate composite that correspond to the</commentsBefore> + <commentsBefore>-- global declarations of the 'self' and 'thisModule' variables.</commentsBefore> + <commentsAfter>-- Rule 'NoSelfVariableInRule'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each 'self' variable expression</commentsAfter> + <commentsAfter>-- that is contained by a rule element.</commentsAfter> <outPattern location="685:2-691:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="686:3-691:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="686:7-686:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/153"/> </type> <bindings location="687:4-687:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="687:16-687:22" name="error"/> @@ -1834,7 +2356,7 @@ <inPattern location="680:2-684:4"> <elements xsi:type="atl:SimpleInPatternElement" location="681:3-681:30" varName="s" variableExp="//@elements.28/@inPattern/@filter/@source/@source/@source/@source //@elements.28/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.28/@inPattern/@filter/@arguments.0/@arguments.0/@source/@source //@elements.28/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.28/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="681:7-681:30" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/152"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="682:4-683:52" operationName="and"> @@ -1863,10 +2385,16 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="697:1-726:2" name="NoSelfVariableInRule"> + <commentsBefore>-- Rule 'NoSelfVariableInRule'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each 'self' variable expression</commentsBefore> + <commentsBefore>-- that is contained by a rule element.</commentsBefore> + <commentsAfter>-- Rule 'NoResolveTempInSourcePattern'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each call of the</commentsAfter> + <commentsAfter>-- 'thisModule.resolveTemp()' operation within a source pattern of a rule.</commentsAfter> <outPattern location="718:2-725:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="719:3-725:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="719:7-719:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/158"/> </type> <bindings location="720:4-720:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="720:16-720:22" name="error"/> @@ -1894,10 +2422,16 @@ <inPattern location="698:2-717:4"> <elements xsi:type="atl:SimpleInPatternElement" location="699:3-699:22" varName="s" variableExp="//@elements.29/@inPattern/@filter/@condition/@source/@source //@elements.29/@inPattern/@filter/@elseExpression/@source/@source/@source/@source //@elements.29/@inPattern/@filter/@elseExpression/@arguments.0/@variable/@initExpression/@source //@elements.29/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.29/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="699:7-699:22" name="VariableExp"> - <model href="temp#/1"/> + <model href="new-model#/154"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="706:4-716:9"> + <commentsBefore>--			s.referredVariable.varName = 'self' and </commentsBefore> + <commentsBefore>--			(</commentsBefore> + <commentsBefore>--				let rComp : ATL!Element = s.getRootComposite() in</commentsBefore> + <commentsBefore>--				rComp.oclIsTypeOf(ATL!Binding) or</commentsBefore> + <commentsBefore>--				rComp.oclIsTypeOf(ATL!InPattern)</commentsBefore> + <commentsBefore>--			)</commentsBefore> <thenExpression xsi:type="ocl:BooleanExp" location="708:5-708:10"/> <condition xsi:type="ocl:OperationCallExp" location="706:7-706:42" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="706:7-706:25" name="referredVariable"> @@ -1916,7 +2450,7 @@ <arguments xsi:type="ocl:LetExp" location="712:6-714:38"> <variable location="712:10-712:52" varName="rComp" variableExp="//@elements.29/@inPattern/@filter/@elseExpression/@arguments.0/@in_/@source/@source //@elements.29/@inPattern/@filter/@elseExpression/@arguments.0/@in_/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="712:18-712:29" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/155"/> </type> <initExpression xsi:type="ocl:OperationCallExp" location="712:32-712:52" operationName="getRootComposite"> <source xsi:type="ocl:VariableExp" location="712:32-712:33" referredVariable="//@elements.29/@inPattern/@elements.0"/> @@ -1926,13 +2460,13 @@ <source xsi:type="ocl:OperationCallExp" location="713:6-713:36" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="713:6-713:11" referredVariable="//@elements.29/@inPattern/@filter/@elseExpression/@arguments.0/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="713:24-713:35" name="Binding"> - <model href="temp#/1"/> + <model href="new-model#/156"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="714:6-714:38" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="714:6-714:11" referredVariable="//@elements.29/@inPattern/@filter/@elseExpression/@arguments.0/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="714:24-714:37" name="InPattern"> - <model href="temp#/1"/> + <model href="new-model#/157"/> </arguments> </arguments> </in_> @@ -1942,10 +2476,16 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="731:1-759:2" name="NoResolveTempInSourcePattern"> + <commentsBefore>-- Rule 'NoResolveTempInSourcePattern'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each call of the</commentsBefore> + <commentsBefore>-- 'thisModule.resolveTemp()' operation within a source pattern of a rule.</commentsBefore> + <commentsAfter>-- Rule 'NoResolveTempInModuleAttribute'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each call of the</commentsAfter> + <commentsAfter>-- 'thisModule.resolveTemp()' operation within a model attribute.</commentsAfter> <outPattern location="750:2-758:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="751:3-758:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="751:7-751:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/162"/> </type> <bindings location="752:4-752:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="752:16-752:22" name="error"/> @@ -1978,7 +2518,7 @@ <inPattern location="732:2-749:4"> <elements xsi:type="atl:SimpleInPatternElement" location="733:3-733:27" varName="s" variableExp="//@elements.30/@inPattern/@filter/@source/@source/@source/@source //@elements.30/@inPattern/@filter/@source/@arguments.0/@condition/@source/@source //@elements.30/@inPattern/@filter/@source/@arguments.0/@thenExpression/@condition/@source/@source/@source //@elements.30/@inPattern/@filter/@source/@arguments.0/@thenExpression/@elseExpression/@source/@source/@source/@source //@elements.30/@inPattern/@filter/@arguments.0/@source/@source //@elements.30/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.30/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@arguments.0/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="733:7-733:27" name="OperationCallExp"> - <model href="temp#/1"/> + <model href="new-model#/159"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="734:4-748:51" operationName="and"> @@ -2015,7 +2555,7 @@ <source xsi:type="ocl:VariableExp" location="736:8-736:9" referredVariable="//@elements.30/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="736:29-736:44" name="VariableExp"> - <model href="temp#/1"/> + <model href="new-model#/160"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="745:6-745:11"/> @@ -2026,17 +2566,23 @@ <source xsi:type="ocl:VariableExp" location="748:4-748:5" referredVariable="//@elements.30/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="748:37-748:50" name="InPattern"> - <model href="temp#/1"/> + <model href="new-model#/161"/> </arguments> </arguments> </filter> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="764:1-792:2" name="NoResolveTempInModuleAttribute"> + <commentsBefore>-- Rule 'NoResolveTempInModuleAttribute'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each call of the</commentsBefore> + <commentsBefore>-- 'thisModule.resolveTemp()' operation within a model attribute.</commentsBefore> + <commentsAfter>-- Rule 'ProhibitedMultiIteratorCollectionOperation'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each IteratorExp of the</commentsAfter> + <commentsAfter>-- singleIteratorExps set that is associated with several Iterators.</commentsAfter> <outPattern location="783:2-791:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="784:3-791:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="784:7-784:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/166"/> </type> <bindings location="785:4-785:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="785:16-785:22" name="error"/> @@ -2067,7 +2613,7 @@ <inPattern location="765:2-782:4"> <elements xsi:type="atl:SimpleInPatternElement" location="766:3-766:27" varName="s" variableExp="//@elements.31/@inPattern/@filter/@source/@source/@source/@source //@elements.31/@inPattern/@filter/@source/@arguments.0/@condition/@source/@source //@elements.31/@inPattern/@filter/@source/@arguments.0/@thenExpression/@condition/@source/@source/@source //@elements.31/@inPattern/@filter/@source/@arguments.0/@thenExpression/@elseExpression/@source/@source/@source/@source //@elements.31/@inPattern/@filter/@arguments.0/@source/@source //@elements.31/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.31/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@arguments.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="766:7-766:27" name="OperationCallExp"> - <model href="temp#/1"/> + <model href="new-model#/163"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="767:4-781:51" operationName="and"> @@ -2104,7 +2650,7 @@ <source xsi:type="ocl:VariableExp" location="769:8-769:9" referredVariable="//@elements.31/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="769:29-769:44" name="VariableExp"> - <model href="temp#/1"/> + <model href="new-model#/164"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="778:6-778:11"/> @@ -2115,17 +2661,24 @@ <source xsi:type="ocl:VariableExp" location="781:4-781:5" referredVariable="//@elements.31/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="781:37-781:50" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/165"/> </arguments> </arguments> </filter> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="797:1-811:2" name="ProhibitedMultiIteratorCollectionOperation"> + <commentsBefore>-- Rule 'ProhibitedMultiIteratorCollectionOperation'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each IteratorExp of the</commentsBefore> + <commentsBefore>-- singleIteratorExps set that is associated with several Iterators.</commentsBefore> + <commentsAfter>-- Rule 'UnsupportedMultiIteratorCollectionOperation'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each IteratorExp of the</commentsAfter> + <commentsAfter>-- multiIteratorExps set that is associated with several Iterators.</commentsAfter> + <commentsAfter>-- Note that this problem is due to limitations of the current implementation.</commentsAfter> <outPattern location="803:2-810:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="804:3-810:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="804:7-804:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/169"/> </type> <bindings location="805:4-805:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="805:16-805:22" name="error"/> @@ -2151,14 +2704,14 @@ <inPattern location="798:2-802:4"> <elements xsi:type="atl:SimpleInPatternElement" location="799:3-799:22" varName="s" variableExp="//@elements.32/@inPattern/@filter/@source/@body/@source/@source //@elements.32/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.32/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.32/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="799:7-799:22" name="IteratorExp"> - <model href="temp#/1"/> + <model href="new-model#/167"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="800:4-801:27" operationName="and"> <source xsi:type="ocl:IteratorExp" location="800:4-800:57" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="800:4-800:33" name="singleIteratorExps"> <source xsi:type="ocl:VariableExp" location="800:4-800:14"> - <referredVariable href="temp#/82"/> + <referredVariable href="new-model#/168"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="800:46-800:56" operationName="="> @@ -2181,10 +2734,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="817:1-831:2" name="UnsupportedMultiIteratorCollectionOperation"> + <commentsBefore>-- Rule 'UnsupportedMultiIteratorCollectionOperation'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each IteratorExp of the</commentsBefore> + <commentsBefore>-- multiIteratorExps set that is associated with several Iterators.</commentsBefore> + <commentsBefore>-- Note that this problem is due to limitations of the current implementation.</commentsBefore> + <commentsAfter>-- Rule 'ParameterNameIsUniqueInOperation'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each parameter for which there</commentsAfter> + <commentsAfter>-- exists another parameter of the same name in the operation declaration.</commentsAfter> <outPattern location="823:2-830:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="824:3-830:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="824:7-824:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/172"/> </type> <bindings location="825:4-825:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="825:16-825:22" name="error"/> @@ -2210,14 +2770,14 @@ <inPattern location="818:2-822:4"> <elements xsi:type="atl:SimpleInPatternElement" location="819:3-819:22" varName="s" variableExp="//@elements.33/@inPattern/@filter/@source/@body/@source/@source //@elements.33/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.33/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.33/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="819:7-819:22" name="IteratorExp"> - <model href="temp#/1"/> + <model href="new-model#/170"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="820:4-821:27" operationName="and"> <source xsi:type="ocl:IteratorExp" location="820:4-820:56" name="exists"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="820:4-820:32" name="multiIteratorExps"> <source xsi:type="ocl:VariableExp" location="820:4-820:14"> - <referredVariable href="temp#/83"/> + <referredVariable href="new-model#/171"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="820:45-820:55" operationName="="> @@ -2240,10 +2800,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="836:1-853:2" name="ParameterNameIsUniqueInOperation"> + <commentsBefore>-- Rule 'ParameterNameIsUniqueInOperation'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each parameter for which there</commentsBefore> + <commentsBefore>-- exists another parameter of the same name in the operation declaration.</commentsBefore> + <commentsAfter>-- Rule 'IteratorNameIsUniqueInLoop'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each Iterator declaration for</commentsAfter> + <commentsAfter>-- which there exists either another Iterator or a result variable declaration</commentsAfter> + <commentsAfter>-- (for Iterate loop only) of the same name within the same loop definition.</commentsAfter> <outPattern location="845:2-852:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="846:3-852:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="846:7-846:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/174"/> </type> <bindings location="847:4-847:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="847:16-847:22" name="error"/> @@ -2269,7 +2836,7 @@ <inPattern location="837:2-844:4"> <elements xsi:type="atl:SimpleInPatternElement" location="838:3-838:20" varName="s" variableExp="//@elements.34/@inPattern/@filter/@source/@source/@source/@source //@elements.34/@inPattern/@filter/@source/@body/@source/@source/@source //@elements.34/@inPattern/@filter/@source/@body/@arguments.0/@source //@elements.34/@inPattern/@filter/@arguments.0/@source/@source/@source/@source/@source //@elements.34/@inPattern/@filter/@arguments.0/@source/@source/@arguments.0/@source/@source //@elements.34/@inPattern/@filter/@arguments.0/@source/@arguments.0/@source/@source //@elements.34/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.34/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="838:7-838:20" name="Parameter"> - <model href="temp#/1"/> + <model href="new-model#/173"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="839:4-843:5" operationName="and"> @@ -2322,10 +2889,18 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="859:1-880:2" name="VariableNameIsUniqueInLoop"> + <commentsBefore>-- Rule 'IteratorNameIsUniqueInLoop'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each Iterator declaration for</commentsBefore> + <commentsBefore>-- which there exists either another Iterator or a result variable declaration</commentsBefore> + <commentsBefore>-- (for Iterate loop only) of the same name within the same loop definition.</commentsBefore> + <commentsAfter>-- Rule 'ResultNameIsUniqueInIterate'</commentsAfter> + <commentsAfter>-- This rule generates an 'error' Problem for each 'result' variable</commentsAfter> + <commentsAfter>-- declaration of an IterateExp for which there exists an Iterator variable of</commentsAfter> + <commentsAfter>-- the same name in the Iterate loop definition.</commentsAfter> <outPattern location="872:2-879:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="873:3-879:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="873:7-873:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/177"/> </type> <bindings location="874:4-874:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="874:16-874:22" name="error"/> @@ -2351,7 +2926,7 @@ <inPattern location="860:2-871:4"> <elements xsi:type="atl:SimpleInPatternElement" location="861:3-861:19" varName="s" variableExp="//@elements.35/@inPattern/@filter/@source/@source/@source/@source //@elements.35/@inPattern/@filter/@source/@body/@source/@source/@source //@elements.35/@inPattern/@filter/@source/@body/@arguments.0/@source //@elements.35/@inPattern/@filter/@arguments.0/@condition/@source/@source //@elements.35/@inPattern/@filter/@arguments.0/@thenExpression/@source/@source/@source/@source //@elements.35/@inPattern/@filter/@arguments.0/@thenExpression/@arguments.0/@source //@elements.35/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.35/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="861:7-861:19" name="Iterator"> - <model href="temp#/1"/> + <model href="new-model#/175"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="862:4-870:9" operationName="or"> @@ -2395,7 +2970,7 @@ <source xsi:type="ocl:VariableExp" location="865:7-865:8" referredVariable="//@elements.35/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="865:30-865:44" name="IterateExp"> - <model href="temp#/1"/> + <model href="new-model#/176"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="869:5-869:10"/> @@ -2404,10 +2979,19 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="886:1-905:2" name="ResultNameIsUniqueInIterate"> + <commentsBefore>-- Rule 'ResultNameIsUniqueInIterate'</commentsBefore> + <commentsBefore>-- This rule generates an 'error' Problem for each 'result' variable</commentsBefore> + <commentsBefore>-- declaration of an IterateExp for which there exists an Iterator variable of</commentsBefore> + <commentsBefore>-- the same name in the Iterate loop definition.</commentsBefore> + <commentsAfter>-- Rule 'VariableNameIsUniqueInContainer'</commentsAfter> + <commentsAfter>-- This rule generates a 'warning' Problem for each declaration of a variable</commentsAfter> + <commentsAfter>-- for which there exists another variable declaration of the same name in the</commentsAfter> + <commentsAfter>-- same namespace (except multiple intances of an Iterator name in a same loop</commentsAfter> + <commentsAfter>-- which handle 'error' Problems).</commentsAfter> <outPattern location="897:2-904:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="898:3-904:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="898:7-898:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/179"/> </type> <bindings location="899:4-899:22" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="899:16-899:22" name="error"/> @@ -2433,7 +3017,7 @@ <inPattern location="887:2-896:4"> <elements xsi:type="atl:SimpleInPatternElement" location="888:3-888:30" varName="s" variableExp="//@elements.36/@inPattern/@filter/@condition/@source/@source //@elements.36/@inPattern/@filter/@elseExpression/@source/@source/@source //@elements.36/@inPattern/@filter/@elseExpression/@body/@source/@source/@source //@elements.36/@inPattern/@filter/@elseExpression/@body/@arguments.0/@source //@elements.36/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.36/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="888:7-888:30" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/178"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="889:4-895:9"> @@ -2469,10 +3053,15 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="912:1-925:2" name="VariableNameIsUniqueInContainer"> + <commentsBefore>-- Rule 'VariableNameIsUniqueInContainer'</commentsBefore> + <commentsBefore>-- This rule generates a 'warning' Problem for each declaration of a variable</commentsBefore> + <commentsBefore>-- for which there exists another variable declaration of the same name in the</commentsBefore> + <commentsBefore>-- same namespace (except multiple intances of an Iterator name in a same loop</commentsBefore> + <commentsBefore>-- which handle 'error' Problems).</commentsBefore> <outPattern location="917:2-924:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="918:3-924:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="918:7-918:22" name="Problem"> - <model href="temp#/0"/> + <model href="new-model#/181"/> </type> <bindings location="919:4-919:24" propertyName="severity"> <value xsi:type="ocl:EnumLiteralExp" location="919:16-919:24" name="warning"/> @@ -2498,7 +3087,7 @@ <inPattern location="913:2-916:4"> <elements xsi:type="atl:SimpleInPatternElement" location="914:3-914:30" varName="s" variableExp="//@elements.37/@inPattern/@filter/@source/@source //@elements.37/@inPattern/@filter/@body/@source/@source/@source //@elements.37/@inPattern/@filter/@body/@arguments.0/@source //@elements.37/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.37/@outPattern/@elements.0/@bindings.2/@value/@source/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="914:7-914:30" name="VariableDeclaration"> - <model href="temp#/1"/> + <model href="new-model#/180"/> </type> </elements> <filter xsi:type="ocl:IteratorExp" location="915:4-915:69" name="exists"> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/Ant2Maven/Ant2Maven.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/Ant2Maven/Ant2Maven.atl.xmi index a1bbf80b..0830bcbe 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/Ant2Maven/Ant2Maven.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/Ant2Maven/Ant2Maven.atl.xmi @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-352:2" name="Ant2Maven"> <inModels location="2:63-2:71" name="IN"> - <metamodel href="temp#/2"/> + <metamodel href="new-model#/2"/> </inModels> <outModels location="2:8-2:29" name="OUTMaven"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <outModels location="2:31-2:56" name="OUTProject"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </outModels> <elements xsi:type="atl:MatchedRule" location="7:1-38:2" name="AntProject2Maven"> <commentsBefore>-- central element : Project</commentsBefore> @@ -17,7 +17,7 @@ <commentsBefore>-- for MavenProject</commentsBefore> <elements xsi:type="atl:SimpleOutPatternElement" location="15:6-20:6" varName="mp"> <type xsi:type="ocl:OclModelElement" location="15:11-15:31" name="Project"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </type> <bindings location="16:8-16:20" propertyName="id"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="16:14-16:20" name="name"> @@ -40,7 +40,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="21:5-24:6" varName="mpBuild" variableExp="//@elements.0/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="21:15-21:33" name="Build"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </type> <bindings location="22:5-22:33" propertyName="sourceDirectory"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="22:24-22:33" name="basedir"> @@ -58,7 +58,7 @@ <elements xsi:type="atl:SimpleOutPatternElement" location="26:4-33:7" varName="mm"> <commentsBefore>-- for MavenMaven</commentsBefore> <type xsi:type="ocl:OclModelElement" location="26:9-26:27" name="Project"> - <model href="temp#/0"/> + <model href="new-model#/6"/> </type> <bindings location="27:5-27:22" propertyName="xmlns"> <value xsi:type="ocl:VariableExp" location="27:14-27:22" referredVariable="//@elements.0/@outPattern/@elements.3"/> @@ -91,7 +91,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="34:4-37:5" varName="itsXmlns" variableExp="//@elements.0/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="34:15-34:31" name="Xmlns"> - <model href="temp#/0"/> + <model href="new-model#/7"/> </type> <bindings location="35:5-35:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="35:13-35:18" stringSymbol="ant"/> @@ -105,7 +105,7 @@ <commentsAfter>-- for MavenProject</commentsAfter> <elements xsi:type="atl:SimpleInPatternElement" location="8:8-8:23" varName="a" variableExp="//@elements.0/@inPattern/@filter/@condition/@source/@source //@elements.0/@inPattern/@filter/@elseExpression/@source/@source/@source //@elements.0/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.0/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.0/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.0/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.0/@outPattern/@elements.1/@bindings.1/@value/@source/@source //@elements.0/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.0/@outPattern/@elements.2/@bindings.2/@value/@source //@elements.0/@outPattern/@elements.2/@bindings.3/@value/@source //@elements.0/@outPattern/@elements.2/@bindings.4/@value/@source //@elements.0/@outPattern/@elements.2/@bindings.5/@value/@source"> <type xsi:type="ocl:OclModelElement" location="8:12-8:23" name="Project"> - <model href="temp#/2"/> + <model href="new-model#/3"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="9:3-12:9"> @@ -144,7 +144,7 @@ <commentsBefore>-- for MavenProject</commentsBefore> <elements xsi:type="atl:SimpleOutPatternElement" location="48:6-52:6" varName="mp"> <type xsi:type="ocl:OclModelElement" location="48:11-48:31" name="Project"> - <model href="temp#/1"/> + <model href="new-model#/9"/> </type> <bindings location="49:8-49:20" propertyName="id"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="49:14-49:20" name="name"> @@ -162,7 +162,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="53:5-56:6" varName="mpBuild" variableExp="//@elements.1/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="53:15-53:33" name="Build"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </type> <bindings location="54:5-54:33" propertyName="sourceDirectory"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="54:24-54:33" name="basedir"> @@ -180,7 +180,7 @@ <elements xsi:type="atl:SimpleOutPatternElement" location="58:4-66:7" varName="mm"> <commentsBefore>-- for MavenMaven</commentsBefore> <type xsi:type="ocl:OclModelElement" location="58:9-58:27" name="Project"> - <model href="temp#/0"/> + <model href="new-model#/11"/> </type> <bindings location="59:5-59:22" propertyName="xmlns"> <value xsi:type="ocl:VariableExp" location="59:14-59:22" referredVariable="//@elements.1/@outPattern/@elements.3"/> @@ -217,7 +217,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="67:4-70:5" varName="itsXmlns" variableExp="//@elements.1/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="67:15-67:31" name="Xmlns"> - <model href="temp#/0"/> + <model href="new-model#/12"/> </type> <bindings location="68:5-68:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="68:13-68:18" stringSymbol="ant"/> @@ -231,7 +231,7 @@ <commentsAfter>-- for MavenProject</commentsAfter> <elements xsi:type="atl:SimpleInPatternElement" location="41:8-41:23" varName="a" variableExp="//@elements.1/@inPattern/@filter/@condition/@source/@source //@elements.1/@inPattern/@filter/@elseExpression/@source/@source //@elements.1/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.1/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.1/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.1/@outPattern/@elements.1/@bindings.1/@value/@source/@source //@elements.1/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.1/@outPattern/@elements.2/@bindings.2/@value/@source //@elements.1/@outPattern/@elements.2/@bindings.3/@value/@source //@elements.1/@outPattern/@elements.2/@bindings.4/@value/@source //@elements.1/@outPattern/@elements.2/@bindings.5/@value/@source"> <type xsi:type="ocl:OclModelElement" location="41:12-41:23" name="Project"> - <model href="temp#/2"/> + <model href="new-model#/8"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="42:3-45:9"> @@ -273,7 +273,7 @@ <outPattern location="93:2-99:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="93:5-96:4" varName="mg"> <type xsi:type="ocl:OclModelElement" location="93:10-93:25" name="Goal"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> <bindings location="94:3-94:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="94:11-94:17" name="name"> @@ -291,7 +291,7 @@ </elements> <elements xsi:type="atl:ForEachOutPatternElement" location="97:2-99:3" varName="dependencies" variableExp="//@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="97:26-97:47" name="AttainGoal"> - <model href="temp#/0"/> + <model href="new-model#/16"/> </type> <bindings location="98:3-98:18" propertyName="attainGoal"> <value xsi:type="ocl:VariableExp" location="98:17-98:18" referredVariable="//@elements.2/@outPattern/@elements.1/@iterator"/> @@ -303,7 +303,7 @@ <variables location="91:3-91:68" varName="itsDependencies" variableExp="//@elements.2/@outPattern/@elements.1/@collection"> <type xsi:type="ocl:SequenceType" location="91:21-91:41"> <elementType xsi:type="ocl:OclModelElement" location="91:30-91:40" name="Target"> - <model href="temp#/2"/> + <model href="new-model#/14"/> </elementType> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="91:44-91:67" operationName="asSequence"> @@ -315,7 +315,7 @@ <inPattern location="89:2-89:21"> <elements xsi:type="atl:SimpleInPatternElement" location="89:7-89:21" varName="a" variableExp="//@elements.2/@variables.0/@initExpression/@source/@source //@elements.2/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@source"> <type xsi:type="ocl:OclModelElement" location="89:11-89:21" name="Target"> - <model href="temp#/2"/> + <model href="new-model#/13"/> </type> </elements> </inPattern> @@ -330,7 +330,7 @@ <outPattern location="111:2-114:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="111:5-114:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="111:9-111:36" name="AntPropertyValue"> - <model href="temp#/0"/> + <model href="new-model#/18"/> </type> <bindings location="112:3-112:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="112:11-112:17" name="name"> @@ -347,7 +347,7 @@ <inPattern location="110:2-110:28"> <elements xsi:type="atl:SimpleInPatternElement" location="110:7-110:28" varName="a" variableExp="//@elements.3/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.3/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="110:11-110:28" name="PropertyValue"> - <model href="temp#/2"/> + <model href="new-model#/17"/> </type> </elements> </inPattern> @@ -356,7 +356,7 @@ <outPattern location="119:2-122:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="119:5-122:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="119:9-119:39" name="AntPropertyLocation"> - <model href="temp#/0"/> + <model href="new-model#/20"/> </type> <bindings location="120:3-120:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="120:11-120:17" name="name"> @@ -373,7 +373,7 @@ <inPattern location="118:2-118:31"> <elements xsi:type="atl:SimpleInPatternElement" location="118:7-118:31" varName="a" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.4/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="118:11-118:31" name="PropertyLocation"> - <model href="temp#/2"/> + <model href="new-model#/19"/> </type> </elements> </inPattern> @@ -382,7 +382,7 @@ <outPattern location="128:2-129:18"> <elements xsi:type="atl:SimpleOutPatternElement" location="128:5-129:18" varName="m"> <type xsi:type="ocl:OclModelElement" location="128:9-128:35" name="AntPropertyFile"> - <model href="temp#/0"/> + <model href="new-model#/22"/> </type> <bindings location="129:3-129:17" propertyName="file"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="129:11-129:17" name="file"> @@ -394,7 +394,7 @@ <inPattern location="127:2-127:27"> <elements xsi:type="atl:SimpleInPatternElement" location="127:7-127:27" varName="a" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="127:11-127:27" name="PropertyFile"> - <model href="temp#/2"/> + <model href="new-model#/21"/> </type> </elements> </inPattern> @@ -407,7 +407,7 @@ <outPattern location="134:2-135:32"> <elements xsi:type="atl:SimpleOutPatternElement" location="134:5-135:32" varName="m"> <type xsi:type="ocl:OclModelElement" location="134:9-134:34" name="AntPropertyEnv"> - <model href="temp#/0"/> + <model href="new-model#/24"/> </type> <bindings location="135:3-135:31" propertyName="environment"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="135:18-135:31" name="environment"> @@ -419,7 +419,7 @@ <inPattern location="133:2-133:26"> <elements xsi:type="atl:SimpleInPatternElement" location="133:7-133:26" varName="a" variableExp="//@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="133:11-133:26" name="PropertyEnv"> - <model href="temp#/2"/> + <model href="new-model#/23"/> </type> </elements> </inPattern> @@ -432,7 +432,7 @@ <outPattern location="145:2-150:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="145:5-150:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="145:9-145:24" name="Java"> - <model href="temp#/0"/> + <model href="new-model#/26"/> </type> <bindings location="146:3-146:27" propertyName="classname"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="146:16-146:27" name="classname"> @@ -459,7 +459,7 @@ <inPattern location="144:2-144:19"> <elements xsi:type="atl:SimpleInPatternElement" location="144:7-144:19" varName="a" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="144:11-144:19" name="Java"> - <model href="temp#/2"/> + <model href="new-model#/25"/> </type> </elements> </inPattern> @@ -468,7 +468,7 @@ <outPattern location="155:2-160:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="155:5-160:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="155:9-155:25" name="Javac"> - <model href="temp#/0"/> + <model href="new-model#/28"/> </type> <bindings location="156:3-156:23" propertyName="destdir"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="156:14-156:23" name="destdir"> @@ -495,7 +495,7 @@ <inPattern location="154:2-154:20"> <elements xsi:type="atl:SimpleInPatternElement" location="154:7-154:20" varName="a" variableExp="//@elements.8/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.8/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.8/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.8/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="154:11-154:20" name="Javac"> - <model href="temp#/2"/> + <model href="new-model#/27"/> </type> </elements> </inPattern> @@ -506,7 +506,7 @@ <outPattern location="165:2-174:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="165:5-174:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="165:9-165:27" name="Javadoc"> - <model href="temp#/0"/> + <model href="new-model#/30"/> </type> <bindings location="166:4-166:30" propertyName="sourcepath"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="166:18-166:30" name="sourcepath"> @@ -553,7 +553,7 @@ <inPattern location="164:2-164:22"> <elements xsi:type="atl:SimpleInPatternElement" location="164:7-164:22" varName="a" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.5/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.6/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.7/@value/@source"> <type xsi:type="ocl:OclModelElement" location="164:11-164:22" name="Javadoc"> - <model href="temp#/2"/> + <model href="new-model#/29"/> </type> </elements> </inPattern> @@ -566,14 +566,14 @@ <outPattern location="181:2-181:28"> <elements xsi:type="atl:SimpleOutPatternElement" location="181:5-181:28" varName="m"> <type xsi:type="ocl:OclModelElement" location="181:9-181:26" name="Tstamp"> - <model href="temp#/0"/> + <model href="new-model#/32"/> </type> </elements> </outPattern> <inPattern location="180:5-180:24"> <elements xsi:type="atl:SimpleInPatternElement" location="180:10-180:24" varName="a"> <type xsi:type="ocl:OclModelElement" location="180:14-180:24" name="Tstamp"> - <model href="temp#/2"/> + <model href="new-model#/31"/> </type> </elements> </inPattern> @@ -586,7 +586,7 @@ <outPattern location="188:2-190:24"> <elements xsi:type="atl:SimpleOutPatternElement" location="188:5-190:24" varName="m"> <type xsi:type="ocl:OclModelElement" location="188:9-188:23" name="Jar"> - <model href="temp#/0"/> + <model href="new-model#/34"/> </type> <bindings location="189:3-189:23" propertyName="jarfile"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="189:14-189:23" name="jarfile"> @@ -603,7 +603,7 @@ <inPattern location="187:2-187:18"> <elements xsi:type="atl:SimpleInPatternElement" location="187:7-187:18" varName="a" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.11/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="187:11-187:18" name="Jar"> - <model href="temp#/2"/> + <model href="new-model#/33"/> </type> </elements> </inPattern> @@ -614,7 +614,7 @@ <outPattern location="197:2-198:16"> <elements xsi:type="atl:SimpleOutPatternElement" location="197:5-198:16" varName="m"> <type xsi:type="ocl:OclModelElement" location="197:9-197:25" name="Mkdir"> - <model href="temp#/0"/> + <model href="new-model#/36"/> </type> <bindings location="198:3-198:15" propertyName="dir"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="198:10-198:15" name="dir"> @@ -626,7 +626,7 @@ <inPattern location="196:2-196:20"> <elements xsi:type="atl:SimpleInPatternElement" location="196:7-196:20" varName="a" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="196:11-196:20" name="Mkdir"> - <model href="temp#/2"/> + <model href="new-model#/35"/> </type> </elements> </inPattern> @@ -635,7 +635,7 @@ <outPattern location="203:2-207:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="203:5-207:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="203:9-203:24" name="Copy"> - <model href="temp#/0"/> + <model href="new-model#/38"/> </type> <bindings location="204:3-204:19" propertyName="todir"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="204:12-204:19" name="todir"> @@ -657,7 +657,7 @@ <inPattern location="202:2-202:19"> <elements xsi:type="atl:SimpleInPatternElement" location="202:7-202:19" varName="a" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.13/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.13/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="202:11-202:19" name="Copy"> - <model href="temp#/2"/> + <model href="new-model#/37"/> </type> </elements> </inPattern> @@ -668,7 +668,7 @@ <outPattern location="213:2-214:16"> <elements xsi:type="atl:SimpleOutPatternElement" location="213:5-214:16" varName="m"> <type xsi:type="ocl:OclModelElement" location="213:9-213:26" name="Delete"> - <model href="temp#/0"/> + <model href="new-model#/40"/> </type> <bindings location="214:3-214:15" propertyName="dir"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="214:10-214:15" name="dir"> @@ -680,7 +680,7 @@ <inPattern location="212:2-212:21"> <elements xsi:type="atl:SimpleInPatternElement" location="212:7-212:21" varName="a" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="212:11-212:21" name="Delete"> - <model href="temp#/2"/> + <model href="new-model#/39"/> </type> </elements> </inPattern> @@ -691,7 +691,7 @@ <outPattern location="221:2-224:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="221:5-224:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="221:9-221:30" name="AntTaskDef"> - <model href="temp#/0"/> + <model href="new-model#/42"/> </type> <bindings location="222:3-222:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="222:11-222:17" name="name"> @@ -708,7 +708,7 @@ <inPattern location="220:2-220:22"> <elements xsi:type="atl:SimpleInPatternElement" location="220:7-220:22" varName="a" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="220:11-220:22" name="TaskDef"> - <model href="temp#/2"/> + <model href="new-model#/41"/> </type> </elements> </inPattern> @@ -717,7 +717,7 @@ <outPattern location="229:2-232:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="229:5-232:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="229:9-229:27" name="NewTask"> - <model href="temp#/0"/> + <model href="new-model#/44"/> </type> <bindings location="230:3-230:25" propertyName="taskName"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="230:15-230:25" name="taskName"> @@ -734,7 +734,7 @@ <inPattern location="228:2-228:22"> <elements xsi:type="atl:SimpleInPatternElement" location="228:7-228:22" varName="a" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="228:11-228:22" name="NewTask"> - <model href="temp#/2"/> + <model href="new-model#/43"/> </type> </elements> </inPattern> @@ -745,7 +745,7 @@ <outPattern location="237:2-240:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="237:5-240:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="237:9-237:28" name="Attribut"> - <model href="temp#/0"/> + <model href="new-model#/46"/> </type> <bindings location="238:3-238:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="238:11-238:17" name="name"> @@ -762,7 +762,7 @@ <inPattern location="236:2-236:23"> <elements xsi:type="atl:SimpleInPatternElement" location="236:7-236:23" varName="a" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.17/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="236:11-236:23" name="Attribut"> - <model href="temp#/2"/> + <model href="new-model#/45"/> </type> </elements> </inPattern> @@ -773,7 +773,7 @@ <outPattern location="247:2-253:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="247:5-253:3" varName="mm"> <type xsi:type="ocl:OclModelElement" location="247:10-247:25" name="Path"> - <model href="temp#/0"/> + <model href="new-model#/48"/> </type> <bindings location="248:3-248:13" propertyName="id"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="248:9-248:13" name="id"> @@ -805,7 +805,7 @@ <inPattern location="246:2-246:19"> <elements xsi:type="atl:SimpleInPatternElement" location="246:7-246:19" varName="a" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.4/@value/@source"> <type xsi:type="ocl:OclModelElement" location="246:11-246:19" name="Path"> - <model href="temp#/2"/> + <model href="new-model#/47"/> </type> </elements> </inPattern> @@ -814,7 +814,7 @@ <outPattern location="258:2-262:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="258:5-262:3" varName="mm"> <type xsi:type="ocl:OclModelElement" location="258:10-258:30" name="ClassPath"> - <model href="temp#/0"/> + <model href="new-model#/50"/> </type> <bindings location="259:3-259:19" propertyName="refid"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="259:12-259:19" name="refid"> @@ -836,7 +836,7 @@ <inPattern location="257:2-257:24"> <elements xsi:type="atl:SimpleInPatternElement" location="257:7-257:24" varName="a" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="257:11-257:24" name="ClassPath"> - <model href="temp#/2"/> + <model href="new-model#/49"/> </type> </elements> </inPattern> @@ -845,7 +845,7 @@ <outPattern location="267:2-270:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="267:5-270:3" varName="mm"> <type xsi:type="ocl:OclModelElement" location="267:10-267:32" name="PathElement"> - <model href="temp#/0"/> + <model href="new-model#/52"/> </type> <bindings location="268:3-268:17" propertyName="path"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="268:11-268:17" name="path"> @@ -862,7 +862,7 @@ <inPattern location="266:2-266:26"> <elements xsi:type="atl:SimpleInPatternElement" location="266:7-266:26" varName="a" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="266:11-266:26" name="PathElement"> - <model href="temp#/2"/> + <model href="new-model#/51"/> </type> </elements> </inPattern> @@ -872,7 +872,7 @@ <outPattern location="275:2-280:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="275:5-280:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="275:9-275:27" name="FileSet"> - <model href="temp#/0"/> + <model href="new-model#/54"/> </type> <bindings location="276:3-276:15" propertyName="dir"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="276:10-276:15" name="dir"> @@ -899,7 +899,7 @@ <inPattern location="274:2-274:22"> <elements xsi:type="atl:SimpleInPatternElement" location="274:7-274:22" varName="a" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.21/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.21/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.21/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="274:11-274:22" name="FileSet"> - <model href="temp#/2"/> + <model href="new-model#/53"/> </type> </elements> </inPattern> @@ -909,7 +909,7 @@ <outPattern location="286:2-291:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="286:5-291:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="286:9-286:29" name="FilterSet"> - <model href="temp#/0"/> + <model href="new-model#/56"/> </type> <bindings location="287:3-287:29" propertyName="starttoken"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="287:17-287:29" name="starttoken"> @@ -936,7 +936,7 @@ <inPattern location="285:2-285:24"> <elements xsi:type="atl:SimpleInPatternElement" location="285:7-285:24" varName="a" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.22/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.22/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.22/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="285:11-285:24" name="FilterSet"> - <model href="temp#/2"/> + <model href="new-model#/55"/> </type> </elements> </inPattern> @@ -945,7 +945,7 @@ <outPattern location="296:2-299:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="296:5-299:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="296:9-296:26" name="Filter"> - <model href="temp#/0"/> + <model href="new-model#/58"/> </type> <bindings location="297:3-297:19" propertyName="token"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="297:12-297:19" name="token"> @@ -962,7 +962,7 @@ <inPattern location="295:2-295:21"> <elements xsi:type="atl:SimpleInPatternElement" location="295:7-295:21" varName="a" variableExp="//@elements.23/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.23/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="295:11-295:21" name="Filter"> - <model href="temp#/2"/> + <model href="new-model#/57"/> </type> </elements> </inPattern> @@ -972,7 +972,7 @@ <outPattern location="304:2-306:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="304:5-306:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="304:9-304:31" name="FiltersFile"> - <model href="temp#/0"/> + <model href="new-model#/60"/> </type> <bindings location="305:3-305:17" propertyName="file"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="305:11-305:17" name="file"> @@ -984,7 +984,7 @@ <inPattern location="303:2-303:26"> <elements xsi:type="atl:SimpleInPatternElement" location="303:7-303:26" varName="a" variableExp="//@elements.24/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="303:11-303:26" name="FiltersFile"> - <model href="temp#/2"/> + <model href="new-model#/59"/> </type> </elements> </inPattern> @@ -994,7 +994,7 @@ <outPattern location="312:2-314:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="312:5-314:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="312:9-312:30" name="PatternSet"> - <model href="temp#/0"/> + <model href="new-model#/62"/> </type> <bindings location="313:3-313:29" propertyName="inexcludes"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="313:17-313:29" name="inexcludes"> @@ -1006,7 +1006,7 @@ <inPattern location="311:2-311:25"> <elements xsi:type="atl:SimpleInPatternElement" location="311:7-311:25" varName="a" variableExp="//@elements.25/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="311:11-311:25" name="PatternSet"> - <model href="temp#/2"/> + <model href="new-model#/61"/> </type> </elements> </inPattern> @@ -1015,7 +1015,7 @@ <outPattern location="320:2-324:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="320:5-324:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="320:9-320:28" name="Includes"> - <model href="temp#/0"/> + <model href="new-model#/64"/> </type> <bindings location="321:3-321:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="321:11-321:17" name="name"> @@ -1037,7 +1037,7 @@ <inPattern location="319:2-319:23"> <elements xsi:type="atl:SimpleInPatternElement" location="319:7-319:23" varName="a" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.26/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.26/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="319:11-319:23" name="Includes"> - <model href="temp#/2"/> + <model href="new-model#/63"/> </type> </elements> </inPattern> @@ -1046,7 +1046,7 @@ <outPattern location="329:2-333:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="329:5-333:4" varName="m"> <type xsi:type="ocl:OclModelElement" location="329:9-329:28" name="Excludes"> - <model href="temp#/0"/> + <model href="new-model#/66"/> </type> <bindings location="330:3-330:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="330:11-330:17" name="name"> @@ -1068,7 +1068,7 @@ <inPattern location="328:2-328:23"> <elements xsi:type="atl:SimpleInPatternElement" location="328:7-328:23" varName="a" variableExp="//@elements.27/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.27/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.27/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="328:11-328:23" name="Excludes"> - <model href="temp#/2"/> + <model href="new-model#/65"/> </type> </elements> </inPattern> @@ -1077,7 +1077,7 @@ <outPattern location="338:2-342:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="338:5-342:3" varName="m"> <type xsi:type="ocl:OclModelElement" location="338:9-338:32" name="IncludesFile"> - <model href="temp#/0"/> + <model href="new-model#/68"/> </type> <bindings location="339:3-339:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="339:11-339:17" name="name"> @@ -1099,7 +1099,7 @@ <inPattern location="337:2-337:27"> <elements xsi:type="atl:SimpleInPatternElement" location="337:7-337:27" varName="a" variableExp="//@elements.28/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.28/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.28/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="337:11-337:27" name="IncludesFile"> - <model href="temp#/2"/> + <model href="new-model#/67"/> </type> </elements> </inPattern> @@ -1108,7 +1108,7 @@ <outPattern location="347:2-351:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="347:5-351:4" varName="m"> <type xsi:type="ocl:OclModelElement" location="347:9-347:32" name="ExcludesFile"> - <model href="temp#/0"/> + <model href="new-model#/70"/> </type> <bindings location="348:3-348:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="348:11-348:17" name="name"> @@ -1130,7 +1130,7 @@ <inPattern location="346:2-346:27"> <elements xsi:type="atl:SimpleInPatternElement" location="346:7-346:27" varName="a" variableExp="//@elements.29/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.29/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.29/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="346:11-346:27" name="ExcludesFile"> - <model href="temp#/2"/> + <model href="new-model#/69"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/Maven2XML/Maven2XML.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/Maven2XML/Maven2XML.atl.xmi index 85906b8d..946547d8 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/Maven2XML/Maven2XML.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/Maven2XML/Maven2XML.atl.xmi @@ -1,18 +1,23 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-432:2" name="Maven2XML"> <inModels location="3:9-3:29" name="InMaven"> - <metamodel href="temp#/2"/> + <metamodel href="new-model#/2"/> </inModels> <inModels location="3:31-3:55" name="InProject"> - <metamodel href="temp#/3"/> + <metamodel href="new-model#/3"/> </inModels> <outModels location="2:9-2:24" name="XML1"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <outModels location="2:28-2:45" name="XML2"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </outModels> <elements xsi:type="atl:Helper" location="10:1-12:40"> + <commentsBefore>-- In this module, the two files are transformed in XML</commentsBefore> + <commentsBefore>-- but there is no link in the transformation</commentsBefore> + <commentsBefore>-- helper getXmlnsAux : returns the name of the Xmlns element having</commentsBefore> + <commentsBefore>-- the same value that given in parameter</commentsBefore> + <commentsAfter>-- helper getXmlns : returns the prefix corresponding to name</commentsAfter> <definition location="10:8-12:39"> <feature xsi:type="ocl:Operation" location="10:12-12:39" name="getXmlnsAux"> <parameters location="10:24-10:36" varName="name" variableExp="//@elements.0/@definition/@feature/@body/@source/@source/@body/@arguments.0"> @@ -24,7 +29,7 @@ <source xsi:type="ocl:IteratorExp" location="11:2-12:25" name="select"> <source xsi:type="ocl:OperationCallExp" location="11:2-11:33" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="11:2-11:18" name="Xmlns"> - <model href="temp#/2"/> + <model href="new-model#/4"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="12:12-12:24" operationName="="> @@ -41,6 +46,9 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="15:1-20:9"> + <commentsBefore>-- helper getXmlns : returns the prefix corresponding to name</commentsBefore> + <commentsAfter>-- rules for the file representing maven.xml</commentsAfter> + <commentsAfter>-- central rule for maven.xml</commentsAfter> <definition location="15:8-20:8"> <feature xsi:type="ocl:Operation" location="15:12-20:8" name="getXmlns"> <parameters location="15:21-15:33" varName="name" variableExp="//@elements.1/@definition/@feature/@body/@variable/@initExpression/@arguments.0"> @@ -52,7 +60,7 @@ <type xsi:type="ocl:StringType" location="16:21-16:27"/> <initExpression xsi:type="ocl:OperationCallExp" location="16:30-16:58" operationName="getXmlnsAux"> <source xsi:type="ocl:VariableExp" location="16:30-16:40"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/5"/> </source> <arguments xsi:type="ocl:VariableExp" location="16:53-16:57" referredVariable="//@elements.1/@definition/@feature/@parameters.0"/> </initExpression> @@ -75,10 +83,12 @@ </definition> </elements> <elements xsi:type="atl:MatchedRule" location="25:1-38:2" name="MavenMavenProject2XMLMavenRoot"> + <commentsBefore>-- rules for the file representing maven.xml</commentsBefore> + <commentsBefore>-- central rule for maven.xml</commentsBefore> <outPattern location="27:2-36:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="27:5-32:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="27:9-27:22" name="Root"> - <model href="temp#/0"/> + <model href="new-model#/7"/> </type> <bindings location="28:3-28:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="28:11-28:20" stringSymbol="project"/> @@ -109,7 +119,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="33:2-36:3" varName="goalDefault" variableExp="//@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="33:16-33:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/8"/> </type> <bindings location="34:3-34:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="34:11-34:20" stringSymbol="default"/> @@ -126,16 +136,18 @@ <inPattern location="26:2-26:29"> <elements xsi:type="atl:SimpleInPatternElement" location="26:7-26:29" varName="i" variableExp="//@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@source //@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.2/@source //@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.3/@source //@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.4/@source //@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.5/@source //@elements.2/@outPattern/@elements.0/@bindings.1/@value/@elements.6/@source //@elements.2/@outPattern/@elements.1/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="26:11-26:29" name="Project"> - <model href="temp#/2"/> + <model href="new-model#/6"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="41:1-47:2" name="Xmlns"> + <commentsAfter>------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- Antproperty</commentsAfter> <outPattern location="43:2-46:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="43:5-46:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="43:7-43:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/10"/> </type> <bindings location="44:3-44:26" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="44:11-44:26" operationName="+"> @@ -155,22 +167,24 @@ <inPattern location="42:2-42:27"> <elements xsi:type="atl:SimpleInPatternElement" location="42:7-42:27" varName="i" variableExp="//@elements.3/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source //@elements.3/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="42:11-42:27" name="Xmlns"> - <model href="temp#/2"/> + <model href="new-model#/9"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="51:1-65:2" name="PropertyValue"> + <commentsBefore>------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- Antproperty</commentsBefore> <outPattern location="53:2-64:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="53:5-56:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="53:9-53:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/12"/> </type> <bindings location="54:3-54:54" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="54:11-54:54" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="54:11-54:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="54:11-54:21"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/13"/> </source> <arguments xsi:type="ocl:StringExp" location="54:31-54:42" stringSymbol="jelly:ant"/> </source> @@ -186,7 +200,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="57:2-60:3" varName="propertyName2" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="57:18-57:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/14"/> </type> <bindings location="58:3-58:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="58:11-58:17" stringSymbol="name"/> @@ -199,7 +213,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="61:2-64:3" varName="propertyValue" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="61:18-61:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> <bindings location="62:3-62:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="62:11-62:18" stringSymbol="value"/> @@ -214,7 +228,7 @@ <inPattern location="52:2-52:38"> <elements xsi:type="atl:SimpleInPatternElement" location="52:7-52:38" varName="i" variableExp="//@elements.4/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.4/@outPattern/@elements.2/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="52:11-52:38" name="AntPropertyValue"> - <model href="temp#/2"/> + <model href="new-model#/11"/> </type> </elements> </inPattern> @@ -223,13 +237,13 @@ <outPattern location="68:2-79:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="68:5-71:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="68:9-68:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/17"/> </type> <bindings location="69:3-69:54" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="69:11-69:54" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="69:11-69:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="69:11-69:21"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/18"/> </source> <arguments xsi:type="ocl:StringExp" location="69:31-69:42" stringSymbol="jelly:ant"/> </source> @@ -245,7 +259,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="72:2-75:3" varName="propertyName2" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="72:18-72:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/19"/> </type> <bindings location="73:3-73:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="73:11-73:17" stringSymbol="name"/> @@ -258,7 +272,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="76:2-79:3" varName="propertyLocation" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="76:21-76:39" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/20"/> </type> <bindings location="77:3-77:21" propertyName="name"> <value xsi:type="ocl:StringExp" location="77:11-77:21" stringSymbol="location"/> @@ -273,7 +287,7 @@ <inPattern location="67:2-67:41"> <elements xsi:type="atl:SimpleInPatternElement" location="67:7-67:41" varName="i" variableExp="//@elements.5/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.5/@outPattern/@elements.2/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="67:11-67:41" name="AntPropertyLocation"> - <model href="temp#/2"/> + <model href="new-model#/16"/> </type> </elements> </inPattern> @@ -282,13 +296,13 @@ <outPattern location="84:2-91:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="84:5-87:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="84:9-84:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/22"/> </type> <bindings location="85:3-85:54" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="85:11-85:54" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="85:11-85:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="85:11-85:21"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/23"/> </source> <arguments xsi:type="ocl:StringExp" location="85:31-85:42" stringSymbol="jelly:ant"/> </source> @@ -301,7 +315,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="88:2-91:3" varName="nameFile" variableExp="//@elements.6/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="88:13-88:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/24"/> </type> <bindings location="89:3-89:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="89:11-89:17" stringSymbol="file"/> @@ -316,22 +330,24 @@ <inPattern location="83:2-83:37"> <elements xsi:type="atl:SimpleInPatternElement" location="83:7-83:37" varName="i" variableExp="//@elements.6/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="83:11-83:37" name="AntPropertyFile"> - <model href="temp#/2"/> + <model href="new-model#/21"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="94:1-104:2" name="PropertyEnv"> + <commentsAfter>------------------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- goal</commentsAfter> <outPattern location="96:2-103:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="96:5-99:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="96:9-96:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/26"/> </type> <bindings location="97:3-97:54" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="97:11-97:54" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="97:11-97:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="97:11-97:21"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/27"/> </source> <arguments xsi:type="ocl:StringExp" location="97:31-97:42" stringSymbol="jelly:ant"/> </source> @@ -344,7 +360,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="100:2-103:3" varName="environmentName" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="100:20-100:38" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/28"/> </type> <bindings location="101:3-101:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="101:11-101:24" stringSymbol="environment"/> @@ -359,16 +375,18 @@ <inPattern location="95:2-95:36"> <elements xsi:type="atl:SimpleInPatternElement" location="95:7-95:36" varName="i" variableExp="//@elements.7/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="95:11-95:36" name="AntPropertyEnv"> - <model href="temp#/2"/> + <model href="new-model#/25"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="108:1-118:2" name="Goal"> + <commentsBefore>------------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- goal</commentsBefore> <outPattern location="110:2-117:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="110:5-113:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="110:9-110:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/30"/> </type> <bindings location="111:3-111:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="111:11-111:17" stringSymbol="goal"/> @@ -384,7 +402,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="114:2-117:3" varName="nameAttribute" variableExp="//@elements.8/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="114:18-114:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/31"/> </type> <bindings location="115:3-115:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="115:11-115:17" stringSymbol="name"/> @@ -399,7 +417,7 @@ <inPattern location="109:2-109:26"> <elements xsi:type="atl:SimpleInPatternElement" location="109:7-109:26" varName="i" variableExp="//@elements.8/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@source //@elements.8/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="109:11-109:26" name="Goal"> - <model href="temp#/2"/> + <model href="new-model#/29"/> </type> </elements> </inPattern> @@ -408,7 +426,7 @@ <outPattern location="122:2-129:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="122:5-125:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="122:9-122:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/33"/> </type> <bindings location="123:3-123:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="123:11-123:23" stringSymbol="attainGoal"/> @@ -419,7 +437,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="126:2-129:3" varName="attainGoalAttribute" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="126:24-126:42" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/34"/> </type> <bindings location="127:3-127:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="127:11-127:17" stringSymbol="name"/> @@ -436,7 +454,7 @@ <inPattern location="121:2-121:32"> <elements xsi:type="atl:SimpleInPatternElement" location="121:7-121:32" varName="i" variableExp="//@elements.9/@outPattern/@elements.1/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="121:11-121:32" name="AttainGoal"> - <model href="temp#/2"/> + <model href="new-model#/32"/> </type> </elements> </inPattern> @@ -445,7 +463,7 @@ <outPattern location="135:2-142:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="135:5-138:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="135:9-135:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/36"/> </type> <bindings location="136:3-136:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="136:11-136:20" stringSymbol="preGoal"/> @@ -461,7 +479,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="139:2-142:3" varName="nameAttribute" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="139:18-139:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/37"/> </type> <bindings location="140:3-140:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="140:11-140:17" stringSymbol="name"/> @@ -478,16 +496,18 @@ <inPattern location="134:2-134:29"> <elements xsi:type="atl:SimpleInPatternElement" location="134:7-134:29" varName="i" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@source //@elements.10/@outPattern/@elements.1/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="134:11-134:29" name="PreGoal"> - <model href="temp#/2"/> + <model href="new-model#/35"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="146:1-156:2" name="PostGoal"> + <commentsAfter>--------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- jelly commands</commentsAfter> <outPattern location="148:2-155:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="148:5-151:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="148:9-148:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/39"/> </type> <bindings location="149:3-149:21" propertyName="name"> <value xsi:type="ocl:StringExp" location="149:11-149:21" stringSymbol="postGoal"/> @@ -503,7 +523,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="152:2-155:3" varName="nameAttribute" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="152:18-152:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/40"/> </type> <bindings location="153:3-153:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="153:11-153:17" stringSymbol="name"/> @@ -520,22 +540,28 @@ <inPattern location="147:2-147:30"> <elements xsi:type="atl:SimpleInPatternElement" location="147:7-147:30" varName="i" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@source //@elements.11/@outPattern/@elements.1/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="147:11-147:30" name="PostGoal"> - <model href="temp#/2"/> + <model href="new-model#/38"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="160:1-174:2" name="JellySet"> + <commentsBefore>--------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- jelly commands</commentsBefore> + <commentsAfter>------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- tasks</commentsAfter> + <commentsAfter>------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- task defined by the user</commentsAfter> <outPattern location="162:2-173:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="162:5-165:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="162:9-162:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/42"/> </type> <bindings location="163:3-163:50" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="163:11-163:50" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="163:11-163:44" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="163:11-163:21"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/43"/> </source> <arguments xsi:type="ocl:StringExp" location="163:31-163:43" stringSymbol="jelly:core"/> </source> @@ -551,7 +577,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="166:2-169:3" varName="varAttribute" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="166:17-166:35" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/44"/> </type> <bindings location="167:3-167:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="167:11-167:16" stringSymbol="var"/> @@ -564,7 +590,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="170:2-173:3" varName="valueAttribute" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="170:19-170:37" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/45"/> </type> <bindings location="171:3-171:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="171:11-171:18" stringSymbol="value"/> @@ -579,22 +605,26 @@ <inPattern location="161:2-161:28"> <elements xsi:type="atl:SimpleInPatternElement" location="161:7-161:28" varName="i" variableExp="//@elements.12/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.12/@outPattern/@elements.2/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="161:9-161:28" name="JellySet"> - <model href="temp#/2"/> + <model href="new-model#/41"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="182:1-196:2" name="TaskDef"> + <commentsBefore>------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- tasks</commentsBefore> + <commentsBefore>------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- task defined by the user</commentsBefore> <outPattern location="184:2-195:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="184:5-187:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="184:9-184:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/47"/> </type> <bindings location="185:3-185:53" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="185:11-185:53" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="185:11-185:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="185:11-185:21"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/48"/> </source> <arguments xsi:type="ocl:StringExp" location="185:31-185:42" stringSymbol="jelly:ant"/> </source> @@ -610,7 +640,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="188:2-191:3" varName="nameName" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="188:13-188:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/49"/> </type> <bindings location="189:3-189:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="189:11-189:17" stringSymbol="name"/> @@ -623,7 +653,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="192:2-195:3" varName="nameClassName" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="192:18-192:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/50"/> </type> <bindings location="193:3-193:22" propertyName="name"> <value xsi:type="ocl:StringExp" location="193:11-193:22" stringSymbol="classname"/> @@ -638,7 +668,7 @@ <inPattern location="183:2-183:32"> <elements xsi:type="atl:SimpleInPatternElement" location="183:7-183:32" varName="i" variableExp="//@elements.13/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.13/@outPattern/@elements.2/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="183:11-183:32" name="AntTaskDef"> - <model href="temp#/2"/> + <model href="new-model#/46"/> </type> </elements> </inPattern> @@ -647,7 +677,7 @@ <outPattern location="200:2-203:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="200:5-203:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="200:9-200:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/52"/> </type> <bindings location="201:3-201:26" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="201:11-201:26" name="name"> @@ -666,16 +696,18 @@ <inPattern location="199:2-199:29"> <elements xsi:type="atl:SimpleInPatternElement" location="199:7-199:29" varName="i" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.0/@value/@source/@source //@elements.14/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="199:11-199:29" name="NewTask"> - <model href="temp#/2"/> + <model href="new-model#/51"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="206:1-212:2" name="Attribut"> + <commentsAfter>----------------------</commentsAfter> + <commentsAfter>-- pre defined tasks</commentsAfter> <outPattern location="208:2-211:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="208:5-211:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="208:9-208:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/54"/> </type> <bindings location="209:3-209:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="209:11-209:17" name="name"> @@ -692,22 +724,24 @@ <inPattern location="207:2-207:30"> <elements xsi:type="atl:SimpleInPatternElement" location="207:7-207:30" varName="i" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="207:11-207:30" name="Attribut"> - <model href="temp#/2"/> + <model href="new-model#/53"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="217:1-222:2" name="Tstamp"> + <commentsBefore>----------------------</commentsBefore> + <commentsBefore>-- pre defined tasks</commentsBefore> <outPattern location="219:2-221:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="219:5-221:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="219:9-219:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/56"/> </type> <bindings location="220:3-220:52" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="220:11-220:52" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="220:11-220:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="220:11-220:21"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/57"/> </source> <arguments xsi:type="ocl:StringExp" location="220:31-220:42" stringSymbol="jelly:ant"/> </source> @@ -719,7 +753,7 @@ <inPattern location="218:2-218:28"> <elements xsi:type="atl:SimpleInPatternElement" location="218:7-218:28" varName="i"> <type xsi:type="ocl:OclModelElement" location="218:11-218:28" name="Tstamp"> - <model href="temp#/2"/> + <model href="new-model#/55"/> </type> </elements> </inPattern> @@ -728,13 +762,13 @@ <outPattern location="226:2-233:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="226:5-229:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="226:9-226:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/59"/> </type> <bindings location="227:3-227:51" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="227:11-227:51" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="227:11-227:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="227:11-227:21"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/60"/> </source> <arguments xsi:type="ocl:StringExp" location="227:31-227:42" stringSymbol="jelly:ant"/> </source> @@ -747,13 +781,13 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="230:2-233:3" varName="dirAttribute" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="230:17-230:35" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/61"/> </type> <bindings location="231:3-231:49" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="231:11-231:49" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="231:11-231:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="231:11-231:21"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/62"/> </source> <arguments xsi:type="ocl:StringExp" location="231:31-231:42" stringSymbol="jelly:ant"/> </source> @@ -770,7 +804,7 @@ <inPattern location="225:2-225:27"> <elements xsi:type="atl:SimpleInPatternElement" location="225:7-225:27" varName="i" variableExp="//@elements.17/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="225:11-225:27" name="Mkdir"> - <model href="temp#/2"/> + <model href="new-model#/58"/> </type> </elements> </inPattern> @@ -779,13 +813,13 @@ <outPattern location="238:2-249:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="238:5-241:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="238:9-238:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/64"/> </type> <bindings location="239:3-239:51" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="239:11-239:51" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="239:11-239:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="239:11-239:21"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/65"/> </source> <arguments xsi:type="ocl:StringExp" location="239:31-239:42" stringSymbol="jelly:ant"/> </source> @@ -807,7 +841,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="242:2-245:3" varName="sourceDirAttribute" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="242:23-242:41" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/66"/> </type> <bindings location="243:3-243:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="243:11-243:19" stringSymbol="srcdir"/> @@ -820,7 +854,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="246:2-249:3" varName="destDirAttribute" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="246:21-246:39" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/67"/> </type> <bindings location="247:3-247:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="247:11-247:20" stringSymbol="destdir"/> @@ -835,22 +869,24 @@ <inPattern location="237:2-237:27"> <elements xsi:type="atl:SimpleInPatternElement" location="237:7-237:27" varName="i" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.1/@value/@elements.2/@source //@elements.18/@outPattern/@elements.0/@bindings.1/@value/@elements.3/@source //@elements.18/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.2/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="237:11-237:27" name="Javac"> - <model href="temp#/2"/> + <model href="new-model#/63"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="252:1-262:2" name="Copy"> + <commentsAfter>--------------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- path,pattern and filter (like ANT2XML)</commentsAfter> <outPattern location="254:2-261:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="254:5-257:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="254:9-254:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/69"/> </type> <bindings location="255:3-255:50" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="255:11-255:50" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="255:11-255:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="255:11-255:21"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/70"/> </source> <arguments xsi:type="ocl:StringExp" location="255:31-255:42" stringSymbol="jelly:ant"/> </source> @@ -868,7 +904,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="258:2-261:3" varName="toDirAttribute" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="258:19-258:37" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/71"/> </type> <bindings location="259:3-259:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="259:11-259:18" stringSymbol="todir"/> @@ -883,22 +919,24 @@ <inPattern location="253:2-253:26"> <elements xsi:type="atl:SimpleInPatternElement" location="253:7-253:26" varName="i" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@source //@elements.19/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="253:11-253:26" name="Copy"> - <model href="temp#/2"/> + <model href="new-model#/68"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="268:1-278:2" name="Path"> + <commentsBefore>--------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- path,pattern and filter (like ANT2XML)</commentsBefore> <outPattern location="270:2-277:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="270:5-273:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="270:9-270:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/73"/> </type> <bindings location="271:3-271:50" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="271:11-271:50" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="271:11-271:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="271:11-271:21"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/74"/> </source> <arguments xsi:type="ocl:StringExp" location="271:31-271:42" stringSymbol="jelly:ant"/> </source> @@ -916,7 +954,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="274:2-277:3" varName="idAttribute" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="274:16-274:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/75"/> </type> <bindings location="275:3-275:15" propertyName="name"> <value xsi:type="ocl:StringExp" location="275:11-275:15" stringSymbol="id"/> @@ -931,7 +969,7 @@ <inPattern location="269:2-269:26"> <elements xsi:type="atl:SimpleInPatternElement" location="269:7-269:26" varName="i" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@source //@elements.20/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="269:11-269:26" name="Path"> - <model href="temp#/2"/> + <model href="new-model#/72"/> </type> </elements> </inPattern> @@ -940,13 +978,13 @@ <outPattern location="282:2-288:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="282:5-284:30" varName="o"> <type xsi:type="ocl:OclModelElement" location="282:9-282:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/77"/> </type> <bindings location="283:3-283:55" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="283:11-283:55" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="283:11-283:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="283:11-283:21"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/78"/> </source> <arguments xsi:type="ocl:StringExp" location="283:31-283:42" stringSymbol="jelly:ant"/> </source> @@ -959,7 +997,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="285:2-288:3" varName="refidAttribute" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="285:19-285:37" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/79"/> </type> <bindings location="286:3-286:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="286:11-286:18" stringSymbol="refid"/> @@ -974,7 +1012,7 @@ <inPattern location="281:2-281:31"> <elements xsi:type="atl:SimpleInPatternElement" location="281:7-281:31" varName="i" variableExp="//@elements.21/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="281:11-281:31" name="ClassPath"> - <model href="temp#/2"/> + <model href="new-model#/76"/> </type> </elements> </inPattern> @@ -983,13 +1021,13 @@ <outPattern location="293:2-300:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="293:5-296:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="293:9-293:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/81"/> </type> <bindings location="294:3-294:53" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="294:11-294:53" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="294:11-294:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="294:11-294:21"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/82"/> </source> <arguments xsi:type="ocl:StringExp" location="294:31-294:42" stringSymbol="jelly:ant"/> </source> @@ -1013,7 +1051,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="297:2-300:3" varName="dirAttribute" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="297:17-297:35" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/83"/> </type> <bindings location="298:3-298:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="298:11-298:16" stringSymbol="dir"/> @@ -1028,7 +1066,7 @@ <inPattern location="292:2-292:29"> <elements xsi:type="atl:SimpleInPatternElement" location="292:7-292:29" varName="i" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@source //@elements.22/@outPattern/@elements.0/@bindings.1/@value/@elements.2/@source //@elements.22/@outPattern/@elements.0/@bindings.1/@value/@elements.3/@source //@elements.22/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="292:11-292:29" name="FileSet"> - <model href="temp#/2"/> + <model href="new-model#/80"/> </type> </elements> </inPattern> @@ -1037,13 +1075,13 @@ <outPattern location="305:2-307:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="305:5-307:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="305:9-305:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/85"/> </type> <bindings location="306:3-306:57" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="306:11-306:57" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="306:11-306:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="306:11-306:21"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/86"/> </source> <arguments xsi:type="ocl:StringExp" location="306:31-306:42" stringSymbol="jelly:ant"/> </source> @@ -1055,7 +1093,7 @@ <inPattern location="304:2-304:33"> <elements xsi:type="atl:SimpleInPatternElement" location="304:7-304:33" varName="i"> <type xsi:type="ocl:OclModelElement" location="304:11-304:33" name="PathElement"> - <model href="temp#/2"/> + <model href="new-model#/84"/> </type> </elements> </inPattern> @@ -1064,13 +1102,13 @@ <outPattern location="312:2-315:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="312:5-315:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="312:9-312:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/88"/> </type> <bindings location="313:3-313:56" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="313:11-313:56" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="313:11-313:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="313:11-313:21"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/89"/> </source> <arguments xsi:type="ocl:StringExp" location="313:31-313:42" stringSymbol="jelly:ant"/> </source> @@ -1087,7 +1125,7 @@ <inPattern location="311:2-311:32"> <elements xsi:type="atl:SimpleInPatternElement" location="311:7-311:32" varName="i" variableExp="//@elements.24/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="311:11-311:32" name="PatternSet"> - <model href="temp#/2"/> + <model href="new-model#/87"/> </type> </elements> </inPattern> @@ -1096,13 +1134,13 @@ <outPattern location="320:2-327:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="320:5-323:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="320:9-320:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/91"/> </type> <bindings location="321:3-321:53" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="321:11-321:53" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="321:11-321:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="321:11-321:21"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/92"/> </source> <arguments xsi:type="ocl:StringExp" location="321:31-321:42" stringSymbol="jelly:ant"/> </source> @@ -1115,7 +1153,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="324:2-327:3" varName="nameAttribute" variableExp="//@elements.25/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="324:18-324:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/93"/> </type> <bindings location="325:3-325:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="325:11-325:17" stringSymbol="name"/> @@ -1130,22 +1168,26 @@ <inPattern location="319:2-319:30"> <elements xsi:type="atl:SimpleInPatternElement" location="319:7-319:30" varName="i" variableExp="//@elements.25/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="319:11-319:30" name="Includes"> - <model href="temp#/2"/> + <model href="new-model#/90"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="330:1-340:2" name="Exclude"> + <commentsAfter>------------------------------------------------------------------------</commentsAfter> + <commentsAfter>------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- rules for the file representing project.xml</commentsAfter> + <commentsAfter>-- central rule for project.xml</commentsAfter> <outPattern location="332:2-339:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="332:5-335:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="332:9-332:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/95"/> </type> <bindings location="333:3-333:53" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="333:11-333:53" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="333:11-333:43" operationName="getXmlns"> <source xsi:type="ocl:VariableExp" location="333:11-333:21"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/96"/> </source> <arguments xsi:type="ocl:StringExp" location="333:31-333:42" stringSymbol="jelly:ant"/> </source> @@ -1158,7 +1200,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="336:2-339:3" varName="nameAttribute" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="336:18-336:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/97"/> </type> <bindings location="337:3-337:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="337:11-337:17" stringSymbol="name"/> @@ -1173,16 +1215,20 @@ <inPattern location="331:2-331:30"> <elements xsi:type="atl:SimpleInPatternElement" location="331:7-331:30" varName="i" variableExp="//@elements.26/@outPattern/@elements.1/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="331:11-331:30" name="Excludes"> - <model href="temp#/2"/> + <model href="new-model#/94"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="349:1-375:2" name="MavenProjectProject2XMLProjectRoot"> + <commentsBefore>------------------------------------------------------------------------</commentsBefore> + <commentsBefore>------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- rules for the file representing project.xml</commentsBefore> + <commentsBefore>-- central rule for project.xml</commentsBefore> <outPattern location="356:2-374:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="356:5-359:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="356:9-356:24" name="Root"> - <model href="temp#/1"/> + <model href="new-model#/99"/> </type> <bindings location="357:3-357:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="357:11-357:20" stringSymbol="project"/> @@ -1200,7 +1246,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="360:3-363:3" varName="idAttribute" variableExp="//@elements.27/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="360:17-360:37" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/100"/> </type> <bindings location="361:3-361:15" propertyName="name"> <value xsi:type="ocl:StringExp" location="361:11-361:15" stringSymbol="id"/> @@ -1213,7 +1259,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="364:3-367:3" varName="nameAttribute" variableExp="//@elements.27/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="364:19-364:39" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/101"/> </type> <bindings location="365:3-365:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="365:11-365:17" stringSymbol="name"/> @@ -1226,7 +1272,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="368:2-371:3" varName="descriptionElement" variableExp="//@elements.27/@outPattern/@elements.0/@bindings.1/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="368:23-368:41" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/102"/> </type> <bindings location="369:3-369:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="369:11-369:24" stringSymbol="description"/> @@ -1237,7 +1283,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="372:2-374:3" varName="descriptionText" variableExp="//@elements.27/@outPattern/@elements.3/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="372:20-372:35" name="Text"> - <model href="temp#/1"/> + <model href="new-model#/103"/> </type> <bindings location="373:3-373:25" propertyName="value"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="373:12-373:25" name="description"> @@ -1249,7 +1295,7 @@ <inPattern location="350:2-355:3"> <elements xsi:type="atl:SimpleInPatternElement" location="350:7-350:31" varName="i" variableExp="//@elements.27/@inPattern/@filter/@condition/@source/@source //@elements.27/@inPattern/@filter/@elseExpression/@source/@source/@source //@elements.27/@outPattern/@elements.0/@bindings.1/@value/@elements.3/@source //@elements.27/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.27/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.27/@outPattern/@elements.4/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="350:11-350:31" name="Project"> - <model href="temp#/3"/> + <model href="new-model#/98"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="351:3-354:9"> @@ -1274,7 +1320,7 @@ <outPattern location="384:2-395:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="384:5-387:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="384:9-384:24" name="Root"> - <model href="temp#/1"/> + <model href="new-model#/105"/> </type> <bindings location="385:3-385:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="385:11-385:20" stringSymbol="project"/> @@ -1291,7 +1337,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="388:3-391:3" varName="idAttribute" variableExp="//@elements.28/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="388:17-388:37" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/106"/> </type> <bindings location="389:3-389:15" propertyName="name"> <value xsi:type="ocl:StringExp" location="389:11-389:15" stringSymbol="id"/> @@ -1304,7 +1350,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="392:3-395:3" varName="nameAttribute" variableExp="//@elements.28/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="392:19-392:39" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/107"/> </type> <bindings location="393:3-393:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="393:11-393:17" stringSymbol="name"/> @@ -1319,7 +1365,7 @@ <inPattern location="378:2-383:3"> <elements xsi:type="atl:SimpleInPatternElement" location="378:7-378:31" varName="i" variableExp="//@elements.28/@inPattern/@filter/@condition/@source/@source //@elements.28/@inPattern/@filter/@elseExpression/@source/@source //@elements.28/@outPattern/@elements.0/@bindings.1/@value/@elements.2/@source //@elements.28/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.28/@outPattern/@elements.2/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="378:11-378:31" name="Project"> - <model href="temp#/3"/> + <model href="new-model#/104"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="379:3-382:9"> @@ -1342,7 +1388,7 @@ <outPattern location="401:2-407:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="401:5-404:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="401:9-401:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/109"/> </type> <bindings location="402:3-402:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="402:11-402:24" stringSymbol="description"/> @@ -1353,7 +1399,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="405:2-407:3" varName="textText" variableExp="//@elements.29/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="405:13-405:28" name="Text"> - <model href="temp#/1"/> + <model href="new-model#/110"/> </type> <bindings location="406:3-406:25" propertyName="value"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="406:12-406:25" name="description"> @@ -1365,7 +1411,7 @@ <inPattern location="400:2-400:35"> <elements xsi:type="atl:SimpleInPatternElement" location="400:7-400:35" varName="i" variableExp="//@elements.29/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="400:11-400:35" name="Description"> - <model href="temp#/3"/> + <model href="new-model#/108"/> </type> </elements> </inPattern> @@ -1374,7 +1420,7 @@ <outPattern location="412:2-431:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="412:5-415:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="412:9-412:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/112"/> </type> <bindings location="413:3-413:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="413:11-413:18" stringSymbol="build"/> @@ -1388,7 +1434,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="416:2-419:3" varName="defaultGoalElement" variableExp="//@elements.30/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="416:23-416:41" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/113"/> </type> <bindings location="417:3-417:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="417:11-417:24" stringSymbol="defaultGoal"/> @@ -1399,7 +1445,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="420:2-423:3" varName="defaultGoalText" variableExp="//@elements.30/@outPattern/@elements.1/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="420:20-420:35" name="Text"> - <model href="temp#/1"/> + <model href="new-model#/114"/> </type> <bindings location="421:3-421:24" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="421:11-421:24" name="defaultGoal"> @@ -1414,7 +1460,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="424:2-427:3" varName="sourceDirectoryElement" variableExp="//@elements.30/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="424:27-424:45" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/115"/> </type> <bindings location="425:3-425:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="425:11-425:28" stringSymbol="sourceDirectory"/> @@ -1425,7 +1471,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="428:2-431:3" varName="sourceDirectoryText" variableExp="//@elements.30/@outPattern/@elements.3/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="428:24-428:39" name="Text"> - <model href="temp#/1"/> + <model href="new-model#/116"/> </type> <bindings location="429:3-429:28" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="429:11-429:28" name="sourceDirectory"> @@ -1442,7 +1488,7 @@ <inPattern location="411:2-411:29"> <elements xsi:type="atl:SimpleInPatternElement" location="411:7-411:29" varName="i" variableExp="//@elements.30/@outPattern/@elements.2/@bindings.0/@value/@source //@elements.30/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.30/@outPattern/@elements.4/@bindings.0/@value/@source //@elements.30/@outPattern/@elements.4/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="411:11-411:29" name="Build"> - <model href="temp#/3"/> + <model href="new-model#/111"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/XML2Ant/XML2Ant.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/XML2Ant/XML2Ant.atl.xmi index 93dcdf1f..90755a93 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/XML2Ant/XML2Ant.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Ant2Maven/XML2Ant/XML2Ant.atl.xmi @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-459:2" name="XML2Ant"> <inModels location="2:23-2:31" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="10:1-14:9"> + <commentsBefore>----------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- helper : to extract a list of String from a String</commentsBefore> + <commentsBefore>-- extract a sequence of String from the String listString in the same order</commentsBefore> + <commentsBefore>-- (two elements are separated by a comma)</commentsBefore> + <commentsAfter>-- index1 : begin of the word</commentsAfter> + <commentsAfter>-- index2 : compteur</commentsAfter> <definition location="10:8-14:8"> <feature xsi:type="ocl:Operation" location="10:12-14:8" name="getList"> <parameters location="10:20-10:39" varName="listString" variableExp="//@elements.0/@definition/@feature/@body/@condition/@source/@source //@elements.0/@definition/@feature/@body/@elseExpression/@arguments.0"> @@ -25,7 +31,7 @@ </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="13:8-13:56" operationName="getListAux"> <source xsi:type="ocl:VariableExp" location="13:8-13:18"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/2"/> </source> <arguments xsi:type="ocl:VariableExp" location="13:30-13:40" referredVariable="//@elements.0/@definition/@feature/@parameters.0"/> <arguments xsi:type="ocl:IntegerExp" location="13:41-13:42" integerSymbol="1"/> @@ -37,6 +43,11 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="18:1-26:8"> + <commentsBefore>-- index1 : begin of the word</commentsBefore> + <commentsBefore>-- index2 : compteur</commentsBefore> + <commentsAfter>------------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- helper : to get an attribute</commentsAfter> + <commentsAfter>-- returns the value of the attribute 'name' (without test of existence)</commentsAfter> <definition location="18:8-26:7"> <feature xsi:type="ocl:Operation" location="18:12-26:7" name="getListAux"> <parameters location="18:23-18:42" varName="listString" variableExp="//@elements.1/@definition/@feature/@body/@condition/@source/@source //@elements.1/@definition/@feature/@body/@thenExpression/@arguments.0/@source //@elements.1/@definition/@feature/@body/@elseExpression/@condition/@source/@source //@elements.1/@definition/@feature/@body/@elseExpression/@thenExpression/@arguments.0 //@elements.1/@definition/@feature/@body/@elseExpression/@thenExpression/@arguments.3/@arguments.0/@source //@elements.1/@definition/@feature/@body/@elseExpression/@elseExpression/@arguments.0"> @@ -77,7 +88,7 @@ <elseExpression xsi:type="ocl:IfExp" location="22:4-25:9"> <thenExpression xsi:type="ocl:OperationCallExp" location="23:10-23:124" operationName="getListAux"> <source xsi:type="ocl:VariableExp" location="23:10-23:20"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/3"/> </source> <arguments xsi:type="ocl:VariableExp" location="23:32-23:42" referredVariable="//@elements.1/@definition/@feature/@parameters.0"/> <arguments xsi:type="ocl:OperatorCallExp" location="23:43-23:51" operationName="+"> @@ -110,7 +121,7 @@ </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="24:10-24:73" operationName="getListAux"> <source xsi:type="ocl:VariableExp" location="24:10-24:20"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/4"/> </source> <arguments xsi:type="ocl:VariableExp" location="24:32-24:42" referredVariable="//@elements.1/@definition/@feature/@parameters.0"/> <arguments xsi:type="ocl:VariableExp" location="24:43-24:49" referredVariable="//@elements.1/@definition/@feature/@parameters.1"/> @@ -126,6 +137,10 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="33:1-36:20"> + <commentsBefore>------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- helper : to get an attribute</commentsBefore> + <commentsBefore>-- returns the value of the attribute 'name' (without test of existence)</commentsBefore> + <commentsAfter>-- returns true if the attribute 'name' is defined</commentsAfter> <definition location="33:8-36:19"> <feature xsi:type="ocl:Operation" location="33:33-36:19" name="getAttrVal"> <parameters location="33:44-33:57" varName="name" variableExp="//@elements.2/@definition/@feature/@body/@source/@source/@body/@arguments.0/@arguments.0"> @@ -137,14 +152,14 @@ <source xsi:type="ocl:IteratorExp" location="34:5-35:61" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="34:5-34:18" name="children"> <source xsi:type="ocl:VariableExp" location="34:5-34:9"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/6"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="35:14-35:60" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="35:14-35:42" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="35:14-35:15" referredVariable="//@elements.2/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="35:28-35:41" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="35:47-35:60" operationName="="> @@ -161,12 +176,15 @@ </feature> <context_ location="33:8-33:27"> <context_ xsi:type="ocl:OclModelElement" location="33:16-33:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="39:1-41:29"> + <commentsBefore>-- returns true if the attribute 'name' is defined</commentsBefore> + <commentsAfter>-- returns the value of the attribute given in parameter</commentsAfter> + <commentsAfter>-- returns '' if this attribute does not exist</commentsAfter> <definition location="39:8-41:28"> <feature xsi:type="ocl:Operation" location="39:33-41:28" name="testAttribute"> <parameters location="39:47-39:60" varName="name" variableExp="//@elements.3/@definition/@feature/@body/@source/@source/@source/@body/@arguments.0/@arguments.0"> @@ -179,14 +197,14 @@ <source xsi:type="ocl:IteratorExp" location="40:7-40:82" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="40:7-40:20" name="children"> <source xsi:type="ocl:VariableExp" location="40:7-40:11"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/9"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="40:35-40:81" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="40:35-40:63" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="40:35-40:36" referredVariable="//@elements.3/@definition/@feature/@body/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="40:49-40:62" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="40:68-40:81" operationName="="> @@ -204,12 +222,17 @@ </feature> <context_ location="39:8-39:27"> <context_ xsi:type="ocl:OclModelElement" location="39:16-39:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="46:1-50:9"> + <commentsBefore>-- returns the value of the attribute given in parameter</commentsBefore> + <commentsBefore>-- returns '' if this attribute does not exist</commentsBefore> + <commentsAfter>--------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- others helpers</commentsAfter> + <commentsAfter>-- returns true if the element 'name' is defined</commentsAfter> <definition location="46:8-50:8"> <feature xsi:type="ocl:Operation" location="46:32-50:8" name="getAttribute"> <parameters location="46:45-46:58" varName="name" variableExp="//@elements.4/@definition/@feature/@body/@condition/@arguments.0 //@elements.4/@definition/@feature/@body/@thenExpression/@arguments.0"> @@ -219,13 +242,13 @@ <body xsi:type="ocl:IfExp" location="47:2-50:8"> <thenExpression xsi:type="ocl:OperationCallExp" location="48:8-48:29" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="48:8-48:12"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/13"/> </source> <arguments xsi:type="ocl:VariableExp" location="48:24-48:28" referredVariable="//@elements.4/@definition/@feature/@parameters.0"/> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="47:6-47:30" operationName="testAttribute"> <source xsi:type="ocl:VariableExp" location="47:6-47:10"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/12"/> </source> <arguments xsi:type="ocl:VariableExp" location="47:25-47:29" referredVariable="//@elements.4/@definition/@feature/@parameters.0"/> </condition> @@ -234,12 +257,17 @@ </feature> <context_ location="46:8-46:27"> <context_ xsi:type="ocl:OclModelElement" location="46:16-46:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="56:1-58:29"> + <commentsBefore>--------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- others helpers</commentsBefore> + <commentsBefore>-- returns true if the element 'name' is defined</commentsBefore> + <commentsAfter>-- returns the value of a text belonging to an element 'name'</commentsAfter> + <commentsAfter>-- return '' if the element does not exist</commentsAfter> <definition location="56:8-58:28"> <feature xsi:type="ocl:Operation" location="56:33-58:28" name="testElement"> <parameters location="56:45-56:58" varName="name" variableExp="//@elements.5/@definition/@feature/@body/@source/@source/@source/@body/@arguments.0/@arguments.0"> @@ -252,14 +280,14 @@ <source xsi:type="ocl:IteratorExp" location="57:7-57:80" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="57:7-57:20" name="children"> <source xsi:type="ocl:VariableExp" location="57:7-57:11"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/15"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="57:35-57:79" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="57:35-57:61" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="57:35-57:36" referredVariable="//@elements.5/@definition/@feature/@body/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="57:49-57:60" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/16"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="57:66-57:79" operationName="="> @@ -277,12 +305,18 @@ </feature> <context_ location="56:8-56:27"> <context_ xsi:type="ocl:OclModelElement" location="56:16-56:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="64:1-72:8"> + <commentsBefore>-- returns the value of a text belonging to an element 'name'</commentsBefore> + <commentsBefore>-- return '' if the element does not exist</commentsBefore> + <commentsAfter>--------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>--------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>--									RULES											--</commentsAfter> + <commentsAfter>-- central rule</commentsAfter> <definition location="64:8-72:7"> <feature xsi:type="ocl:Operation" location="64:33-72:7" name="getText"> <parameters location="64:41-64:54" varName="name" variableExp="//@elements.6/@definition/@feature/@body/@condition/@arguments.0 //@elements.6/@definition/@feature/@body/@thenExpression/@source/@source/@source/@source/@source/@body/@arguments.0/@arguments.0"> @@ -298,14 +332,14 @@ <source xsi:type="ocl:IteratorExp" location="66:6-67:58" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="66:6-66:19" name="children"> <source xsi:type="ocl:VariableExp" location="66:6-66:10"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/19"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="67:15-67:57" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="67:15-67:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="67:15-67:16" referredVariable="//@elements.6/@definition/@feature/@body/@thenExpression/@source/@source/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="67:29-67:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="67:46-67:57" operationName="="> @@ -322,7 +356,7 @@ <body xsi:type="ocl:OperationCallExp" location="69:17-69:40" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="69:17-69:18" referredVariable="//@elements.6/@definition/@feature/@body/@thenExpression/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="69:31-69:39" name="Text"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </arguments> </body> <iterators location="69:13-69:14" varName="c" variableExp="//@elements.6/@definition/@feature/@body/@thenExpression/@source/@source/@body/@source"/> @@ -331,7 +365,7 @@ </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="65:5-65:27" operationName="testElement"> <source xsi:type="ocl:VariableExp" location="65:5-65:9"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/18"/> </source> <arguments xsi:type="ocl:VariableExp" location="65:22-65:26" referredVariable="//@elements.6/@definition/@feature/@parameters.0"/> </condition> @@ -340,16 +374,22 @@ </feature> <context_ location="64:8-64:27"> <context_ xsi:type="ocl:OclModelElement" location="64:16-64:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="81:1-101:2" name="Root2Project"> + <commentsBefore>--------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>--------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>--									RULES											--</commentsBefore> + <commentsBefore>-- central rule</commentsBefore> + <commentsAfter>---------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- properties</commentsAfter> <outPattern location="83:2-100:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="83:5-100:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="83:9-83:20" name="Project"> - <model href="temp#/0"/> + <model href="new-model#/23"/> </type> <bindings location="84:3-84:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="84:11-84:33" operationName="getAttribute"> @@ -374,7 +414,7 @@ <source xsi:type="ocl:IteratorExp" location="87:15-89:58" name="select"> <source xsi:type="ocl:OperationCallExp" location="87:15-87:41" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="87:15-87:26" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="88:16-89:57" operationName="and"> @@ -409,7 +449,7 @@ <source xsi:type="ocl:OperationCallExp" location="92:15-92:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="92:15-92:16" referredVariable="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="92:29-92:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/25"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="92:46-92:61" operationName="="> @@ -432,7 +472,7 @@ <source xsi:type="ocl:OperationCallExp" location="95:15-95:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="95:15-95:16" referredVariable="//@elements.7/@outPattern/@elements.0/@bindings.5/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="95:29-95:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/26"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="95:46-95:65" operationName="="> @@ -454,7 +494,7 @@ <source xsi:type="ocl:OperationCallExp" location="97:15-97:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="97:15-97:16" referredVariable="//@elements.7/@outPattern/@elements.0/@bindings.6/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="97:29-97:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/27"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="97:46-97:64" operationName="="> @@ -476,7 +516,7 @@ <source xsi:type="ocl:OperationCallExp" location="99:15-99:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="99:15-99:16" referredVariable="//@elements.7/@outPattern/@elements.0/@bindings.7/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="99:29-99:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/28"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="99:46-99:63" operationName="="> @@ -494,16 +534,18 @@ <inPattern location="82:2-82:19"> <elements xsi:type="atl:SimpleInPatternElement" location="82:7-82:19" varName="i" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.3/@value/@source/@body/@arguments.0/@arguments.0/@source //@elements.7/@outPattern/@elements.0/@bindings.4/@value/@source/@source/@source //@elements.7/@outPattern/@elements.0/@bindings.5/@value/@source/@source //@elements.7/@outPattern/@elements.0/@bindings.6/@value/@source/@source //@elements.7/@outPattern/@elements.0/@bindings.7/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="82:11-82:19" name="Root"> - <model href="temp#/1"/> + <model href="new-model#/22"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="106:1-115:2" name="PropertyLocation"> + <commentsBefore>---------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- properties</commentsBefore> <outPattern location="111:2-114:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="111:5-114:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="111:9-111:29" name="PropertyLocation"> - <model href="temp#/0"/> + <model href="new-model#/30"/> </type> <bindings location="112:3-112:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="112:11-112:33" operationName="getAttribute"> @@ -522,7 +564,7 @@ <inPattern location="107:2-110:3"> <elements xsi:type="atl:SimpleInPatternElement" location="107:7-107:22" varName="i" variableExp="//@elements.8/@inPattern/@filter/@source/@source/@source //@elements.8/@inPattern/@filter/@arguments.0/@source //@elements.8/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.8/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="107:11-107:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/29"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="108:3-109:30" operationName="and"> @@ -543,7 +585,7 @@ <outPattern location="122:2-125:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="122:5-125:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="122:9-122:26" name="PropertyValue"> - <model href="temp#/0"/> + <model href="new-model#/32"/> </type> <bindings location="123:3-123:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="123:11-123:33" operationName="getAttribute"> @@ -562,7 +604,7 @@ <inPattern location="118:2-121:3"> <elements xsi:type="atl:SimpleInPatternElement" location="118:7-118:22" varName="i" variableExp="//@elements.9/@inPattern/@filter/@source/@source/@source //@elements.9/@inPattern/@filter/@arguments.0/@source //@elements.9/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="118:11-118:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/31"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="119:3-120:27" operationName="and"> @@ -583,7 +625,7 @@ <outPattern location="133:2-135:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="133:5-135:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="133:9-133:25" name="PropertyFile"> - <model href="temp#/0"/> + <model href="new-model#/34"/> </type> <bindings location="134:3-134:33" propertyName="file"> <value xsi:type="ocl:OperationCallExp" location="134:11-134:33" operationName="getAttribute"> @@ -596,7 +638,7 @@ <inPattern location="129:2-132:3"> <elements xsi:type="atl:SimpleInPatternElement" location="129:7-129:22" varName="i" variableExp="//@elements.10/@inPattern/@filter/@source/@source/@source //@elements.10/@inPattern/@filter/@arguments.0/@source //@elements.10/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="129:11-129:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="130:3-131:26" operationName="and"> @@ -614,10 +656,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="138:1-146:2" name="PropertyEnv"> + <commentsAfter>---------------------------------------------------------------</commentsAfter> + <commentsAfter>-- target</commentsAfter> <outPattern location="143:2-145:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="143:5-145:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="143:9-143:24" name="PropertyEnv"> - <model href="temp#/0"/> + <model href="new-model#/36"/> </type> <bindings location="144:3-144:47" propertyName="environment"> <value xsi:type="ocl:OperationCallExp" location="144:18-144:47" operationName="getAttribute"> @@ -630,7 +674,7 @@ <inPattern location="139:2-142:3"> <elements xsi:type="atl:SimpleInPatternElement" location="139:7-139:22" varName="i" variableExp="//@elements.11/@inPattern/@filter/@source/@source/@source //@elements.11/@inPattern/@filter/@arguments.0/@source //@elements.11/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="139:11-139:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/35"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="140:3-141:33" operationName="and"> @@ -648,10 +692,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="151:1-167:2" name="Target"> + <commentsBefore>---------------------------------------------------------------</commentsBefore> + <commentsBefore>-- target</commentsBefore> + <commentsAfter>-----------------------------------------------------------------</commentsAfter> + <commentsAfter>-- tasks</commentsAfter> + <commentsAfter>-----------------------------------------------------------------</commentsAfter> + <commentsAfter>-- concerning the taks defined by the user</commentsAfter> + <commentsAfter>-- definition of the task</commentsAfter> <outPattern location="155:2-166:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="155:5-166:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="155:9-155:19" name="Target"> - <model href="temp#/0"/> + <model href="new-model#/38"/> </type> <bindings location="156:3-156:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="156:11-156:33" operationName="getAttribute"> @@ -681,7 +732,7 @@ <value xsi:type="ocl:IteratorExp" location="160:15-163:41" name="select"> <source xsi:type="ocl:OperationCallExp" location="160:15-160:41" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="160:15-160:26" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/39"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="161:16-163:40" operationName="and"> @@ -694,7 +745,7 @@ <arguments xsi:type="ocl:CollectionOperationCallExp" location="162:9-163:40" operationName="includes"> <source xsi:type="ocl:OperationCallExp" location="162:9-162:54" operationName="getList"> <source xsi:type="ocl:VariableExp" location="162:9-162:19"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/40"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="162:28-162:53" operationName="getAttribute"> <source xsi:type="ocl:VariableExp" location="162:28-162:29" referredVariable="//@elements.12/@inPattern/@elements.0"/> @@ -718,7 +769,7 @@ <body xsi:type="ocl:OperationCallExp" location="165:15-165:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="165:15-165:16" referredVariable="//@elements.12/@outPattern/@elements.0/@bindings.5/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="165:29-165:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/41"/> </arguments> </body> <iterators location="165:11-165:12" varName="d" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.5/@value/@body/@source"/> @@ -729,7 +780,7 @@ <inPattern location="152:2-154:3"> <elements xsi:type="atl:SimpleInPatternElement" location="152:7-152:22" varName="i" variableExp="//@elements.12/@inPattern/@filter/@source/@source //@elements.12/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.12/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.12/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.12/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.12/@outPattern/@elements.0/@bindings.4/@value/@body/@arguments.0/@source/@arguments.0/@source //@elements.12/@outPattern/@elements.0/@bindings.5/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="152:11-152:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/37"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="153:3-153:20" operationName="="> @@ -741,10 +792,16 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="177:1-185:2" name="TaskDef"> + <commentsBefore>-----------------------------------------------------------------</commentsBefore> + <commentsBefore>-- tasks</commentsBefore> + <commentsBefore>-----------------------------------------------------------------</commentsBefore> + <commentsBefore>-- concerning the taks defined by the user</commentsBefore> + <commentsBefore>-- definition of the task</commentsBefore> + <commentsAfter>-- call of a task created by the user</commentsAfter> <outPattern location="181:2-184:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="181:5-184:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="181:9-181:20" name="TaskDef"> - <model href="temp#/0"/> + <model href="new-model#/43"/> </type> <bindings location="182:3-182:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="182:11-182:33" operationName="getAttribute"> @@ -763,7 +820,7 @@ <inPattern location="178:2-180:3"> <elements xsi:type="atl:SimpleInPatternElement" location="178:7-178:22" varName="i" variableExp="//@elements.13/@inPattern/@filter/@source/@source //@elements.13/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.13/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="178:11-178:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/42"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="179:3-179:21" operationName="="> @@ -775,17 +832,19 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="188:1-206:2" name="NewTask"> + <commentsBefore>-- call of a task created by the user</commentsBefore> <outPattern location="196:2-205:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="196:5-205:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="196:9-196:20" name="NewTask"> - <model href="temp#/0"/> + <model href="new-model#/46"/> </type> <bindings location="198:3-201:13" propertyName="taskName"> + <commentsBefore>-- reference to the definition of this task</commentsBefore> <value xsi:type="ocl:CollectionOperationCallExp" location="198:15-201:13" operationName="first"> <source xsi:type="ocl:IteratorExp" location="198:15-200:39" name="select"> <source xsi:type="ocl:OperationCallExp" location="198:15-198:41" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="198:15-198:26" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/47"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="199:16-200:38" operationName="and"> @@ -810,6 +869,7 @@ </value> </bindings> <bindings location="203:3-204:44" propertyName="attributes"> + <commentsBefore>-- its attributes</commentsBefore> <value xsi:type="ocl:IteratorExp" location="203:17-204:44" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="203:17-203:27" name="children"> <source xsi:type="ocl:VariableExp" location="203:17-203:18" referredVariable="//@elements.14/@inPattern/@elements.0"/> @@ -817,7 +877,7 @@ <body xsi:type="ocl:OperationCallExp" location="204:15-204:43" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="204:15-204:16" referredVariable="//@elements.14/@outPattern/@elements.0/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="204:29-204:42" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/48"/> </arguments> </body> <iterators location="204:11-204:12" varName="d" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.1/@value/@body/@source"/> @@ -828,15 +888,16 @@ <inPattern location="189:2-195:3"> <elements xsi:type="atl:SimpleInPatternElement" location="189:7-189:22" varName="i" variableExp="//@elements.14/@inPattern/@filter/@source/@source/@body/@arguments.0/@arguments.0/@source //@elements.14/@outPattern/@elements.0/@bindings.0/@value/@source/@body/@arguments.0/@arguments.0/@source //@elements.14/@outPattern/@elements.0/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="189:11-189:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/44"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="191:3-194:16" operationName="not"> + <commentsBefore>-- this task must be defined</commentsBefore> <source xsi:type="ocl:CollectionOperationCallExp" location="191:7-194:15" operationName="isEmpty"> <source xsi:type="ocl:IteratorExp" location="191:7-193:39" name="select"> <source xsi:type="ocl:OperationCallExp" location="191:7-191:33" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="191:7-191:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/45"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="192:16-193:38" operationName="and"> @@ -863,10 +924,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="209:1-220:2" name="Attribut"> + <commentsAfter>---------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- pre defined tasks</commentsAfter> <outPattern location="216:2-219:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="216:5-219:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="216:9-216:21" name="Attribut"> - <model href="temp#/0"/> + <model href="new-model#/51"/> </type> <bindings location="217:3-217:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="217:11-217:17" name="name"> @@ -883,7 +946,7 @@ <inPattern location="210:2-215:3"> <elements xsi:type="atl:SimpleInPatternElement" location="210:7-210:24" varName="i" variableExp="//@elements.15/@inPattern/@filter/@source/@source/@body/@arguments.0/@arguments.0/@source/@source //@elements.15/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="210:11-210:24" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/49"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="211:3-214:16" operationName="not"> @@ -891,7 +954,7 @@ <source xsi:type="ocl:IteratorExp" location="211:7-213:46" name="select"> <source xsi:type="ocl:OperationCallExp" location="211:7-211:33" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="211:7-211:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/50"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="212:16-213:45" operationName="and"> @@ -920,10 +983,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="226:1-233:2" name="Mkdir"> + <commentsBefore>---------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- pre defined tasks</commentsBefore> <outPattern location="230:2-232:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="230:5-232:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="230:9-230:18" name="Mkdir"> - <model href="temp#/0"/> + <model href="new-model#/53"/> </type> <bindings location="231:3-231:31" propertyName="dir"> <value xsi:type="ocl:OperationCallExp" location="231:10-231:31" operationName="getAttribute"> @@ -936,7 +1001,7 @@ <inPattern location="227:2-229:3"> <elements xsi:type="atl:SimpleInPatternElement" location="227:7-227:22" varName="i" variableExp="//@elements.16/@inPattern/@filter/@source/@source //@elements.16/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="227:11-227:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/52"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="228:3-228:19" operationName="="> @@ -951,14 +1016,14 @@ <outPattern location="239:2-239:21"> <elements xsi:type="atl:SimpleOutPatternElement" location="239:5-239:21" varName="o"> <type xsi:type="ocl:OclModelElement" location="239:9-239:19" name="Tstamp"> - <model href="temp#/0"/> + <model href="new-model#/55"/> </type> </elements> </outPattern> <inPattern location="236:2-238:3"> <elements xsi:type="atl:SimpleInPatternElement" location="236:7-236:22" varName="i" variableExp="//@elements.17/@inPattern/@filter/@source/@source"> <type xsi:type="ocl:OclModelElement" location="236:11-236:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/54"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="237:3-237:20" operationName="="> @@ -973,7 +1038,7 @@ <outPattern location="246:2-252:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="246:5-252:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="246:9-246:17" name="Java"> - <model href="temp#/0"/> + <model href="new-model#/57"/> </type> <bindings location="247:3-247:43" propertyName="classname"> <value xsi:type="ocl:OperationCallExp" location="247:16-247:43" operationName="getAttribute"> @@ -1002,7 +1067,7 @@ <source xsi:type="ocl:OperationCallExp" location="251:15-251:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="251:15-251:16" referredVariable="//@elements.18/@outPattern/@elements.0/@bindings.3/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="251:29-251:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/58"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="251:46-251:66" operationName="="> @@ -1020,7 +1085,7 @@ <inPattern location="243:2-245:3"> <elements xsi:type="atl:SimpleInPatternElement" location="243:7-243:22" varName="i" variableExp="//@elements.18/@inPattern/@filter/@source/@source //@elements.18/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.3/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="243:11-243:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/56"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="244:3-244:18" operationName="="> @@ -1035,7 +1100,7 @@ <outPattern location="259:2-267:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="259:5-267:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="259:9-259:18" name="Javac"> - <model href="temp#/0"/> + <model href="new-model#/60"/> </type> <bindings location="260:3-260:39" propertyName="destdir"> <value xsi:type="ocl:OperationCallExp" location="260:14-260:39" operationName="getAttribute"> @@ -1059,7 +1124,7 @@ <source xsi:type="ocl:OperationCallExp" location="263:15-263:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="263:15-263:16" referredVariable="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="263:29-263:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/61"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="263:46-263:66" operationName="="> @@ -1082,7 +1147,7 @@ <source xsi:type="ocl:OperationCallExp" location="266:15-266:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="266:15-266:16" referredVariable="//@elements.19/@outPattern/@elements.0/@bindings.3/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="266:29-266:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/62"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="266:47-266:87" operationName="or"> @@ -1108,7 +1173,7 @@ <inPattern location="256:2-258:3"> <elements xsi:type="atl:SimpleInPatternElement" location="256:7-256:22" varName="i" variableExp="//@elements.19/@inPattern/@filter/@source/@source //@elements.19/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@source //@elements.19/@outPattern/@elements.0/@bindings.3/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="256:11-256:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/59"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="257:3-257:19" operationName="="> @@ -1123,7 +1188,7 @@ <outPattern location="274:2-283:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="274:5-283:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="274:9-274:20" name="Javadoc"> - <model href="temp#/0"/> + <model href="new-model#/64"/> </type> <bindings location="275:4-275:46" propertyName="sourcepath"> <value xsi:type="ocl:OperationCallExp" location="275:18-275:46" operationName="getAttribute"> @@ -1178,7 +1243,7 @@ <inPattern location="271:2-273:3"> <elements xsi:type="atl:SimpleInPatternElement" location="271:7-271:22" varName="i" variableExp="//@elements.20/@inPattern/@filter/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.5/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.6/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.7/@value/@source"> <type xsi:type="ocl:OclModelElement" location="271:11-271:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/63"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="272:3-272:21" operationName="="> @@ -1193,7 +1258,7 @@ <outPattern location="290:2-298:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="290:5-298:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="290:9-290:17" name="Copy"> - <model href="temp#/0"/> + <model href="new-model#/66"/> </type> <bindings location="291:3-291:35" propertyName="todir"> <value xsi:type="ocl:OperationCallExp" location="291:12-291:35" operationName="getAttribute"> @@ -1211,7 +1276,7 @@ <source xsi:type="ocl:OperationCallExp" location="293:15-293:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="293:15-293:16" referredVariable="//@elements.21/@outPattern/@elements.0/@bindings.1/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="293:29-293:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/67"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="293:46-293:64" operationName="="> @@ -1235,7 +1300,7 @@ <source xsi:type="ocl:OperationCallExp" location="296:15-296:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="296:15-296:16" referredVariable="//@elements.21/@outPattern/@elements.0/@bindings.2/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="296:29-296:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/68"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="296:46-296:66" operationName="="> @@ -1254,7 +1319,7 @@ <inPattern location="287:2-289:3"> <elements xsi:type="atl:SimpleInPatternElement" location="287:7-287:22" varName="i" variableExp="//@elements.21/@inPattern/@filter/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.21/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="287:11-287:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/65"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="288:3-288:18" operationName="="> @@ -1269,7 +1334,7 @@ <outPattern location="305:2-307:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="305:5-307:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="305:9-305:19" name="Delete"> - <model href="temp#/0"/> + <model href="new-model#/70"/> </type> <bindings location="306:3-306:31" propertyName="dir"> <value xsi:type="ocl:OperationCallExp" location="306:10-306:31" operationName="getAttribute"> @@ -1282,7 +1347,7 @@ <inPattern location="302:2-304:3"> <elements xsi:type="atl:SimpleInPatternElement" location="302:7-302:22" varName="i" variableExp="//@elements.22/@inPattern/@filter/@source/@source //@elements.22/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="302:11-302:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/69"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="303:3-303:20" operationName="="> @@ -1294,10 +1359,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="310:1-318:2" name="Jar"> + <commentsAfter>------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- path, file and pattern</commentsAfter> <outPattern location="314:2-317:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="314:5-317:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="314:9-314:16" name="Jar"> - <model href="temp#/0"/> + <model href="new-model#/72"/> </type> <bindings location="315:3-315:39" propertyName="jarfile"> <value xsi:type="ocl:OperationCallExp" location="315:14-315:39" operationName="getAttribute"> @@ -1316,7 +1383,7 @@ <inPattern location="311:2-313:3"> <elements xsi:type="atl:SimpleInPatternElement" location="311:7-311:22" varName="i" variableExp="//@elements.23/@inPattern/@filter/@source/@source //@elements.23/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.23/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="311:11-311:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/71"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="312:3-312:17" operationName="="> @@ -1328,10 +1395,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="323:1-332:2" name="Path"> + <commentsBefore>------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- path, file and pattern</commentsBefore> <outPattern location="326:2-331:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="326:5-331:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="326:9-326:17" name="Path"> - <model href="temp#/0"/> + <model href="new-model#/74"/> </type> <bindings location="327:3-327:29" propertyName="id"> <value xsi:type="ocl:OperationCallExp" location="327:9-327:29" operationName="getAttribute"> @@ -1354,7 +1423,7 @@ <source xsi:type="ocl:OperationCallExp" location="330:15-330:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="330:15-330:16" referredVariable="//@elements.24/@outPattern/@elements.0/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="330:29-330:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/75"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="330:46-330:64" operationName="="> @@ -1372,7 +1441,7 @@ <inPattern location="324:2-325:19"> <elements xsi:type="atl:SimpleInPatternElement" location="324:7-324:22" varName="i" variableExp="//@elements.24/@inPattern/@filter/@source/@source //@elements.24/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.24/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.24/@outPattern/@elements.0/@bindings.2/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="324:11-324:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/73"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="325:3-325:18" operationName="="> @@ -1387,7 +1456,7 @@ <outPattern location="338:2-346:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="338:5-346:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="338:9-338:20" name="FileSet"> - <model href="temp#/0"/> + <model href="new-model#/77"/> </type> <bindings location="339:3-339:31" propertyName="dir"> <value xsi:type="ocl:OperationCallExp" location="339:10-339:31" operationName="getAttribute"> @@ -1404,7 +1473,7 @@ <source xsi:type="ocl:OperationCallExp" location="341:15-341:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="341:15-341:16" referredVariable="//@elements.25/@outPattern/@elements.0/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="341:29-341:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/78"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="341:46-341:67" operationName="="> @@ -1426,7 +1495,7 @@ <source xsi:type="ocl:OperationCallExp" location="343:15-343:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="343:15-343:16" referredVariable="//@elements.25/@outPattern/@elements.0/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="343:29-343:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/79"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="343:46-343:64" operationName="="> @@ -1448,7 +1517,7 @@ <source xsi:type="ocl:OperationCallExp" location="345:15-345:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="345:15-345:16" referredVariable="//@elements.25/@outPattern/@elements.0/@bindings.3/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="345:29-345:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/80"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="345:46-345:64" operationName="="> @@ -1466,7 +1535,7 @@ <inPattern location="335:2-337:3"> <elements xsi:type="atl:SimpleInPatternElement" location="335:7-335:22" varName="i" variableExp="//@elements.25/@inPattern/@filter/@source/@source //@elements.25/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.25/@outPattern/@elements.0/@bindings.1/@value/@source/@source //@elements.25/@outPattern/@elements.0/@bindings.2/@value/@source/@source //@elements.25/@outPattern/@elements.0/@bindings.3/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="335:11-335:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/76"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="336:3-336:21" operationName="="> @@ -1481,7 +1550,7 @@ <outPattern location="353:2-356:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="353:5-356:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="353:9-353:23" name="PatternSet"> - <model href="temp#/0"/> + <model href="new-model#/82"/> </type> <bindings location="354:3-355:87" propertyName="inexcludes"> <value xsi:type="ocl:IteratorExp" location="354:17-355:87" name="select"> @@ -1492,7 +1561,7 @@ <source xsi:type="ocl:OperationCallExp" location="355:15-355:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="355:15-355:16" referredVariable="//@elements.26/@outPattern/@elements.0/@bindings.0/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="355:29-355:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/83"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="355:47-355:85" operationName="or"> @@ -1518,7 +1587,7 @@ <inPattern location="350:2-352:3"> <elements xsi:type="atl:SimpleInPatternElement" location="350:7-350:22" varName="i" variableExp="//@elements.26/@inPattern/@filter/@source/@source //@elements.26/@outPattern/@elements.0/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="350:11-350:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/81"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="351:3-351:24" operationName="="> @@ -1533,7 +1602,7 @@ <outPattern location="363:2-369:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="363:5-369:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="363:9-363:22" name="ClassPath"> - <model href="temp#/0"/> + <model href="new-model#/85"/> </type> <bindings location="364:3-364:35" propertyName="refid"> <value xsi:type="ocl:OperationCallExp" location="364:12-364:35" operationName="getAttribute"> @@ -1550,7 +1619,7 @@ <source xsi:type="ocl:OperationCallExp" location="366:15-366:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="366:15-366:16" referredVariable="//@elements.27/@outPattern/@elements.0/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="366:29-366:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/86"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="366:46-366:68" operationName="="> @@ -1572,7 +1641,7 @@ <source xsi:type="ocl:OperationCallExp" location="368:15-368:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="368:15-368:16" referredVariable="//@elements.27/@outPattern/@elements.0/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="368:29-368:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/87"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="368:46-368:64" operationName="="> @@ -1590,7 +1659,7 @@ <inPattern location="360:2-362:3"> <elements xsi:type="atl:SimpleInPatternElement" location="360:7-360:22" varName="i" variableExp="//@elements.27/@inPattern/@filter/@source/@source //@elements.27/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.27/@outPattern/@elements.0/@bindings.1/@value/@source/@source //@elements.27/@outPattern/@elements.0/@bindings.2/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="360:11-360:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/84"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="361:3-361:23" operationName="="> @@ -1605,7 +1674,7 @@ <outPattern location="376:2-379:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="376:5-379:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="376:9-376:24" name="PathElement"> - <model href="temp#/0"/> + <model href="new-model#/89"/> </type> <bindings location="377:3-377:33" propertyName="path"> <value xsi:type="ocl:OperationCallExp" location="377:11-377:33" operationName="getAttribute"> @@ -1624,7 +1693,7 @@ <inPattern location="373:2-375:3"> <elements xsi:type="atl:SimpleInPatternElement" location="373:7-373:22" varName="i" variableExp="//@elements.28/@inPattern/@filter/@source/@source //@elements.28/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.28/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="373:11-373:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/88"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="374:3-374:25" operationName="="> @@ -1639,7 +1708,7 @@ <outPattern location="388:2-395:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="388:5-395:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="388:9-388:22" name="FilterSet"> - <model href="temp#/0"/> + <model href="new-model#/91"/> </type> <bindings location="389:3-389:45" propertyName="starttoken"> <value xsi:type="ocl:OperationCallExp" location="389:17-389:45" operationName="getAttribute"> @@ -1662,7 +1731,7 @@ <source xsi:type="ocl:OperationCallExp" location="392:15-392:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="392:15-392:16" referredVariable="//@elements.29/@outPattern/@elements.0/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="392:29-392:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/92"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="392:46-392:63" operationName="="> @@ -1684,7 +1753,7 @@ <source xsi:type="ocl:OperationCallExp" location="394:15-394:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="394:15-394:16" referredVariable="//@elements.29/@outPattern/@elements.0/@bindings.3/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="394:29-394:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/93"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="394:46-394:68" operationName="="> @@ -1702,7 +1771,7 @@ <inPattern location="385:2-387:3"> <elements xsi:type="atl:SimpleInPatternElement" location="385:7-385:22" varName="i" variableExp="//@elements.29/@inPattern/@filter/@source/@source //@elements.29/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.29/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.29/@outPattern/@elements.0/@bindings.2/@value/@source/@source //@elements.29/@outPattern/@elements.0/@bindings.3/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="385:11-385:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/90"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="386:3-386:23" operationName="="> @@ -1717,7 +1786,7 @@ <outPattern location="402:2-405:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="402:5-405:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="402:9-402:19" name="Filter"> - <model href="temp#/0"/> + <model href="new-model#/95"/> </type> <bindings location="403:3-403:35" propertyName="token"> <value xsi:type="ocl:OperationCallExp" location="403:12-403:35" operationName="getAttribute"> @@ -1736,7 +1805,7 @@ <inPattern location="399:2-401:3"> <elements xsi:type="atl:SimpleInPatternElement" location="399:7-399:22" varName="i" variableExp="//@elements.30/@inPattern/@filter/@source/@source //@elements.30/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.30/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="399:11-399:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/94"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="400:3-400:20" operationName="="> @@ -1751,7 +1820,7 @@ <outPattern location="412:2-414:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="412:5-414:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="412:9-412:24" name="FiltersFile"> - <model href="temp#/0"/> + <model href="new-model#/97"/> </type> <bindings location="413:3-413:33" propertyName="file"> <value xsi:type="ocl:OperationCallExp" location="413:11-413:33" operationName="getAttribute"> @@ -1764,7 +1833,7 @@ <inPattern location="409:2-411:3"> <elements xsi:type="atl:SimpleInPatternElement" location="409:7-409:22" varName="i" variableExp="//@elements.31/@inPattern/@filter/@source/@source //@elements.31/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="409:11-409:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/96"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="410:3-410:25" operationName="="> @@ -1779,7 +1848,7 @@ <outPattern location="421:2-425:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="421:5-425:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="421:9-421:21" name="Includes"> - <model href="temp#/0"/> + <model href="new-model#/99"/> </type> <bindings location="422:3-422:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="422:11-422:33" operationName="getAttribute"> @@ -1804,7 +1873,7 @@ <inPattern location="418:2-420:3"> <elements xsi:type="atl:SimpleInPatternElement" location="418:7-418:22" varName="i" variableExp="//@elements.32/@inPattern/@filter/@source/@source //@elements.32/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.32/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.32/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="418:11-418:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/98"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="419:3-419:21" operationName="="> @@ -1819,7 +1888,7 @@ <outPattern location="432:2-436:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="432:5-436:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="432:9-432:21" name="Excludes"> - <model href="temp#/0"/> + <model href="new-model#/101"/> </type> <bindings location="433:3-433:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="433:11-433:33" operationName="getAttribute"> @@ -1844,7 +1913,7 @@ <inPattern location="429:2-431:3"> <elements xsi:type="atl:SimpleInPatternElement" location="429:7-429:22" varName="i" variableExp="//@elements.33/@inPattern/@filter/@source/@source //@elements.33/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.33/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.33/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="429:11-429:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/100"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="430:3-430:21" operationName="="> @@ -1859,7 +1928,7 @@ <outPattern location="443:2-447:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="443:5-447:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="443:8-443:24" name="IncludesFile"> - <model href="temp#/0"/> + <model href="new-model#/103"/> </type> <bindings location="444:3-444:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="444:11-444:33" operationName="getAttribute"> @@ -1884,7 +1953,7 @@ <inPattern location="440:2-442:3"> <elements xsi:type="atl:SimpleInPatternElement" location="440:7-440:22" varName="i" variableExp="//@elements.34/@inPattern/@filter/@source/@source //@elements.34/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.34/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.34/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="440:11-440:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/102"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="441:3-441:26" operationName="="> @@ -1899,7 +1968,7 @@ <outPattern location="454:2-458:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="454:5-458:3" varName="o"> <type xsi:type="ocl:OclModelElement" location="454:9-454:25" name="ExcludesFile"> - <model href="temp#/0"/> + <model href="new-model#/105"/> </type> <bindings location="455:3-455:33" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="455:11-455:33" operationName="getAttribute"> @@ -1924,7 +1993,7 @@ <inPattern location="451:2-453:3"> <elements xsi:type="atl:SimpleInPatternElement" location="451:7-451:22" varName="i" variableExp="//@elements.35/@inPattern/@filter/@source/@source //@elements.35/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.35/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.35/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="451:11-451:22" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/104"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="452:3-452:26" operationName="="> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/AssertionModification/AssertionModification.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/AssertionModification/AssertionModification.atl.xmi index edcda678..c6779b19 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/AssertionModification/AssertionModification.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/AssertionModification/AssertionModification.atl.xmi @@ -1,35 +1,47 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="11:1-289:2" name="AssertionModification"> + <commentsBefore>-- @name		AssertionModification</commentsBefore> + <commentsBefore>-- @version		1.0</commentsBefore> + <commentsBefore>-- @domains		Catalogue of Model Transformations</commentsBefore> + <commentsBefore>-- @authors		SIMON Eric(simon.eric3<at>gmail.com)</commentsBefore> + <commentsBefore>-- @date		2006/08/09</commentsBefore> + <commentsBefore>-- @description	This transformation strenghthens or weakens an assertion(respectively postcondition and precondition).</commentsBefore> + <commentsBefore>-- @see http://www.dcs.kcl.ac.uk/staff/kcl/tcat.pdf </commentsBefore> + <commentsBefore>-- @see section 1.6, page 5</commentsBefore> + <commentsBefore>-- @see author of article : K. Lano</commentsBefore> + <commentsAfter>-- @end newRule</commentsAfter> <inModels location="12:30-12:39" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <inModels location="12:41-12:50" name="Lib"> - <metamodel href="temp#/2"/> + <metamodel href="new-model#/2"/> </inModels> <outModels location="12:8-12:24" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="16:1-19:40"> + <commentsBefore>-- @comment this helper returns the first attribute named "name"</commentsBefore> + <commentsAfter>-- @comment this helper returns the value of the first attribute named "name"</commentsAfter> <definition location="16:8-19:39"> <feature xsi:type="ocl:Operation" location="16:34-19:39" name="getAttr"> <parameters location="16:42-16:55" varName="name" variableExp="//@elements.0/@definition/@feature/@body/@source/@body/@arguments.0"> <type xsi:type="ocl:StringType" location="16:49-16:55"/> </parameters> <returnType xsi:type="ocl:OclModelElement" location="16:59-16:72" name="Attribute"> - <model href="temp#/2"/> + <model href="new-model#/4"/> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="17:3-19:39" operationName="first"> <source xsi:type="ocl:IteratorExp" location="17:3-19:30" name="select"> <source xsi:type="ocl:IteratorExp" location="17:3-18:44" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="17:3-17:16" name="children"> <source xsi:type="ocl:VariableExp" location="17:3-17:7"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/5"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="18:15-18:43" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="18:15-18:16" referredVariable="//@elements.0/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="18:29-18:42" name="Attribute"> - <model href="temp#/2"/> + <model href="new-model#/6"/> </arguments> </body> <iterators location="18:13-18:14" varName="c" variableExp="//@elements.0/@definition/@feature/@body/@source/@source/@body/@source"/> @@ -46,12 +58,14 @@ </feature> <context_ location="16:8-16:27"> <context_ xsi:type="ocl:OclModelElement" location="16:16-16:27" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/3"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="22:1-23:28"> + <commentsBefore>-- @comment this helper returns the value of the first attribute named "name"</commentsBefore> + <commentsAfter>-- @comment this helper returns the set of childs for a given type</commentsAfter> <definition location="22:8-23:27"> <feature xsi:type="ocl:Operation" location="22:34-23:27" name="getAttrVal"> <parameters location="22:45-22:58" varName="name" variableExp="//@elements.1/@definition/@feature/@body/@source/@arguments.0"> @@ -61,7 +75,7 @@ <body xsi:type="ocl:NavigationOrAttributeCallExp" location="23:3-23:27" name="value"> <source xsi:type="ocl:OperationCallExp" location="23:3-23:21" operationName="getAttr"> <source xsi:type="ocl:VariableExp" location="23:3-23:7"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/8"/> </source> <arguments xsi:type="ocl:VariableExp" location="23:16-23:20" referredVariable="//@elements.1/@definition/@feature/@parameters.0"/> </source> @@ -69,12 +83,14 @@ </feature> <context_ location="22:8-22:27"> <context_ xsi:type="ocl:OclModelElement" location="22:16-22:27" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/7"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="26:1-29:60"> + <commentsBefore>-- @comment this helper returns the set of childs for a given type</commentsBefore> + <commentsAfter>-- @comment this helper returns the new assertion contained by the library</commentsAfter> <definition location="26:8-29:59"> <feature xsi:type="ocl:Operation" location="27:7-29:59" name="getChildren"> <parameters location="27:19-27:32" varName="type" variableExp="//@elements.2/@definition/@feature/@body/@source/@body/@arguments.0"> @@ -85,14 +101,14 @@ </parameters> <returnType xsi:type="ocl:SequenceType" location="27:51-27:69"> <elementType xsi:type="ocl:OclModelElement" location="27:60-27:68" name="Node"> - <model href="temp#/2"/> + <model href="new-model#/10"/> </elementType> </returnType> <body xsi:type="ocl:IteratorExp" location="28:3-29:59" name="select"> <source xsi:type="ocl:IteratorExp" location="28:3-29:34" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="28:3-28:16" name="children"> <source xsi:type="ocl:VariableExp" location="28:3-28:7"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/11"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="29:14-29:33" operationName="oclIsKindOf"> @@ -112,60 +128,62 @@ </feature> <context_ location="26:8-26:27"> <context_ xsi:type="ocl:OclModelElement" location="26:16-26:27" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/9"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="32:1-43:3"> + <commentsBefore>-- @comment this helper returns the new assertion contained by the library</commentsBefore> + <commentsAfter>-- @comment this helper is called by the helper searchInLib for the constraint is on a class</commentsAfter> <definition location="32:8-42:7"> <feature xsi:type="ocl:Attribute" location="32:37-42:7" name="searchInLib"> <initExpression xsi:type="ocl:IfExp" location="33:2-42:7"> <thenExpression xsi:type="ocl:OperationCallExp" location="34:7-34:29" operationName="ClassExistInLib"> <source xsi:type="ocl:VariableExp" location="34:7-34:11"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/15"/> </source> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="33:5-33:39" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="33:5-33:15" name="owner"> <source xsi:type="ocl:VariableExp" location="33:5-33:9"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/13"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="33:28-33:38" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="35:7-41:8"> <thenExpression xsi:type="ocl:OperationCallExp" location="36:8-36:36" operationName="AssociationExistInLib"> <source xsi:type="ocl:VariableExp" location="36:8-36:12"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/18"/> </source> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="35:10-35:50" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="35:10-35:20" name="owner"> <source xsi:type="ocl:VariableExp" location="35:10-35:14"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/16"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="35:33-35:49" name="Association"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="37:8-40:9"> <thenExpression xsi:type="ocl:OperationCallExp" location="38:9-38:35" operationName="OperationExistInLib"> <source xsi:type="ocl:VariableExp" location="38:9-38:13"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/21"/> </source> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="37:11-37:49" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="37:11-37:21" name="owner"> <source xsi:type="ocl:VariableExp" location="37:11-37:15"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/19"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="37:34-37:48" name="Operation"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="39:9-39:70" stringSymbol="Erreur entry Type: either class or association or operation"/> @@ -176,12 +194,14 @@ </feature> <context_ location="32:8-32:31"> <context_ xsi:type="ocl:OclModelElement" location="32:16-32:31" name="Constraint"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="46:1-63:3"> + <commentsBefore>-- @comment this helper is called by the helper searchInLib for the constraint is on a class</commentsBefore> + <commentsAfter>-- @comment this helper is called by the helper searchInLib for the constraint is on an association</commentsAfter> <definition location="46:8-62:7"> <feature xsi:type="ocl:Operation" location="46:37-62:7" name="ClassExistInLib"> <returnType xsi:type="ocl:StringType" location="46:57-46:63"/> @@ -195,7 +215,7 @@ <source xsi:type="ocl:IteratorExp" location="54:3-54:55" name="select"> <source xsi:type="ocl:OperationCallExp" location="54:3-54:29" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="54:3-54:14" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/28"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="54:40-54:54" operationName="="> @@ -219,7 +239,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="55:41-55:59" name="package"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="55:41-55:51" name="owner"> <source xsi:type="ocl:VariableExp" location="55:41-55:45"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/29"/> </source> </source> </source> @@ -235,7 +255,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="56:34-56:49" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="56:34-56:44" name="owner"> <source xsi:type="ocl:VariableExp" location="56:34-56:38"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/30"/> </source> </source> </arguments> @@ -245,7 +265,7 @@ <source xsi:type="ocl:OperationCallExp" location="57:8-57:47" operationName="getChildren"> <source xsi:type="ocl:VariableExp" location="57:8-57:9" referredVariable="//@elements.4/@definition/@feature/@body/@thenExpression/@source/@source/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="57:22-57:33" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/31"/> </arguments> <arguments xsi:type="ocl:StringExp" location="57:35-57:46" stringSymbol="assertion"/> </source> @@ -256,7 +276,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="58:42-58:51" name="name"> <source xsi:type="ocl:VariableExp" location="58:42-58:46"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/32"/> </source> </arguments> </body> @@ -267,7 +287,7 @@ </source> </source> <arguments xsi:type="ocl:OclModelElement" location="59:25-59:36" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/33"/> </arguments> <arguments xsi:type="ocl:StringExp" location="59:38-59:49" stringSymbol="assertion"/> </source> @@ -278,7 +298,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="60:40-60:49" name="name"> <source xsi:type="ocl:VariableExp" location="60:40-60:44"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/34"/> </source> </arguments> </body> @@ -292,7 +312,7 @@ <source xsi:type="ocl:IteratorExp" location="47:5-47:57" name="select"> <source xsi:type="ocl:OperationCallExp" location="47:5-47:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="47:5-47:16" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/23"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="47:42-47:56" operationName="="> @@ -316,7 +336,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="48:41-48:59" name="package"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="48:41-48:51" name="owner"> <source xsi:type="ocl:VariableExp" location="48:41-48:45"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/24"/> </source> </source> </source> @@ -332,7 +352,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="49:34-49:49" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="49:34-49:44" name="owner"> <source xsi:type="ocl:VariableExp" location="49:34-49:38"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/25"/> </source> </source> </arguments> @@ -342,7 +362,7 @@ <source xsi:type="ocl:OperationCallExp" location="50:8-50:47" operationName="getChildren"> <source xsi:type="ocl:VariableExp" location="50:8-50:9" referredVariable="//@elements.4/@definition/@feature/@body/@condition/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="50:22-50:33" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/26"/> </arguments> <arguments xsi:type="ocl:StringExp" location="50:35-50:46" stringSymbol="assertion"/> </source> @@ -353,7 +373,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="51:42-51:51" name="name"> <source xsi:type="ocl:VariableExp" location="51:42-51:46"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/27"/> </source> </arguments> </body> @@ -370,12 +390,14 @@ </feature> <context_ location="46:8-46:31"> <context_ xsi:type="ocl:OclModelElement" location="46:16-46:31" name="Constraint"> - <model href="temp#/1"/> + <model href="new-model#/22"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="66:1-83:3"> + <commentsBefore>-- @comment this helper is called by the helper searchInLib for the constraint is on an association</commentsBefore> + <commentsAfter>-- @comment this helper is called by the helper searchInLib for the constraint is on an operation</commentsAfter> <definition location="66:8-82:7"> <feature xsi:type="ocl:Operation" location="66:37-82:7" name="AssociationExistInLib"> <returnType xsi:type="ocl:StringType" location="66:63-66:69"/> @@ -390,7 +412,7 @@ <source xsi:type="ocl:IteratorExp" location="74:3-74:61" name="select"> <source xsi:type="ocl:OperationCallExp" location="74:3-74:29" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="74:3-74:14" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/41"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="74:40-74:60" operationName="="> @@ -414,7 +436,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="75:41-75:59" name="package"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="75:41-75:51" name="owner"> <source xsi:type="ocl:VariableExp" location="75:41-75:45"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/42"/> </source> </source> </source> @@ -430,7 +452,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="76:34-76:49" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="76:34-76:44" name="owner"> <source xsi:type="ocl:VariableExp" location="76:34-76:38"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/43"/> </source> </source> </arguments> @@ -440,7 +462,7 @@ <source xsi:type="ocl:OperationCallExp" location="77:8-77:47" operationName="getChildren"> <source xsi:type="ocl:VariableExp" location="77:8-77:9" referredVariable="//@elements.5/@definition/@feature/@body/@thenExpression/@source/@source/@source/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="77:22-77:33" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/44"/> </arguments> <arguments xsi:type="ocl:StringExp" location="77:35-77:46" stringSymbol="assertion"/> </source> @@ -453,7 +475,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="78:48-78:57" name="name"> <source xsi:type="ocl:VariableExp" location="78:48-78:52"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/45"/> </source> </arguments> </body> @@ -464,7 +486,7 @@ </source> </source> <arguments xsi:type="ocl:OclModelElement" location="79:25-79:36" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/46"/> </arguments> <arguments xsi:type="ocl:StringExp" location="79:38-79:49" stringSymbol="assertion"/> </source> @@ -477,7 +499,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="80:46-80:55" name="name"> <source xsi:type="ocl:VariableExp" location="80:46-80:50"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/47"/> </source> </arguments> </body> @@ -493,7 +515,7 @@ <source xsi:type="ocl:IteratorExp" location="67:5-67:63" name="select"> <source xsi:type="ocl:OperationCallExp" location="67:5-67:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="67:5-67:16" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/36"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="67:42-67:62" operationName="="> @@ -517,7 +539,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="68:41-68:59" name="package"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="68:41-68:51" name="owner"> <source xsi:type="ocl:VariableExp" location="68:41-68:45"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/37"/> </source> </source> </source> @@ -533,7 +555,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="69:34-69:49" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="69:34-69:44" name="owner"> <source xsi:type="ocl:VariableExp" location="69:34-69:38"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/38"/> </source> </source> </arguments> @@ -543,7 +565,7 @@ <source xsi:type="ocl:OperationCallExp" location="70:8-70:47" operationName="getChildren"> <source xsi:type="ocl:VariableExp" location="70:8-70:9" referredVariable="//@elements.5/@definition/@feature/@body/@condition/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="70:22-70:33" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/39"/> </arguments> <arguments xsi:type="ocl:StringExp" location="70:35-70:46" stringSymbol="assertion"/> </source> @@ -556,7 +578,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="71:48-71:57" name="name"> <source xsi:type="ocl:VariableExp" location="71:48-71:52"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/40"/> </source> </arguments> </body> @@ -573,12 +595,14 @@ </feature> <context_ location="66:8-66:31"> <context_ xsi:type="ocl:OclModelElement" location="66:16-66:31" name="Constraint"> - <model href="temp#/1"/> + <model href="new-model#/35"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="86:1-125:3"> + <commentsBefore>-- @comment this helper is called by the helper searchInLib for the constraint is on an operation</commentsBefore> + <commentsAfter>-- @begin Model</commentsAfter> <definition location="86:8-124:8"> <feature xsi:type="ocl:Operation" location="86:37-124:8" name="OperationExistInLib"> <returnType xsi:type="ocl:StringType" location="86:61-86:67"/> @@ -594,7 +618,7 @@ <source xsi:type="ocl:IteratorExp" location="96:4-96:60" name="select"> <source xsi:type="ocl:OperationCallExp" location="96:4-96:30" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="96:4-96:15" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/56"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="96:41-96:59" operationName="="> @@ -619,7 +643,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="97:42-97:58" name="owner"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="97:42-97:52" name="owner"> <source xsi:type="ocl:VariableExp" location="97:42-97:46"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/57"/> </source> </source> </source> @@ -637,7 +661,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="98:36-98:52" name="owner"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="98:36-98:46" name="owner"> <source xsi:type="ocl:VariableExp" location="98:36-98:40"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/58"/> </source> </source> </source> @@ -648,7 +672,7 @@ <source xsi:type="ocl:OperationCallExp" location="99:9-99:51" operationName="getChildren"> <source xsi:type="ocl:VariableExp" location="99:9-99:10" referredVariable="//@elements.6/@definition/@feature/@body/@thenExpression/@thenExpression/@source/@source/@source/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="99:23-99:34" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/59"/> </arguments> <arguments xsi:type="ocl:StringExp" location="99:36-99:50" stringSymbol="precondition"/> </source> @@ -661,7 +685,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="100:47-100:56" name="name"> <source xsi:type="ocl:VariableExp" location="100:47-100:51"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/60"/> </source> </arguments> </body> @@ -672,7 +696,7 @@ </source> </source> <arguments xsi:type="ocl:OclModelElement" location="101:26-101:37" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/61"/> </arguments> <arguments xsi:type="ocl:StringExp" location="101:39-101:53" stringSymbol="precondition"/> </source> @@ -685,7 +709,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="102:47-102:56" name="name"> <source xsi:type="ocl:VariableExp" location="102:47-102:51"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/62"/> </source> </arguments> </body> @@ -701,7 +725,7 @@ <source xsi:type="ocl:IteratorExp" location="89:6-89:62" name="select"> <source xsi:type="ocl:OperationCallExp" location="89:6-89:32" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="89:6-89:17" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/51"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="89:43-89:61" operationName="="> @@ -726,7 +750,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="90:42-90:58" name="owner"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="90:42-90:52" name="owner"> <source xsi:type="ocl:VariableExp" location="90:42-90:46"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/52"/> </source> </source> </source> @@ -744,7 +768,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="91:36-91:52" name="owner"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="91:36-91:46" name="owner"> <source xsi:type="ocl:VariableExp" location="91:36-91:40"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/53"/> </source> </source> </source> @@ -755,7 +779,7 @@ <source xsi:type="ocl:OperationCallExp" location="92:9-92:51" operationName="getChildren"> <source xsi:type="ocl:VariableExp" location="92:9-92:10" referredVariable="//@elements.6/@definition/@feature/@body/@thenExpression/@condition/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="92:23-92:34" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/54"/> </arguments> <arguments xsi:type="ocl:StringExp" location="92:36-92:50" stringSymbol="precondition"/> </source> @@ -768,7 +792,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="93:47-93:56" name="name"> <source xsi:type="ocl:VariableExp" location="93:47-93:51"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/55"/> </source> </arguments> </body> @@ -786,12 +810,12 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="87:5-87:28" name="precondition"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="87:5-87:15" name="owner"> <source xsi:type="ocl:VariableExp" location="87:5-87:9"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/49"/> </source> </source> </source> <arguments xsi:type="ocl:VariableExp" location="87:39-87:43"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/50"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="105:7-123:9"> @@ -806,7 +830,7 @@ <source xsi:type="ocl:IteratorExp" location="113:10-113:66" name="select"> <source xsi:type="ocl:OperationCallExp" location="113:10-113:36" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="113:10-113:21" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/70"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="113:47-113:65" operationName="="> @@ -831,7 +855,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="114:44-114:60" name="owner"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="114:44-114:54" name="owner"> <source xsi:type="ocl:VariableExp" location="114:44-114:48"> - <referredVariable href="temp#/40"/> + <referredVariable href="new-model#/71"/> </source> </source> </source> @@ -849,7 +873,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="115:38-115:54" name="owner"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="115:38-115:48" name="owner"> <source xsi:type="ocl:VariableExp" location="115:38-115:42"> - <referredVariable href="temp#/41"/> + <referredVariable href="new-model#/72"/> </source> </source> </source> @@ -860,7 +884,7 @@ <source xsi:type="ocl:OperationCallExp" location="116:11-116:54" operationName="getChildren"> <source xsi:type="ocl:VariableExp" location="116:11-116:12" referredVariable="//@elements.6/@definition/@feature/@body/@elseExpression/@thenExpression/@thenExpression/@source/@source/@source/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="116:25-116:36" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/73"/> </arguments> <arguments xsi:type="ocl:StringExp" location="116:38-116:53" stringSymbol="postcondition"/> </source> @@ -873,7 +897,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="117:50-117:59" name="name"> <source xsi:type="ocl:VariableExp" location="117:50-117:54"> - <referredVariable href="temp#/42"/> + <referredVariable href="new-model#/74"/> </source> </arguments> </body> @@ -884,7 +908,7 @@ </source> </source> <arguments xsi:type="ocl:OclModelElement" location="118:28-118:39" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/75"/> </arguments> <arguments xsi:type="ocl:StringExp" location="118:41-118:56" stringSymbol="postcondition"/> </source> @@ -897,7 +921,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="119:49-119:58" name="name"> <source xsi:type="ocl:VariableExp" location="119:49-119:53"> - <referredVariable href="temp#/43"/> + <referredVariable href="new-model#/76"/> </source> </arguments> </body> @@ -913,7 +937,7 @@ <source xsi:type="ocl:IteratorExp" location="107:8-107:64" name="select"> <source xsi:type="ocl:OperationCallExp" location="107:8-107:34" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="107:8-107:19" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/65"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="107:45-107:63" operationName="="> @@ -938,7 +962,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="108:43-108:59" name="owner"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="108:43-108:53" name="owner"> <source xsi:type="ocl:VariableExp" location="108:43-108:47"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/66"/> </source> </source> </source> @@ -956,7 +980,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="109:37-109:53" name="owner"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="109:37-109:47" name="owner"> <source xsi:type="ocl:VariableExp" location="109:37-109:41"> - <referredVariable href="temp#/38"/> + <referredVariable href="new-model#/67"/> </source> </source> </source> @@ -967,7 +991,7 @@ <source xsi:type="ocl:OperationCallExp" location="110:10-110:53" operationName="getChildren"> <source xsi:type="ocl:VariableExp" location="110:10-110:11" referredVariable="//@elements.6/@definition/@feature/@body/@elseExpression/@thenExpression/@condition/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="110:24-110:35" name="Element"> - <model href="temp#/2"/> + <model href="new-model#/68"/> </arguments> <arguments xsi:type="ocl:StringExp" location="110:37-110:52" stringSymbol="postcondition"/> </source> @@ -980,7 +1004,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="111:49-111:58" name="name"> <source xsi:type="ocl:VariableExp" location="111:49-111:53"> - <referredVariable href="temp#/39"/> + <referredVariable href="new-model#/69"/> </source> </arguments> </body> @@ -998,12 +1022,12 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="105:10-105:34" name="postcondition"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="105:10-105:20" name="owner"> <source xsi:type="ocl:VariableExp" location="105:10-105:14"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/63"/> </source> </source> </source> <arguments xsi:type="ocl:VariableExp" location="105:45-105:49"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/64"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="122:9-122:17" stringSymbol="noRule"/> @@ -1012,16 +1036,19 @@ </feature> <context_ location="86:8-86:31"> <context_ xsi:type="ocl:OclModelElement" location="86:16-86:31" name="Constraint"> - <model href="temp#/1"/> + <model href="new-model#/48"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="128:1-136:2" name="Model"> + <commentsBefore>-- @begin Model</commentsBefore> + <commentsAfter>-- @end Model</commentsAfter> + <commentsAfter>-- @begin DataType</commentsAfter> <outPattern location="131:2-135:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="132:3-135:4" varName="outputM"> <type xsi:type="ocl:OclModelElement" location="132:13-132:29" name="Model"> - <model href="temp#/0"/> + <model href="new-model#/78"/> </type> <bindings location="133:4-133:23" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="133:12-133:23" name="name"> @@ -1038,16 +1065,20 @@ <inPattern location="129:2-130:22"> <elements xsi:type="atl:SimpleInPatternElement" location="130:3-130:22" varName="inputM" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="130:12-130:22" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/77"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="140:1-147:2" name="DataType"> + <commentsBefore>-- @end Model</commentsBefore> + <commentsBefore>-- @begin DataType</commentsBefore> + <commentsAfter>-- @end DataType</commentsAfter> + <commentsAfter>-- @begin LiteralNull</commentsAfter> <outPattern location="143:2-146:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="144:3-146:4" varName="outputC"> <type xsi:type="ocl:OclModelElement" location="144:13-144:32" name="DataType"> - <model href="temp#/0"/> + <model href="new-model#/80"/> </type> <bindings location="145:3-145:22" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="145:11-145:22" name="name"> @@ -1059,32 +1090,40 @@ <inPattern location="141:2-142:25"> <elements xsi:type="atl:SimpleInPatternElement" location="142:3-142:25" varName="inputC" variableExp="//@elements.8/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="142:12-142:25" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/79"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="151:1-156:2" name="LiteralNull"> + <commentsBefore>-- @end DataType</commentsBefore> + <commentsBefore>-- @begin LiteralNull</commentsBefore> + <commentsAfter>-- @end LiteralNull</commentsAfter> + <commentsAfter>-- @begin LiteralInteger</commentsAfter> <outPattern location="154:2-155:36"> <elements xsi:type="atl:SimpleOutPatternElement" location="155:3-155:36" varName="outputLN"> <type xsi:type="ocl:OclModelElement" location="155:14-155:36" name="LiteralNull"> - <model href="temp#/0"/> + <model href="new-model#/82"/> </type> </elements> </outPattern> <inPattern location="152:2-153:29"> <elements xsi:type="atl:SimpleInPatternElement" location="153:3-153:29" varName="inputLN"> <type xsi:type="ocl:OclModelElement" location="153:13-153:29" name="LiteralNull"> - <model href="temp#/1"/> + <model href="new-model#/81"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="160:1-167:2" name="LiteralInteger"> + <commentsBefore>-- @end LiteralNull</commentsBefore> + <commentsBefore>-- @begin LiteralInteger</commentsBefore> + <commentsAfter>-- @end LiteralInteger</commentsAfter> + <commentsAfter>-- @begin LiteralUnlimitedNatural</commentsAfter> <outPattern location="163:2-166:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="164:3-166:4" varName="outputLI"> <type xsi:type="ocl:OclModelElement" location="164:14-164:39" name="LiteralInteger"> - <model href="temp#/0"/> + <model href="new-model#/84"/> </type> <bindings location="165:4-165:26" propertyName="value"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="165:13-165:26" name="value"> @@ -1096,16 +1135,20 @@ <inPattern location="161:2-162:32"> <elements xsi:type="atl:SimpleInPatternElement" location="162:3-162:32" varName="inputLI" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="162:13-162:32" name="LiteralInteger"> - <model href="temp#/1"/> + <model href="new-model#/83"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="171:1-178:2" name="LiteralUnlimitedNatural"> + <commentsBefore>-- @end LiteralInteger</commentsBefore> + <commentsBefore>-- @begin LiteralUnlimitedNatural</commentsBefore> + <commentsAfter>-- @end LiteralUnlimitedNatural</commentsAfter> + <commentsAfter>-- @begin LiteralString</commentsAfter> <outPattern location="174:2-177:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="175:3-177:4" varName="outputLUN"> <type xsi:type="ocl:OclModelElement" location="175:15-175:49" name="LiteralUnlimitedNatural"> - <model href="temp#/0"/> + <model href="new-model#/86"/> </type> <bindings location="176:4-176:27" propertyName="value"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="176:13-176:27" name="value"> @@ -1117,16 +1160,20 @@ <inPattern location="172:2-173:42"> <elements xsi:type="atl:SimpleInPatternElement" location="173:3-173:42" varName="inputLUN" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="173:14-173:42" name="LiteralUnlimitedNatural"> - <model href="temp#/1"/> + <model href="new-model#/85"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="182:1-190:2" name="LiteralString"> + <commentsBefore>-- @end LiteralUnlimitedNatural</commentsBefore> + <commentsBefore>-- @begin LiteralString</commentsBefore> + <commentsAfter>-- @end LiteralString</commentsAfter> + <commentsAfter>-- @begin Association</commentsAfter> <outPattern location="186:2-189:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="187:3-189:4" varName="outputLS"> <type xsi:type="ocl:OclModelElement" location="187:14-187:38" name="LiteralString"> - <model href="temp#/0"/> + <model href="new-model#/88"/> </type> <bindings location="188:4-188:26" propertyName="value"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="188:13-188:26" name="value"> @@ -1138,7 +1185,7 @@ <inPattern location="183:2-185:49"> <elements xsi:type="atl:SimpleInPatternElement" location="184:3-184:31" varName="inputLS" variableExp="//@elements.12/@inPattern/@filter/@source/@source/@source //@elements.12/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="184:13-184:31" name="LiteralString"> - <model href="temp#/1"/> + <model href="new-model#/87"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="185:4-185:48" operationName="="> @@ -1152,10 +1199,14 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="194:1-202:2" name="Association"> + <commentsBefore>-- @end LiteralString</commentsBefore> + <commentsBefore>-- @begin Association</commentsBefore> + <commentsAfter>-- @end Association</commentsAfter> + <commentsAfter>-- @begin Property</commentsAfter> <outPattern location="197:2-201:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="198:3-201:3" varName="outputA"> <type xsi:type="ocl:OclModelElement" location="198:13-198:35" name="Association"> - <model href="temp#/0"/> + <model href="new-model#/90"/> </type> <bindings location="199:4-199:23" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="199:12-199:23" name="name"> @@ -1172,16 +1223,20 @@ <inPattern location="195:2-196:28"> <elements xsi:type="atl:SimpleInPatternElement" location="196:3-196:28" varName="inputA" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.13/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="196:12-196:28" name="Association"> - <model href="temp#/1"/> + <model href="new-model#/89"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="206:1-218:2" name="Property"> + <commentsBefore>-- @end Association</commentsBefore> + <commentsBefore>-- @begin Property</commentsBefore> + <commentsAfter>-- @end Property</commentsAfter> + <commentsAfter>-- @begin Constraint</commentsAfter> <outPattern location="209:2-217:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="210:3-217:4" varName="outputP"> <type xsi:type="ocl:OclModelElement" location="210:13-210:32" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/92"/> </type> <bindings location="211:4-211:49" propertyName="owningAssociation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="211:25-211:49" name="owningAssociation"> @@ -1218,16 +1273,20 @@ <inPattern location="207:2-208:25"> <elements xsi:type="atl:SimpleInPatternElement" location="208:3-208:25" varName="inputP" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.5/@value/@source"> <type xsi:type="ocl:OclModelElement" location="208:12-208:25" name="Property"> - <model href="temp#/1"/> + <model href="new-model#/91"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="222:1-234:2" name="Constraint"> + <commentsBefore>-- @end Property</commentsBefore> + <commentsBefore>-- @begin Constraint</commentsBefore> + <commentsAfter>-- @end Constraint</commentsAfter> + <commentsAfter>-- @begin Class</commentsAfter> <outPattern location="225:2-233:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="226:3-233:4" varName="outputC"> <type xsi:type="ocl:OclModelElement" location="226:13-226:34" name="Constraint"> - <model href="temp#/0"/> + <model href="new-model#/94"/> </type> <bindings location="227:4-227:23" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="227:12-227:23" name="name"> @@ -1235,6 +1294,7 @@ </value> </bindings> <bindings location="229:4-232:14" propertyName="specification"> + <commentsBefore>--namespace <- inputC.namespace,</commentsBefore> <value xsi:type="ocl:IfExp" location="229:21-232:14"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="230:14-230:34" name="specification"> <source xsi:type="ocl:VariableExp" location="230:14-230:20" referredVariable="//@elements.15/@inPattern/@elements.0"/> @@ -1247,7 +1307,7 @@ </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="231:14-231:40" operationName="newRule"> <source xsi:type="ocl:VariableExp" location="231:14-231:24"> - <referredVariable href="temp#/44"/> + <referredVariable href="new-model#/95"/> </source> <arguments xsi:type="ocl:VariableExp" location="231:33-231:39" referredVariable="//@elements.15/@inPattern/@elements.0"/> </elseExpression> @@ -1258,16 +1318,20 @@ <inPattern location="223:2-224:27"> <elements xsi:type="atl:SimpleInPatternElement" location="224:3-224:27" varName="inputC" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.1/@value/@condition/@source/@source //@elements.15/@outPattern/@elements.0/@bindings.1/@value/@thenExpression/@source //@elements.15/@outPattern/@elements.0/@bindings.1/@value/@elseExpression/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="224:12-224:27" name="Constraint"> - <model href="temp#/1"/> + <model href="new-model#/93"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="238:1-250:2" name="Class"> + <commentsBefore>-- @end Constraint</commentsBefore> + <commentsBefore>-- @begin Class</commentsBefore> + <commentsAfter>-- @end Class</commentsAfter> + <commentsAfter>-- @begin Operation</commentsAfter> <outPattern location="241:2-249:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="242:3-249:4" varName="outputC"> <type xsi:type="ocl:OclModelElement" location="242:13-242:29" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/97"/> </type> <bindings location="243:4-243:23" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="243:12-243:23" name="name"> @@ -1304,16 +1368,20 @@ <inPattern location="239:2-240:22"> <elements xsi:type="atl:SimpleInPatternElement" location="240:3-240:22" varName="inputC" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.5/@value/@source"> <type xsi:type="ocl:OclModelElement" location="240:12-240:22" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/96"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="254:1-264:2" name="Operation"> + <commentsBefore>-- @end Class</commentsBefore> + <commentsBefore>-- @begin Operation</commentsBefore> + <commentsAfter>-- @end Operation</commentsAfter> + <commentsAfter>-- @begin Parameter</commentsAfter> <outPattern location="257:2-263:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="258:3-263:4" varName="outputO"> <type xsi:type="ocl:OclModelElement" location="258:13-258:33" name="Operation"> - <model href="temp#/0"/> + <model href="new-model#/99"/> </type> <bindings location="259:4-259:23" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="259:12-259:23" name="name"> @@ -1340,16 +1408,21 @@ <inPattern location="255:2-256:26"> <elements xsi:type="atl:SimpleInPatternElement" location="256:3-256:26" varName="inputO" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.17/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.17/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.17/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="256:12-256:26" name="Operation"> - <model href="temp#/1"/> + <model href="new-model#/98"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="268:1-277:2" name="Parameter"> + <commentsBefore>-- @end Operation</commentsBefore> + <commentsBefore>-- @begin Parameter</commentsBefore> + <commentsAfter>-- @end Parameter</commentsAfter> + <commentsAfter>-- @comment this lazy rule replace the oldest assertion by a new</commentsAfter> + <commentsAfter>-- @begin newRule</commentsAfter> <outPattern location="271:2-276:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="272:3-276:4" varName="outputP"> <type xsi:type="ocl:OclModelElement" location="272:13-272:33" name="Parameter"> - <model href="temp#/0"/> + <model href="new-model#/101"/> </type> <bindings location="273:4-273:23" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="273:12-273:23" name="name"> @@ -1357,6 +1430,7 @@ </value> </bindings> <bindings location="275:4-275:23" propertyName="type"> + <commentsBefore>--operation <- inputP.operation,</commentsBefore> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="275:12-275:23" name="type"> <source xsi:type="ocl:VariableExp" location="275:12-275:18" referredVariable="//@elements.18/@inPattern/@elements.0"/> </value> @@ -1366,16 +1440,20 @@ <inPattern location="269:2-270:26"> <elements xsi:type="atl:SimpleInPatternElement" location="270:3-270:26" varName="inputP" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="270:12-270:26" name="Parameter"> - <model href="temp#/1"/> + <model href="new-model#/100"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:LazyMatchedRule" location="282:1-289:2" name="newRule"> + <commentsBefore>-- @end Parameter</commentsBefore> + <commentsBefore>-- @comment this lazy rule replace the oldest assertion by a new</commentsBefore> + <commentsBefore>-- @begin newRule</commentsBefore> + <commentsAfter>-- @end newRule</commentsAfter> <outPattern location="285:2-288:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="286:3-288:4" varName="outputLS"> <type xsi:type="ocl:OclModelElement" location="286:14-286:38" name="LiteralString"> - <model href="temp#/0"/> + <model href="new-model#/103"/> </type> <bindings location="287:4-287:41" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="287:13-287:41" operationName="OperationExistInLib"> @@ -1387,7 +1465,7 @@ <inPattern location="283:2-284:27"> <elements xsi:type="atl:SimpleInPatternElement" location="284:3-284:27" varName="inputC" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="284:12-284:27" name="Constraint"> - <model href="temp#/1"/> + <model href="new-model#/102"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/BibTeX2DocBook/BibTeX2DocBook.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/BibTeX2DocBook/BibTeX2DocBook.atl.xmi index a854e36a..157b8f02 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/BibTeX2DocBook/BibTeX2DocBook.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/BibTeX2DocBook/BibTeX2DocBook.atl.xmi @@ -1,19 +1,30 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-261:2" name="BibTeX2DocBook"> <inModels location="2:27-2:38" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:21" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="13:1-19:30"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper builds the set of distinct authors referenced in the input BibTeX</commentsBefore> + <commentsBefore>-- model.</commentsBefore> + <commentsBefore>-- Built set is sorted by author name.</commentsBefore> + <commentsBefore>-- RETURN: Sequence(BibTeX!Author)</commentsBefore> + <commentsAfter>-- This helper builds the set of distinct titles referenced in the input BibTeX</commentsAfter> + <commentsAfter>-- model.</commentsAfter> + <commentsAfter>-- Built set is sorted by title.</commentsAfter> + <commentsAfter>-- RETURN: Sequence(BibTeX!TitledEntry)</commentsAfter> <definition location="13:8-19:29"> <feature xsi:type="ocl:Attribute" location="13:13-19:29" name="authorSet"> <initExpression xsi:type="ocl:IteratorExp" location="13:51-19:29" name="sortedBy"> <source xsi:type="ocl:IterateExp" location="13:51-19:5"> <source xsi:type="ocl:OperationCallExp" location="13:51-13:79" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="13:51-13:64" name="Author"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </source> </source> <body xsi:type="ocl:IfExp" location="14:5-18:10"> @@ -39,7 +50,7 @@ <result location="13:92-13:135" varName="ret" variableExp="//@elements.0/@definition/@feature/@initExpression/@source/@body/@condition/@source/@source //@elements.0/@definition/@feature/@initExpression/@source/@body/@thenExpression //@elements.0/@definition/@feature/@initExpression/@source/@body/@elseExpression/@source"> <type xsi:type="ocl:SequenceType" location="13:98-13:121"> <elementType xsi:type="ocl:OclModelElement" location="13:107-13:120" name="Author"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="13:124-13:135"/> @@ -52,20 +63,28 @@ </initExpression> <type xsi:type="ocl:SequenceType" location="13:25-13:48"> <elementType xsi:type="ocl:OclModelElement" location="13:34-13:47" name="Author"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="25:1-31:29"> + <commentsBefore>-- This helper builds the set of distinct titles referenced in the input BibTeX</commentsBefore> + <commentsBefore>-- model.</commentsBefore> + <commentsBefore>-- Built set is sorted by title.</commentsBefore> + <commentsBefore>-- RETURN: Sequence(BibTeX!TitledEntry)</commentsBefore> + <commentsAfter>-- This helper builds the set of distinct journals referenced in the input BibTeX</commentsAfter> + <commentsAfter>-- model.</commentsAfter> + <commentsAfter>-- Built set is sorted by journal name.</commentsAfter> + <commentsAfter>-- RETURN: Sequence(BibTeX!Article)</commentsAfter> <definition location="25:8-31:28"> <feature xsi:type="ocl:Attribute" location="25:13-31:28" name="titledEntrySet"> <initExpression xsi:type="ocl:IteratorExp" location="25:61-31:28" name="sortedBy"> <source xsi:type="ocl:IterateExp" location="25:61-31:5"> <source xsi:type="ocl:OperationCallExp" location="25:61-25:94" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="25:61-25:79" name="TitledEntry"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </source> </source> <body xsi:type="ocl:IfExp" location="26:5-30:10"> @@ -91,7 +110,7 @@ <result location="25:107-25:155" varName="ret" variableExp="//@elements.1/@definition/@feature/@initExpression/@source/@body/@condition/@source/@source //@elements.1/@definition/@feature/@initExpression/@source/@body/@thenExpression //@elements.1/@definition/@feature/@initExpression/@source/@body/@elseExpression/@source"> <type xsi:type="ocl:SequenceType" location="25:113-25:141"> <elementType xsi:type="ocl:OclModelElement" location="25:122-25:140" name="TitledEntry"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="25:144-25:155"/> @@ -104,20 +123,28 @@ </initExpression> <type xsi:type="ocl:SequenceType" location="25:30-25:58"> <elementType xsi:type="ocl:OclModelElement" location="25:39-25:57" name="TitledEntry"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="37:1-43:31"> + <commentsBefore>-- This helper builds the set of distinct journals referenced in the input BibTeX</commentsBefore> + <commentsBefore>-- model.</commentsBefore> + <commentsBefore>-- Built set is sorted by journal name.</commentsBefore> + <commentsBefore>-- RETURN: Sequence(BibTeX!Article)</commentsBefore> + <commentsAfter>-- This helper builds a string containing all information on a given BibTeXEntry.</commentsAfter> + <commentsAfter>-- Content of the generated string depends on the entry type.</commentsAfter> + <commentsAfter>-- IN: BibTeX!BibTeXEntry</commentsAfter> + <commentsAfter>-- RETURN: Sequence(BibTeX!Author)</commentsAfter> <definition location="37:8-43:30"> <feature xsi:type="ocl:Attribute" location="37:13-43:30" name="articleSet"> <initExpression xsi:type="ocl:IteratorExp" location="37:53-43:30" name="sortedBy"> <source xsi:type="ocl:IterateExp" location="37:53-43:5"> <source xsi:type="ocl:OperationCallExp" location="37:53-37:82" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="37:53-37:67" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/9"/> </source> </source> <body xsi:type="ocl:IfExp" location="38:5-42:10"> @@ -143,7 +170,7 @@ <result location="37:95-37:139" varName="ret" variableExp="//@elements.2/@definition/@feature/@initExpression/@source/@body/@condition/@source/@source //@elements.2/@definition/@feature/@initExpression/@source/@body/@thenExpression //@elements.2/@definition/@feature/@initExpression/@source/@body/@elseExpression/@source"> <type xsi:type="ocl:SequenceType" location="37:101-37:125"> <elementType xsi:type="ocl:OclModelElement" location="37:110-37:124" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="37:128-37:139"/> @@ -156,13 +183,22 @@ </initExpression> <type xsi:type="ocl:SequenceType" location="37:26-37:50"> <elementType xsi:type="ocl:OclModelElement" location="37:35-37:49" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="49:1-64:3"> + <commentsBefore>-- This helper builds a string containing all information on a given BibTeXEntry.</commentsBefore> + <commentsBefore>-- Content of the generated string depends on the entry type.</commentsBefore> + <commentsBefore>-- IN: BibTeX!BibTeXEntry</commentsBefore> + <commentsBefore>-- RETURN: Sequence(BibTeX!Author)</commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- Rule 'Main'</commentsAfter> + <commentsAfter>-- This rule generates the structure of the DocBook model from a BibTeXFile element</commentsAfter> <definition location="49:8-63:89"> <feature xsi:type="ocl:Operation" location="49:40-63:89" name="buildEntryPara"> <returnType xsi:type="ocl:StringType" location="49:59-49:65"/> @@ -182,7 +218,7 @@ <source xsi:type="ocl:StringExp" location="50:2-50:5" stringSymbol="["/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="50:8-50:15" name="id"> <source xsi:type="ocl:VariableExp" location="50:8-50:12"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/12"/> </source> </arguments> </source> @@ -193,7 +229,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="51:10-51:29" name="name"> <source xsi:type="ocl:OperationCallExp" location="51:10-51:24" operationName="oclType"> <source xsi:type="ocl:VariableExp" location="51:10-51:14"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/13"/> </source> </source> </arguments> @@ -203,16 +239,16 @@ <source xsi:type="ocl:StringExp" location="52:50-52:53" stringSymbol=" "/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="52:56-52:66" name="title"> <source xsi:type="ocl:VariableExp" location="52:56-52:60"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/16"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="52:8-52:44" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="52:8-52:12"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/14"/> </source> <arguments xsi:type="ocl:OclModelElement" location="52:25-52:43" name="TitledEntry"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="52:72-52:74" stringSymbol=""/> @@ -222,7 +258,7 @@ <thenExpression xsi:type="ocl:IterateExp" location="54:10-54:76"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="54:10-54:22" name="authors"> <source xsi:type="ocl:VariableExp" location="54:10-54:14"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/19"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="54:55-54:75" operationName="+"> @@ -242,10 +278,10 @@ </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="53:8-53:46" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="53:8-53:12"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/17"/> </source> <arguments xsi:type="ocl:OclModelElement" location="53:25-53:45" name="AuthoredEntry"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="55:10-55:12" stringSymbol=""/> @@ -256,16 +292,16 @@ <source xsi:type="ocl:StringExp" location="57:49-57:52" stringSymbol=" "/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="57:55-57:64" name="year"> <source xsi:type="ocl:VariableExp" location="57:55-57:59"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/22"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="57:8-57:43" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="57:8-57:12"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/20"/> </source> <arguments xsi:type="ocl:OclModelElement" location="57:25-57:42" name="DatedEntry"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="57:70-57:72" stringSymbol=""/> @@ -276,16 +312,16 @@ <source xsi:type="ocl:StringExp" location="58:54-58:57" stringSymbol=" "/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="58:60-58:74" name="booktitle"> <source xsi:type="ocl:VariableExp" location="58:60-58:64"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/25"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="58:8-58:48" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="58:8-58:12"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/23"/> </source> <arguments xsi:type="ocl:OclModelElement" location="58:25-58:47" name="BookTitledEntry"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="58:80-58:82" stringSymbol=""/> @@ -296,16 +332,16 @@ <source xsi:type="ocl:StringExp" location="59:50-59:53" stringSymbol=" "/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="59:57-59:68" name="school"> <source xsi:type="ocl:VariableExp" location="59:57-59:61"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/28"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="59:8-59:44" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="59:8-59:12"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/26"/> </source> <arguments xsi:type="ocl:OclModelElement" location="59:25-59:43" name="ThesisEntry"> - <model href="temp#/1"/> + <model href="new-model#/27"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="59:74-59:76" stringSymbol=""/> @@ -316,16 +352,16 @@ <source xsi:type="ocl:StringExp" location="60:46-60:49" stringSymbol=" "/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="60:52-60:64" name="journal"> <source xsi:type="ocl:VariableExp" location="60:52-60:56"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/31"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="60:8-60:40" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="60:8-60:12"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/29"/> </source> <arguments xsi:type="ocl:OclModelElement" location="60:25-60:39" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/30"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="60:70-60:72" stringSymbol=""/> @@ -336,16 +372,16 @@ <source xsi:type="ocl:StringExp" location="61:50-61:53" stringSymbol=" "/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="61:56-61:65" name="note"> <source xsi:type="ocl:VariableExp" location="61:56-61:60"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/34"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="61:8-61:44" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="61:8-61:12"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/32"/> </source> <arguments xsi:type="ocl:OclModelElement" location="61:25-61:43" name="Unpublished"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="61:71-61:73" stringSymbol=""/> @@ -356,16 +392,16 @@ <source xsi:type="ocl:StringExp" location="62:43-62:46" stringSymbol=" "/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="62:49-62:63" name="publisher"> <source xsi:type="ocl:VariableExp" location="62:49-62:53"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/37"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="62:8-62:37" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="62:8-62:12"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/35"/> </source> <arguments xsi:type="ocl:OclModelElement" location="62:25-62:36" name="Book"> - <model href="temp#/1"/> + <model href="new-model#/36"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="62:69-62:71" stringSymbol=""/> @@ -377,17 +413,17 @@ <arguments xsi:type="ocl:OperationCallExp" location="63:51-63:74" operationName="toString"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="63:51-63:63" name="chapter"> <source xsi:type="ocl:VariableExp" location="63:51-63:55"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/40"/> </source> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="63:8-63:39" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="63:8-63:12"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/38"/> </source> <arguments xsi:type="ocl:OclModelElement" location="63:25-63:38" name="InBook"> - <model href="temp#/1"/> + <model href="new-model#/39"/> </arguments> </condition> <elseExpression xsi:type="ocl:StringExp" location="63:80-63:82" stringSymbol=""/> @@ -396,16 +432,23 @@ </feature> <context_ location="49:8-49:34"> <context_ xsi:type="ocl:OclModelElement" location="49:16-49:34" name="BibTeXEntry"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="73:1-103:2" name="Main"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- Rule 'Main'</commentsBefore> + <commentsBefore>-- This rule generates the structure of the DocBook model from a BibTeXFile element</commentsBefore> + <commentsAfter>-- Rule 'Author'</commentsAfter> + <commentsAfter>-- This rule generates a section_2 paragraph for each distinct author.</commentsAfter> <outPattern location="76:2-102:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="77:3-79:4" varName="doc"> <type xsi:type="ocl:OclModelElement" location="77:9-77:24" name="DocBook"> - <model href="temp#/0"/> + <model href="new-model#/42"/> </type> <bindings location="78:4-78:16" propertyName="books"> <value xsi:type="ocl:VariableExp" location="78:13-78:16" referredVariable="//@elements.4/@outPattern/@elements.1"/> @@ -413,7 +456,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="80:3-82:4" varName="boo" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="80:9-80:21" name="Book"> - <model href="temp#/0"/> + <model href="new-model#/43"/> </type> <bindings location="81:4-81:19" propertyName="articles"> <value xsi:type="ocl:VariableExp" location="81:16-81:19" referredVariable="//@elements.4/@outPattern/@elements.2"/> @@ -421,7 +464,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="83:3-86:4" varName="art" variableExp="//@elements.4/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="83:9-83:24" name="Article"> - <model href="temp#/0"/> + <model href="new-model#/44"/> </type> <bindings location="84:4-84:34" propertyName="title"> <value xsi:type="ocl:StringExp" location="84:13-84:34" stringSymbol="BibTeXML to DocBook"/> @@ -437,7 +480,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="87:3-90:4" varName="se1" variableExp="//@elements.4/@outPattern/@elements.2/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="87:9-87:22" name="Sect1"> - <model href="temp#/0"/> + <model href="new-model#/45"/> </type> <bindings location="88:4-88:30" propertyName="title"> <value xsi:type="ocl:StringExp" location="88:13-88:30" stringSymbol="References List"/> @@ -446,7 +489,7 @@ <value xsi:type="ocl:IteratorExp" location="89:13-89:66" name="sortedBy"> <source xsi:type="ocl:OperationCallExp" location="89:13-89:46" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="89:13-89:31" name="BibTeXEntry"> - <model href="temp#/1"/> + <model href="new-model#/46"/> </source> </source> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="89:61-89:65" name="id"> @@ -458,7 +501,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="91:3-94:4" varName="se2" variableExp="//@elements.4/@outPattern/@elements.2/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="91:9-91:22" name="Sect1"> - <model href="temp#/0"/> + <model href="new-model#/47"/> </type> <bindings location="92:4-92:27" propertyName="title"> <value xsi:type="ocl:StringExp" location="92:13-92:27" stringSymbol="Authors list"/> @@ -466,14 +509,14 @@ <bindings location="93:4-93:33" propertyName="paras"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="93:13-93:33" name="authorSet"> <source xsi:type="ocl:VariableExp" location="93:13-93:23"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/48"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="95:3-98:4" varName="se3" variableExp="//@elements.4/@outPattern/@elements.2/@bindings.1/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="95:9-95:22" name="Sect1"> - <model href="temp#/0"/> + <model href="new-model#/49"/> </type> <bindings location="96:4-96:26" propertyName="title"> <value xsi:type="ocl:StringExp" location="96:13-96:26" stringSymbol="Titles List"/> @@ -482,12 +525,12 @@ <value xsi:type="ocl:IteratorExp" location="97:13-97:92" name="collect"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="97:13-97:38" name="titledEntrySet"> <source xsi:type="ocl:VariableExp" location="97:13-97:23"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/50"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="97:52-97:91" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="97:52-97:62"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/51"/> </source> <arguments xsi:type="ocl:VariableExp" location="97:75-97:76" referredVariable="//@elements.4/@outPattern/@elements.5/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:StringExp" location="97:78-97:90" stringSymbol="title_para"/> @@ -498,7 +541,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="99:3-102:4" varName="se4" variableExp="//@elements.4/@outPattern/@elements.2/@bindings.1/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="99:9-99:22" name="Sect1"> - <model href="temp#/0"/> + <model href="new-model#/52"/> </type> <bindings location="100:4-100:28" propertyName="title"> <value xsi:type="ocl:StringExp" location="100:13-100:28" stringSymbol="Journals List"/> @@ -507,12 +550,12 @@ <value xsi:type="ocl:IteratorExp" location="101:13-101:90" name="collect"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="101:13-101:34" name="articleSet"> <source xsi:type="ocl:VariableExp" location="101:13-101:23"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/53"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="101:48-101:89" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="101:48-101:58"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/54"/> </source> <arguments xsi:type="ocl:VariableExp" location="101:71-101:72" referredVariable="//@elements.4/@outPattern/@elements.6/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:StringExp" location="101:74-101:88" stringSymbol="journal_para"/> @@ -525,16 +568,20 @@ <inPattern location="74:2-75:32"> <elements xsi:type="atl:SimpleInPatternElement" location="75:9-75:32" varName="bib"> <type xsi:type="ocl:OclModelElement" location="75:15-75:32" name="BibTeXFile"> - <model href="temp#/1"/> + <model href="new-model#/41"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="107:1-116:2" name="Author"> + <commentsBefore>-- Rule 'Author'</commentsBefore> + <commentsBefore>-- This rule generates a section_2 paragraph for each distinct author.</commentsBefore> + <commentsAfter>-- Rule 'UntitledEntry'</commentsAfter> + <commentsAfter>-- This rule generates a section_1 paragraph for each untitled entry.</commentsAfter> <outPattern location="112:2-115:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="113:3-115:4" varName="p1"> <type xsi:type="ocl:OclModelElement" location="113:8-113:20" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/57"/> </type> <bindings location="114:4-114:23" propertyName="content"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="114:15-114:23" name="author"> @@ -546,13 +593,13 @@ <inPattern location="108:2-111:5"> <elements xsi:type="atl:SimpleInPatternElement" location="109:3-109:20" varName="a" variableExp="//@elements.5/@inPattern/@filter/@arguments.0 //@elements.5/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="109:7-109:20" name="Author"> - <model href="temp#/1"/> + <model href="new-model#/55"/> </type> </elements> <filter xsi:type="ocl:CollectionOperationCallExp" location="110:6-110:39" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="110:6-110:26" name="authorSet"> <source xsi:type="ocl:VariableExp" location="110:6-110:16"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/56"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="110:37-110:38" referredVariable="//@elements.5/@inPattern/@elements.0"/> @@ -560,10 +607,19 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="120:1-129:2" name="UntitledEntry"> + <commentsBefore>-- Rule 'UntitledEntry'</commentsBefore> + <commentsBefore>-- This rule generates a section_1 paragraph for each untitled entry.</commentsBefore> + <commentsAfter>-- Rule 'TitledEntry_Title_NoArticle'</commentsAfter> + <commentsAfter>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- For each "no article" titled entry that belongs to titledEntrySet,</commentsAfter> + <commentsAfter>-- this rule generates:</commentsAfter> + <commentsAfter>-- * a section_1 paragraph;</commentsAfter> + <commentsAfter>-- * a section_3 paragraph.</commentsAfter> <outPattern location="125:2-128:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="126:3-128:4" varName="p"> <type xsi:type="ocl:OclModelElement" location="126:7-126:19" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/60"/> </type> <bindings location="127:4-127:33" propertyName="content"> <value xsi:type="ocl:OperationCallExp" location="127:15-127:33" operationName="buildEntryPara"> @@ -575,24 +631,37 @@ <inPattern location="121:2-124:4"> <elements xsi:type="atl:SimpleInPatternElement" location="122:3-122:25" varName="e" variableExp="//@elements.6/@inPattern/@filter/@source/@source //@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="122:7-122:25" name="BibTeXEntry"> - <model href="temp#/1"/> + <model href="new-model#/58"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="123:4-123:41" operationName="not"> <source xsi:type="ocl:OperationCallExp" location="123:8-123:41" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="123:8-123:9" referredVariable="//@elements.6/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OclModelElement" location="123:22-123:40" name="TitledEntry"> - <model href="temp#/1"/> + <model href="new-model#/59"/> </arguments> </source> </filter> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="138:1-151:2" name="TitledEntry_Title_NoArticle"> + <commentsBefore>-- Rule 'TitledEntry_Title_NoArticle'</commentsBefore> + <commentsBefore>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- For each "no article" titled entry that belongs to titledEntrySet,</commentsBefore> + <commentsBefore>-- this rule generates:</commentsBefore> + <commentsBefore>-- * a section_1 paragraph;</commentsBefore> + <commentsBefore>-- * a section_3 paragraph.</commentsBefore> + <commentsAfter>-- Rule 'TitledEntry_NoTitle_NoArticle'</commentsAfter> + <commentsAfter>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- For each "no article" titled entry that does not belong to titledEntrySet,</commentsAfter> + <commentsAfter>-- this rule generates:</commentsAfter> + <commentsAfter>-- * a section_1 paragraph;</commentsAfter> <outPattern location="144:2-150:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="145:3-147:4" varName="entry_para"> <type xsi:type="ocl:OclModelElement" location="145:16-145:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/64"/> </type> <bindings location="146:4-146:33" propertyName="content"> <value xsi:type="ocl:OperationCallExp" location="146:15-146:33" operationName="buildEntryPara"> @@ -602,7 +671,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="148:3-150:4" varName="title_para"> <type xsi:type="ocl:OclModelElement" location="148:16-148:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/65"/> </type> <bindings location="149:4-149:22" propertyName="content"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="149:15-149:22" name="title"> @@ -614,14 +683,14 @@ <inPattern location="139:2-143:4"> <elements xsi:type="atl:SimpleInPatternElement" location="140:3-140:25" varName="e" variableExp="//@elements.7/@inPattern/@filter/@source/@arguments.0 //@elements.7/@inPattern/@filter/@arguments.0/@source/@source //@elements.7/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="140:7-140:25" name="TitledEntry"> - <model href="temp#/1"/> + <model href="new-model#/61"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="141:4-142:37" operationName="and"> <source xsi:type="ocl:CollectionOperationCallExp" location="141:4-141:42" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="141:4-141:29" name="titledEntrySet"> <source xsi:type="ocl:VariableExp" location="141:4-141:14"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/62"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="141:40-141:41" referredVariable="//@elements.7/@inPattern/@elements.0"/> @@ -630,7 +699,7 @@ <source xsi:type="ocl:OperationCallExp" location="142:8-142:37" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="142:8-142:9" referredVariable="//@elements.7/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OclModelElement" location="142:22-142:36" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/63"/> </arguments> </source> </arguments> @@ -638,10 +707,25 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="159:1-169:2" name="TitledEntry_NoTitle_NoArticle"> + <commentsBefore>-- Rule 'TitledEntry_NoTitle_NoArticle'</commentsBefore> + <commentsBefore>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- For each "no article" titled entry that does not belong to titledEntrySet,</commentsBefore> + <commentsBefore>-- this rule generates:</commentsBefore> + <commentsBefore>-- * a section_1 paragraph;</commentsBefore> + <commentsAfter>-- Rule 'Article_Title_Journal'</commentsAfter> + <commentsAfter>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- [articleSet contains a subset of Article, so that each journal</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- For each article entry that belongs to articleSet, this rule generates:</commentsAfter> + <commentsAfter>-- * a section_1 paragraph;</commentsAfter> + <commentsAfter>-- * a section_3 paragraph;</commentsAfter> + <commentsAfter>-- * a section_4 paragraph.</commentsAfter> <outPattern location="165:2-168:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="166:3-168:4" varName="entry_para"> <type xsi:type="ocl:OclModelElement" location="166:16-166:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/69"/> </type> <bindings location="167:4-167:33" propertyName="content"> <value xsi:type="ocl:OperationCallExp" location="167:15-167:33" operationName="buildEntryPara"> @@ -653,7 +737,7 @@ <inPattern location="160:2-164:4"> <elements xsi:type="atl:SimpleInPatternElement" location="161:3-161:25" varName="e" variableExp="//@elements.8/@inPattern/@filter/@source/@source/@arguments.0 //@elements.8/@inPattern/@filter/@arguments.0/@source/@source //@elements.8/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="161:7-161:25" name="TitledEntry"> - <model href="temp#/1"/> + <model href="new-model#/66"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="162:4-163:37" operationName="and"> @@ -661,7 +745,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="162:8-162:46" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="162:8-162:33" name="titledEntrySet"> <source xsi:type="ocl:VariableExp" location="162:8-162:18"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/67"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="162:44-162:45" referredVariable="//@elements.8/@inPattern/@elements.0"/> @@ -671,7 +755,7 @@ <source xsi:type="ocl:OperationCallExp" location="163:8-163:37" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="163:8-163:9" referredVariable="//@elements.8/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OclModelElement" location="163:22-163:36" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/68"/> </arguments> </source> </arguments> @@ -679,10 +763,27 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="180:1-196:2" name="Article_Title_Journal"> + <commentsBefore>-- Rule 'Article_Title_Journal'</commentsBefore> + <commentsBefore>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- [articleSet contains a subset of Article, so that each journal</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- For each article entry that belongs to articleSet, this rule generates:</commentsBefore> + <commentsBefore>-- * a section_1 paragraph;</commentsBefore> + <commentsBefore>-- * a section_3 paragraph;</commentsBefore> + <commentsBefore>-- * a section_4 paragraph.</commentsBefore> + <commentsAfter>-- Rule 'Article_NoTitle_Journal'</commentsAfter> + <commentsAfter>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- [articleSet contains a subset of Article, so that each journal</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- For each article entry that belongs to articleSet, this rule generates:</commentsAfter> + <commentsAfter>-- * a section_1 paragraph;</commentsAfter> + <commentsAfter>-- * a section_4 paragraph.</commentsAfter> <outPattern location="186:2-195:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="187:3-189:4" varName="entry_para"> <type xsi:type="ocl:OclModelElement" location="187:16-187:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/73"/> </type> <bindings location="188:4-188:33" propertyName="content"> <value xsi:type="ocl:OperationCallExp" location="188:15-188:33" operationName="buildEntryPara"> @@ -692,7 +793,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="190:3-192:4" varName="title_para"> <type xsi:type="ocl:OclModelElement" location="190:16-190:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/74"/> </type> <bindings location="191:4-191:22" propertyName="content"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="191:15-191:22" name="title"> @@ -702,7 +803,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="193:3-195:4" varName="journal_para"> <type xsi:type="ocl:OclModelElement" location="193:18-193:30" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/75"/> </type> <bindings location="194:4-194:24" propertyName="content"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="194:15-194:24" name="journal"> @@ -714,14 +815,14 @@ <inPattern location="181:2-185:4"> <elements xsi:type="atl:SimpleInPatternElement" location="182:3-182:21" varName="e" variableExp="//@elements.9/@inPattern/@filter/@source/@arguments.0 //@elements.9/@inPattern/@filter/@arguments.0/@arguments.0 //@elements.9/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.2/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="182:7-182:21" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/70"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="183:4-184:38" operationName="and"> <source xsi:type="ocl:CollectionOperationCallExp" location="183:4-183:42" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="183:4-183:29" name="titledEntrySet"> <source xsi:type="ocl:VariableExp" location="183:4-183:14"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/71"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="183:40-183:41" referredVariable="//@elements.9/@inPattern/@elements.0"/> @@ -729,7 +830,7 @@ <arguments xsi:type="ocl:CollectionOperationCallExp" location="184:4-184:38" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="184:4-184:25" name="articleSet"> <source xsi:type="ocl:VariableExp" location="184:4-184:14"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/72"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="184:36-184:37" referredVariable="//@elements.9/@inPattern/@elements.0"/> @@ -738,10 +839,26 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="206:1-219:2" name="Article_NoTitle_Journal"> + <commentsBefore>-- Rule 'Article_NoTitle_Journal'</commentsBefore> + <commentsBefore>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- [articleSet contains a subset of Article, so that each journal</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- For each article entry that belongs to articleSet, this rule generates:</commentsBefore> + <commentsBefore>-- * a section_1 paragraph;</commentsBefore> + <commentsBefore>-- * a section_4 paragraph.</commentsBefore> + <commentsAfter>-- Rule 'Article_Title_NoJournal'</commentsAfter> + <commentsAfter>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- [articleSet contains a subset of Article, so that each journal</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- For each article entry that belongs to articleSet, this rule generates:</commentsAfter> + <commentsAfter>-- * a section_1 paragraph;</commentsAfter> + <commentsAfter>-- * a section_3 paragraph.</commentsAfter> <outPattern location="212:2-218:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="213:3-215:4" varName="entry_para"> <type xsi:type="ocl:OclModelElement" location="213:16-213:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/79"/> </type> <bindings location="214:4-214:33" propertyName="content"> <value xsi:type="ocl:OperationCallExp" location="214:15-214:33" operationName="buildEntryPara"> @@ -751,7 +868,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="216:3-218:4" varName="journal_para"> <type xsi:type="ocl:OclModelElement" location="216:18-216:30" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/80"/> </type> <bindings location="217:4-217:24" propertyName="content"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="217:15-217:24" name="journal"> @@ -763,7 +880,7 @@ <inPattern location="207:2-211:4"> <elements xsi:type="atl:SimpleInPatternElement" location="208:3-208:21" varName="e" variableExp="//@elements.10/@inPattern/@filter/@source/@source/@arguments.0 //@elements.10/@inPattern/@filter/@arguments.0/@arguments.0 //@elements.10/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.10/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="208:7-208:21" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/76"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="209:4-210:38" operationName="and"> @@ -771,7 +888,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="209:8-209:46" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="209:8-209:33" name="titledEntrySet"> <source xsi:type="ocl:VariableExp" location="209:8-209:18"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/77"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="209:44-209:45" referredVariable="//@elements.10/@inPattern/@elements.0"/> @@ -780,7 +897,7 @@ <arguments xsi:type="ocl:CollectionOperationCallExp" location="210:4-210:38" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="210:4-210:25" name="articleSet"> <source xsi:type="ocl:VariableExp" location="210:4-210:14"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/78"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="210:36-210:37" referredVariable="//@elements.10/@inPattern/@elements.0"/> @@ -789,10 +906,25 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="229:1-242:2" name="Article_Title_NoJournal"> + <commentsBefore>-- Rule 'Article_Title_NoJournal'</commentsBefore> + <commentsBefore>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- [articleSet contains a subset of Article, so that each journal</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- For each article entry that belongs to articleSet, this rule generates:</commentsBefore> + <commentsBefore>-- * a section_1 paragraph;</commentsBefore> + <commentsBefore>-- * a section_3 paragraph.</commentsBefore> + <commentsAfter>-- Rule 'Article_NoTitle_NoJournal'</commentsAfter> + <commentsAfter>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- [articleSet contains a subset of Article, so that each journal</commentsAfter> + <commentsAfter>-- appears only once in the set]</commentsAfter> + <commentsAfter>-- For each article entry that belongs to articleSet, this rule generates:</commentsAfter> + <commentsAfter>-- * a section_1 paragraph;</commentsAfter> <outPattern location="235:2-241:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="236:3-238:4" varName="entry_para"> <type xsi:type="ocl:OclModelElement" location="236:16-236:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/84"/> </type> <bindings location="237:4-237:33" propertyName="content"> <value xsi:type="ocl:OperationCallExp" location="237:15-237:33" operationName="buildEntryPara"> @@ -802,7 +934,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="239:3-241:4" varName="title_para"> <type xsi:type="ocl:OclModelElement" location="239:16-239:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/85"/> </type> <bindings location="240:4-240:22" propertyName="content"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="240:15-240:22" name="title"> @@ -814,14 +946,14 @@ <inPattern location="230:2-234:4"> <elements xsi:type="atl:SimpleInPatternElement" location="231:3-231:21" varName="e" variableExp="//@elements.11/@inPattern/@filter/@source/@arguments.0 //@elements.11/@inPattern/@filter/@arguments.0/@source/@arguments.0 //@elements.11/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.11/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="231:7-231:21" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/81"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="232:4-233:42" operationName="and"> <source xsi:type="ocl:CollectionOperationCallExp" location="232:4-232:42" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="232:4-232:29" name="titledEntrySet"> <source xsi:type="ocl:VariableExp" location="232:4-232:14"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/82"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="232:40-232:41" referredVariable="//@elements.11/@inPattern/@elements.0"/> @@ -830,7 +962,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="233:8-233:42" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="233:8-233:29" name="articleSet"> <source xsi:type="ocl:VariableExp" location="233:8-233:18"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/83"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="233:40-233:41" referredVariable="//@elements.11/@inPattern/@elements.0"/> @@ -840,10 +972,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="251:1-261:2" name="Article_NoTitle_NoJournal"> + <commentsBefore>-- Rule 'Article_NoTitle_NoJournal'</commentsBefore> + <commentsBefore>-- [titledEntrySet contains a subset of TitledEntry, so that each title</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- [articleSet contains a subset of Article, so that each journal</commentsBefore> + <commentsBefore>-- appears only once in the set]</commentsBefore> + <commentsBefore>-- For each article entry that belongs to articleSet, this rule generates:</commentsBefore> + <commentsBefore>-- * a section_1 paragraph;</commentsBefore> <outPattern location="257:2-260:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="258:3-260:4" varName="entry_para"> <type xsi:type="ocl:OclModelElement" location="258:16-258:28" name="Para"> - <model href="temp#/0"/> + <model href="new-model#/89"/> </type> <bindings location="259:4-259:33" propertyName="content"> <value xsi:type="ocl:OperationCallExp" location="259:15-259:33" operationName="buildEntryPara"> @@ -855,7 +994,7 @@ <inPattern location="252:2-256:4"> <elements xsi:type="atl:SimpleInPatternElement" location="253:3-253:21" varName="e" variableExp="//@elements.12/@inPattern/@filter/@source/@source/@arguments.0 //@elements.12/@inPattern/@filter/@arguments.0/@source/@arguments.0 //@elements.12/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="253:7-253:21" name="Article"> - <model href="temp#/1"/> + <model href="new-model#/86"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="254:4-255:42" operationName="and"> @@ -863,7 +1002,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="254:8-254:46" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="254:8-254:33" name="titledEntrySet"> <source xsi:type="ocl:VariableExp" location="254:8-254:18"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/87"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="254:44-254:45" referredVariable="//@elements.12/@inPattern/@elements.0"/> @@ -873,7 +1012,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="255:8-255:42" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="255:8-255:29" name="articleSet"> <source xsi:type="ocl:VariableExp" location="255:8-255:18"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/88"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="255:40-255:41" referredVariable="//@elements.12/@inPattern/@elements.0"/> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Book2Publication/Book2Publication/Book2Publication.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Book2Publication/Book2Publication/Book2Publication.atl.xmi index c45b5971..eb2608ae 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Book2Publication/Book2Publication/Book2Publication.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Book2Publication/Book2Publication/Book2Publication.atl.xmi @@ -1,21 +1,25 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-47:2" name="Book2Publication"> <inModels location="2:31-2:40" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:25" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="7:1-16:2"> + <commentsBefore>-- getAuthors collects all Autors of a Book</commentsBefore> + <commentsBefore>-- the asSet operation removes all duplicates</commentsBefore> + <commentsAfter>-- getNbPages collects all nbPages of all chapters</commentsAfter> + <commentsAfter>-- and calculates the sum</commentsAfter> <definition location="7:8-15:15"> <feature xsi:type="ocl:Operation" location="7:32-15:15" name="getAuthors"> <returnType xsi:type="ocl:StringType" location="7:47-7:53"/> <body xsi:type="ocl:IterateExp" location="8:8-15:15"> - <source xsi:type="ocl:CollectionOperationCallExp" location="8:8-9:17" operationName="asSet"> + <source xsi:type="ocl:CollectionOperationCallExp" location="8:8-9:24" operationName="asOrderedSet"> <source xsi:type="ocl:IteratorExp" location="8:8-8:44" name="collect"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="8:8-8:21" name="chapters"> <source xsi:type="ocl:VariableExp" location="8:8-8:12"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/3"/> </source> </source> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="8:35-8:43" name="author"> @@ -47,12 +51,16 @@ </feature> <context_ location="7:8-7:25"> <context_ xsi:type="ocl:OclModelElement" location="7:16-7:25" name="Book"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="21:1-25:2"> + <commentsBefore>-- getNbPages collects all nbPages of all chapters</commentsBefore> + <commentsBefore>-- and calculates the sum</commentsBefore> + <commentsAfter>-- getSumPages does the same as getNbPages,</commentsAfter> + <commentsAfter>-- but it uses the OCL sum operation</commentsAfter> <definition location="21:8-24:36"> <feature xsi:type="ocl:Operation" location="21:32-24:36" name="getNbPages"> <returnType xsi:type="ocl:IntegerType" location="21:47-21:54"/> @@ -60,7 +68,7 @@ <source xsi:type="ocl:IteratorExp" location="22:3-22:38" name="collect"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="22:3-22:16" name="chapters"> <source xsi:type="ocl:VariableExp" location="22:3-22:7"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/5"/> </source> </source> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="22:28-22:37" name="nbPages"> @@ -81,12 +89,14 @@ </feature> <context_ location="21:8-21:25"> <context_ xsi:type="ocl:OclModelElement" location="21:16-21:25" name="Book"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="30:1-32:2"> + <commentsBefore>-- getSumPages does the same as getNbPages,</commentsBefore> + <commentsBefore>-- but it uses the OCL sum operation</commentsBefore> <definition location="30:8-31:44"> <feature xsi:type="ocl:Operation" location="30:32-31:44" name="getSumPages"> <returnType xsi:type="ocl:IntegerType" location="30:48-30:55"/> @@ -94,7 +104,7 @@ <source xsi:type="ocl:IteratorExp" location="31:3-31:38" name="collect"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="31:3-31:16" name="chapters"> <source xsi:type="ocl:VariableExp" location="31:3-31:7"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/7"/> </source> </source> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="31:28-31:37" name="nbPages"> @@ -106,7 +116,7 @@ </feature> <context_ location="30:8-30:25"> <context_ xsi:type="ocl:OclModelElement" location="30:16-30:25" name="Book"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </context_> </context_> </definition> @@ -115,7 +125,7 @@ <outPattern location="41:2-46:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="42:3-46:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="42:9-42:32" name="Publication"> - <model href="temp#/0"/> + <model href="new-model#/9"/> </type> <bindings location="43:13-43:29" propertyName="title"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="43:22-43:29" name="title"> @@ -137,14 +147,17 @@ <inPattern location="36:2-40:4"> <elements xsi:type="atl:SimpleInPatternElement" location="37:3-37:16" varName="b" variableExp="//@elements.3/@inPattern/@filter/@source/@source //@elements.3/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.3/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.3/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="37:7-37:16" name="Book"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="38:4-38:23" operationName=">"> + <commentsAfter>-- only Books with more than 2 pages are publications</commentsAfter> <source xsi:type="ocl:OperationCallExp" location="38:4-38:19" operationName="getSumPages"> <source xsi:type="ocl:VariableExp" location="38:4-38:5" referredVariable="//@elements.3/@inPattern/@elements.0"/> </source> - <arguments xsi:type="ocl:IntegerExp" location="38:22-38:23" integerSymbol="2"/> + <arguments xsi:type="ocl:IntegerExp" location="38:22-38:23" integerSymbol="2"> + <commentsAfter>-- only Books with more than 2 pages are publications</commentsAfter> + </arguments> </filter> </inPattern> </elements> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Book2Publication/XML2Book/XML2Book.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Book2Publication/XML2Book/XML2Book.atl.xmi index 8af07b0a..7d7a9960 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Book2Publication/XML2Book/XML2Book.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Book2Publication/XML2Book/XML2Book.atl.xmi @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-30:2" name="XML2Book"> <inModels location="2:24-2:32" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:18" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="4:1-5:91"> <definition location="4:8-5:90"> @@ -18,14 +18,14 @@ <source xsi:type="ocl:IteratorExp" location="5:2-5:75" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="5:2-5:15" name="children"> <source xsi:type="ocl:VariableExp" location="5:2-5:6"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/3"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="5:28-5:74" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="5:28-5:56" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="5:28-5:29" referredVariable="//@elements.0/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="5:42-5:55" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="5:61-5:74" operationName="="> @@ -42,7 +42,7 @@ </feature> <context_ location="4:8-4:27"> <context_ xsi:type="ocl:OclModelElement" location="4:16-4:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </context_> </context_> </definition> @@ -51,7 +51,7 @@ <outPattern location="12:2-16:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="13:3-16:4" varName="b"> <type xsi:type="ocl:OclModelElement" location="13:7-13:16" name="Book"> - <model href="temp#/0"/> + <model href="new-model#/6"/> </type> <bindings location="14:4-14:34" propertyName="title"> <value xsi:type="ocl:OperationCallExp" location="14:13-14:34" operationName="getAttrVal"> @@ -68,7 +68,7 @@ <body xsi:type="ocl:OperationCallExp" location="15:39-15:65" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="15:39-15:40" referredVariable="//@elements.1/@outPattern/@elements.0/@bindings.1/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="15:53-15:64" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </arguments> </body> <iterators location="15:35-15:36" varName="c" variableExp="//@elements.1/@outPattern/@elements.0/@bindings.1/@value/@source/@body/@source"/> @@ -80,7 +80,7 @@ <inPattern location="8:2-11:4"> <elements xsi:type="atl:SimpleInPatternElement" location="9:3-9:18" varName="e" variableExp="//@elements.1/@inPattern/@filter/@source/@source //@elements.1/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.1/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="9:7-9:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="10:4-10:19" operationName="="> @@ -95,7 +95,7 @@ <outPattern location="24:2-29:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="25:3-29:4" varName="c"> <type xsi:type="ocl:OclModelElement" location="25:7-25:19" name="Chapter"> - <model href="temp#/0"/> + <model href="new-model#/9"/> </type> <bindings location="26:4-26:34" propertyName="title"> <value xsi:type="ocl:OperationCallExp" location="26:13-26:34" operationName="getAttrVal"> @@ -122,7 +122,7 @@ <inPattern location="20:2-23:4"> <elements xsi:type="atl:SimpleInPatternElement" location="21:3-21:18" varName="e" variableExp="//@elements.2/@inPattern/@filter/@source/@source //@elements.2/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.2/@outPattern/@elements.0/@bindings.1/@value/@source/@source //@elements.2/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="21:7-21:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="22:4-22:22" operationName="="> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Class2Relational/Class2Relational/Class2Relational.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Class2Relational/Class2Relational/Class2Relational.atl.xmi index 55c6d93e..cd54773d 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Class2Relational/Class2Relational/Class2Relational.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Class2Relational/Class2Relational/Class2Relational.atl.xmi @@ -1,19 +1,24 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-104:2" name="Class2Relational"> <inModels location="2:30-2:40" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:24" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="11:1-12:73"> + <commentsBefore>-- inheritance not supported yet</commentsBefore> + <commentsBefore>-- issue: choose an object-id Type (Integer, String?).</commentsBefore> + <commentsBefore>-- We choose Integer here, assuming this type is defined in the source model.</commentsBefore> + <commentsBefore>-- global variable</commentsBefore> + <commentsBefore>-- context </commentsBefore> <definition location="11:8-12:72"> <feature xsi:type="ocl:Attribute" location="11:13-12:72" name="objectIdType"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="12:2-12:72" operationName="first"> <source xsi:type="ocl:IteratorExp" location="12:2-12:63" name="select"> <source xsi:type="ocl:OperationCallExp" location="12:2-12:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="12:2-12:16" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="12:44-12:62" operationName="="> @@ -26,7 +31,7 @@ </source> </initExpression> <type xsi:type="ocl:OclModelElement" location="11:28-11:43" name="Type"> - <model href="temp#/0"/> + <model href="new-model#/2"/> </type> </feature> </definition> @@ -35,7 +40,7 @@ <outPattern location="17:2-27:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="18:3-23:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="18:9-18:25" name="Table"> - <model href="temp#/0"/> + <model href="new-model#/5"/> </type> <bindings location="19:4-19:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="19:12-19:18" name="name"> @@ -43,6 +48,7 @@ </value> </bindings> <bindings location="21:4-21:71" propertyName="col"> + <commentsBefore>-- Columns are generated from Attributes in another rule not explicitly called here !</commentsBefore> <value xsi:type="ocl:CollectionOperationCallExp" location="21:11-21:71" operationName="union"> <source xsi:type="ocl:SequenceExp" location="21:11-21:25"> <elements xsi:type="ocl:VariableExp" location="21:21-21:24" referredVariable="//@elements.1/@outPattern/@elements.1"/> @@ -68,7 +74,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="24:3-27:4" varName="key" variableExp="//@elements.1/@outPattern/@elements.0/@bindings.1/@value/@source/@elements.0 //@elements.1/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="24:9-24:26" name="Column"> - <model href="temp#/0"/> + <model href="new-model#/6"/> </type> <bindings location="25:4-25:22" propertyName="name"> <value xsi:type="ocl:StringExp" location="25:12-25:22" stringSymbol="objectId"/> @@ -76,7 +82,7 @@ <bindings location="26:4-26:35" propertyName="type"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="26:12-26:35" name="objectIdType"> <source xsi:type="ocl:VariableExp" location="26:12-26:22"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/7"/> </source> </value> </bindings> @@ -85,7 +91,7 @@ <inPattern location="15:2-16:18"> <elements xsi:type="atl:SimpleInPatternElement" location="16:3-16:18" varName="c" variableExp="//@elements.1/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.1/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="16:7-16:18" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </type> </elements> </inPattern> @@ -94,7 +100,7 @@ <outPattern location="33:2-36:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="34:3-36:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="34:9-34:24" name="Type"> - <model href="temp#/0"/> + <model href="new-model#/9"/> </type> <bindings location="35:4-35:19" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="35:12-35:19" name="name"> @@ -106,7 +112,7 @@ <inPattern location="31:2-32:22"> <elements xsi:type="atl:SimpleInPatternElement" location="32:3-32:22" varName="dt" variableExp="//@elements.2/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="32:8-32:22" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </type> </elements> </inPattern> @@ -115,7 +121,7 @@ <outPattern location="44:2-51:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="45:3-51:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="45:9-45:26" name="Column"> - <model href="temp#/0"/> + <model href="new-model#/12"/> </type> <bindings location="46:4-46:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="46:12-46:18" name="name"> @@ -123,7 +129,13 @@ </value> </bindings> <bindings location="47:4-47:18" propertyName="type"> + <commentsAfter>-- explicit use of implicit tracking links (first expected syntax, then present actual syntax)</commentsAfter> + <commentsAfter>--			owner <- [Class2Type.key]a.owner</commentsAfter> + <commentsAfter>--			owner <- thisModule.resolveTemp(a.owner, 'key')</commentsAfter> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="47:12-47:18" name="type"> + <commentsAfter>-- explicit use of implicit tracking links (first expected syntax, then present actual syntax)</commentsAfter> + <commentsAfter>--			owner <- [Class2Type.key]a.owner</commentsAfter> + <commentsAfter>--			owner <- thisModule.resolveTemp(a.owner, 'key')</commentsAfter> <source xsi:type="ocl:VariableExp" location="47:12-47:13" referredVariable="//@elements.3/@inPattern/@elements.0"/> </value> </bindings> @@ -132,7 +144,7 @@ <inPattern location="40:2-43:4"> <elements xsi:type="atl:SimpleInPatternElement" location="41:3-41:22" varName="a" variableExp="//@elements.3/@inPattern/@filter/@source/@source/@source //@elements.3/@inPattern/@filter/@arguments.0/@source/@source //@elements.3/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.3/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="41:7-41:22" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="42:4-42:60" operationName="and"> @@ -141,7 +153,7 @@ <source xsi:type="ocl:VariableExp" location="42:4-42:5" referredVariable="//@elements.3/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="42:23-42:37" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="42:43-42:60" operationName="not"> @@ -156,7 +168,7 @@ <outPattern location="59:2-71:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="60:3-63:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="60:9-60:25" name="Table"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> <bindings location="61:4-61:39" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="61:12-61:39" operationName="+"> @@ -182,7 +194,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="64:3-67:4" varName="id" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="64:8-64:25" name="Column"> - <model href="temp#/0"/> + <model href="new-model#/16"/> </type> <bindings location="65:4-65:31" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="65:12-65:31" operationName="+"> @@ -197,14 +209,14 @@ <bindings location="66:4-66:35" propertyName="type"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="66:12-66:35" name="objectIdType"> <source xsi:type="ocl:VariableExp" location="66:12-66:22"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/17"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="68:3-71:4" varName="value" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="68:11-68:28" name="Column"> - <model href="temp#/0"/> + <model href="new-model#/18"/> </type> <bindings location="69:4-69:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="69:12-69:18" name="name"> @@ -221,7 +233,7 @@ <inPattern location="55:2-58:4"> <elements xsi:type="atl:SimpleInPatternElement" location="56:3-56:22" varName="a" variableExp="//@elements.4/@inPattern/@filter/@source/@source/@source //@elements.4/@inPattern/@filter/@arguments.0/@source //@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source //@elements.4/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source //@elements.4/@outPattern/@elements.1/@bindings.0/@value/@source/@source/@source //@elements.4/@outPattern/@elements.2/@bindings.0/@value/@source //@elements.4/@outPattern/@elements.2/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="56:7-56:22" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="57:4-57:56" operationName="and"> @@ -230,7 +242,7 @@ <source xsi:type="ocl:VariableExp" location="57:4-57:5" referredVariable="//@elements.4/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="57:23-57:37" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </arguments> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="57:43-57:56" name="multiValued"> @@ -243,7 +255,7 @@ <outPattern location="79:2-83:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="80:3-83:4" varName="foreignKey"> <type xsi:type="ocl:OclModelElement" location="80:16-80:33" name="Column"> - <model href="temp#/0"/> + <model href="new-model#/21"/> </type> <bindings location="81:4-81:25" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="81:12-81:25" operationName="+"> @@ -256,7 +268,7 @@ <bindings location="82:4-82:35" propertyName="type"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="82:12-82:35" name="objectIdType"> <source xsi:type="ocl:VariableExp" location="82:12-82:22"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/22"/> </source> </value> </bindings> @@ -265,7 +277,7 @@ <inPattern location="75:2-78:4"> <elements xsi:type="atl:SimpleInPatternElement" location="76:3-76:22" varName="a" variableExp="//@elements.5/@inPattern/@filter/@source/@source/@source //@elements.5/@inPattern/@filter/@arguments.0/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="76:7-76:22" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="77:4-77:57" operationName="and"> @@ -274,7 +286,7 @@ <source xsi:type="ocl:VariableExp" location="77:4-77:5" referredVariable="//@elements.5/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="77:23-77:34" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="77:40-77:57" operationName="not"> @@ -289,7 +301,7 @@ <outPattern location="91:2-103:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="92:3-95:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="92:7-92:23" name="Table"> - <model href="temp#/0"/> + <model href="new-model#/25"/> </type> <bindings location="93:4-93:39" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="93:12-93:39" operationName="+"> @@ -315,7 +327,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="96:3-99:4" varName="id" variableExp="//@elements.6/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="96:8-96:25" name="Column"> - <model href="temp#/0"/> + <model href="new-model#/26"/> </type> <bindings location="97:4-97:31" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="97:12-97:31" operationName="+"> @@ -330,14 +342,14 @@ <bindings location="98:4-98:35" propertyName="type"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="98:12-98:35" name="objectIdType"> <source xsi:type="ocl:VariableExp" location="98:12-98:22"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/27"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="100:3-103:4" varName="foreignKey" variableExp="//@elements.6/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="100:16-100:33" name="Column"> - <model href="temp#/0"/> + <model href="new-model#/28"/> </type> <bindings location="101:4-101:25" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="101:12-101:25" operationName="+"> @@ -350,7 +362,7 @@ <bindings location="102:4-102:35" propertyName="type"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="102:12-102:35" name="objectIdType"> <source xsi:type="ocl:VariableExp" location="102:12-102:22"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/29"/> </source> </value> </bindings> @@ -359,7 +371,7 @@ <inPattern location="87:2-90:4"> <elements xsi:type="atl:SimpleInPatternElement" location="88:3-88:22" varName="a" variableExp="//@elements.6/@inPattern/@filter/@source/@source/@source //@elements.6/@inPattern/@filter/@arguments.0/@source //@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source //@elements.6/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source //@elements.6/@outPattern/@elements.1/@bindings.0/@value/@source/@source/@source //@elements.6/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="88:7-88:22" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/23"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="89:4-89:53" operationName="and"> @@ -368,7 +380,7 @@ <source xsi:type="ocl:VariableExp" location="89:4-89:5" referredVariable="//@elements.6/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="89:23-89:34" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </arguments> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="89:40-89:53" name="multiValued"> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Class2Relational/Ecore2Class/Ecore2Class.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Class2Relational/Ecore2Class/Ecore2Class.atl.xmi index f531b044..d2772405 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Class2Relational/Ecore2Class/Ecore2Class.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Class2Relational/Ecore2Class/Ecore2Class.atl.xmi @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-33:2" name="Ecore2Class"> <inModels location="2:25-2:33" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:19" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:MatchedRule" location="4:1-13:2" name="Class"> <outPattern location="7:2-12:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="8:3-12:4" varName="oc"> <type xsi:type="ocl:OclModelElement" location="8:8-8:19" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/3"/> </type> <bindings location="9:4-9:19" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="9:12-9:19" name="name"> @@ -32,7 +32,7 @@ <inPattern location="5:2-6:18"> <elements xsi:type="atl:SimpleInPatternElement" location="6:3-6:18" varName="ic" variableExp="//@elements.0/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.0/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.0/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="6:8-6:18" name="EClass"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </type> </elements> </inPattern> @@ -41,7 +41,7 @@ <outPattern location="18:2-23:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="19:3-23:4" varName="oa"> <type xsi:type="ocl:OclModelElement" location="19:8-19:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/5"/> </type> <bindings location="20:4-20:19" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="20:12-20:19" name="name"> @@ -77,7 +77,7 @@ <inPattern location="16:2-17:22"> <elements xsi:type="atl:SimpleInPatternElement" location="17:3-17:22" varName="ia" variableExp="//@elements.1/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.1/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source //@elements.1/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source/@source //@elements.1/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="17:8-17:22" name="EAttribute"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </type> </elements> </inPattern> @@ -86,7 +86,7 @@ <outPattern location="29:2-32:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="30:3-32:4" varName="odt"> <type xsi:type="ocl:OclModelElement" location="30:9-30:23" name="DataType"> - <model href="temp#/0"/> + <model href="new-model#/7"/> </type> <bindings location="31:4-31:20" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="31:12-31:20" name="name"> @@ -98,7 +98,7 @@ <inPattern location="27:2-28:22"> <elements xsi:type="atl:SimpleInPatternElement" location="28:3-28:22" varName="idt" variableExp="//@elements.2/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="28:9-28:22" name="EDataType"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/DSL2EMF/DSL2KM3/DSL2KM3.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/DSL2EMF/DSL2KM3/DSL2KM3.atl.xmi index 2ed3e5b5..55335232 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/DSL2EMF/DSL2KM3/DSL2KM3.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/DSL2EMF/DSL2KM3/DSL2KM3.atl.xmi @@ -1,12 +1,27 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="4:1-227:2" name="DSL2KM3"> + <commentsBefore>-- DSL to Ecore</commentsBefore> + <commentsBefore>-- second transformation : DSL to KM3</commentsBefore> <inModels location="5:23-5:31" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="5:8-5:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="18:1-25:37"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper checks if a relation needs to be turn on a class</commentsBefore> + <commentsBefore>-- * if self is pointed by an other relationship</commentsBefore> + <commentsBefore>-- * if self has supertypes</commentsBefore> + <commentsBefore>-- * if self has subtypes</commentsBefore> + <commentsBefore>-- * if self has properties</commentsBefore> + <commentsBefore>-- CONTEXT: DSL!Relationship </commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper get the roles pointing on a given class</commentsAfter> + <commentsAfter>-- CONTEXT: DSL!Class </commentsAfter> + <commentsAfter>-- RETURN: Sequence(DSL!Role)</commentsAfter> <definition location="18:8-25:36"> <feature xsi:type="ocl:Operation" location="18:38-25:36" name="needTurnOnClass"> <returnType xsi:type="ocl:BooleanType" location="18:58-18:65"/> @@ -16,7 +31,7 @@ <initExpression xsi:type="ocl:IterateExp" location="20:2-21:45"> <source xsi:type="ocl:OperationCallExp" location="20:2-20:25" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="20:2-20:10" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="21:3-21:44" operationName="or"> @@ -27,7 +42,7 @@ <source xsi:type="ocl:VariableExp" location="21:11-21:12" referredVariable="//@elements.0/@definition/@feature/@body/@variable/@initExpression/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="21:20-21:24"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/4"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="21:28-21:43" operationName="="> @@ -35,7 +50,7 @@ <source xsi:type="ocl:VariableExp" location="21:28-21:29" referredVariable="//@elements.0/@definition/@feature/@body/@variable/@initExpression/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="21:39-21:43"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/5"/> </arguments> </arguments> </arguments> @@ -54,7 +69,7 @@ <source xsi:type="ocl:OperationCallExp" location="23:9-23:34" operationName="isEmpty"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="23:9-23:24" name="properties"> <source xsi:type="ocl:VariableExp" location="23:9-23:13"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/6"/> </source> </source> </source> @@ -64,7 +79,7 @@ <source xsi:type="ocl:OperationCallExp" location="24:11-24:42" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="24:11-24:25" name="superType"> <source xsi:type="ocl:VariableExp" location="24:11-24:15"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/7"/> </source> </source> </source> @@ -73,7 +88,7 @@ <source xsi:type="ocl:OperationCallExp" location="25:10-25:33" operationName="isEmpty"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="25:10-25:23" name="subTypes"> <source xsi:type="ocl:VariableExp" location="25:10-25:14"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/8"/> </source> </source> </source> @@ -85,28 +100,34 @@ </feature> <context_ location="18:8-18:32"> <context_ xsi:type="ocl:OclModelElement" location="18:16-18:32" name="Relationship"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="30:1-34:38"> + <commentsBefore>-- This helper get the roles pointing on a given class</commentsBefore> + <commentsBefore>-- CONTEXT: DSL!Class </commentsBefore> + <commentsBefore>-- RETURN: Sequence(DSL!Role)</commentsBefore> + <commentsAfter>-- This helper get the containmentstyle of the roles </commentsAfter> + <commentsAfter>-- CONTEXT: DSL!Role	</commentsAfter> + <commentsAfter>-- RETURN: Boolean (true for embedding, false for reference) </commentsAfter> <definition location="30:8-34:37"> <feature xsi:type="ocl:Operation" location="30:13-34:37" name="getRoles"> <parameters location="30:22-30:35" varName="c" variableExp="//@elements.1/@definition/@feature/@body/@body/@source/@source/@source/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="30:26-30:35" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/9"/> </type> </parameters> <returnType xsi:type="ocl:SequenceType" location="30:39-30:57"> <elementType xsi:type="ocl:OclModelElement" location="30:48-30:56" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </elementType> </returnType> <body xsi:type="ocl:IteratorExp" location="31:5-34:37" name="select"> <source xsi:type="ocl:OperationCallExp" location="31:5-31:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="31:5-31:13" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="31:41-34:36" operationName="and"> @@ -148,19 +169,29 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="39:1-42:19"> + <commentsBefore>-- This helper get the containmentstyle of the roles </commentsBefore> + <commentsBefore>-- CONTEXT: DSL!Role	</commentsBefore> + <commentsBefore>-- RETURN: Boolean (true for embedding, false for reference) </commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- Rule 'Metamodel'.</commentsAfter> + <commentsAfter>-- This rule generates the Metamodel, which will content the following packages :</commentsAfter> + <commentsAfter>-- * the package containing the model</commentsAfter> + <commentsAfter>-- * the PrimitivesTypes package, which contents string, integer and boolean types</commentsAfter> <definition location="39:8-42:18"> <feature xsi:type="ocl:Operation" location="39:30-42:18" name="isEmbedding"> <returnType xsi:type="ocl:BooleanType" location="39:46-39:53"/> <body xsi:type="ocl:LetExp" location="40:5-42:18"> <variable location="40:9-40:51" varName="a" variableExp="//@elements.2/@definition/@feature/@body/@in_/@condition/@arguments.0 //@elements.2/@definition/@feature/@body/@in_/@thenExpression/@source/@source"> <type xsi:type="ocl:OclModelElement" location="40:13-40:21" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </type> <initExpression xsi:type="ocl:OperationCallExp" location="40:24-40:51" operationName="first"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="40:24-40:43" name="roles"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="40:24-40:37" name="relation"> <source xsi:type="ocl:VariableExp" location="40:24-40:28"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/14"/> </source> </source> </source> @@ -174,7 +205,7 @@ </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="41:8-41:16" operationName="="> <source xsi:type="ocl:VariableExp" location="41:8-41:12"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/15"/> </source> <arguments xsi:type="ocl:VariableExp" location="41:15-41:16" referredVariable="//@elements.2/@definition/@feature/@body/@variable"/> </condition> @@ -184,16 +215,26 @@ </feature> <context_ location="39:8-39:24"> <context_ xsi:type="ocl:OclModelElement" location="39:16-39:24" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="52:1-81:2" name="Metamodel"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- Rule 'Metamodel'.</commentsBefore> + <commentsBefore>-- This rule generates the Metamodel, which will content the following packages :</commentsBefore> + <commentsBefore>-- * the package containing the model</commentsBefore> + <commentsBefore>-- * the PrimitivesTypes package, which contents string, integer and boolean types</commentsBefore> + <commentsAfter>-- Rule 'Class'.</commentsAfter> + <commentsAfter>-- This rule generates a KM3!Class corresponding to a DSL!Class</commentsAfter> + <commentsAfter>-- and mark his name if it is the Root class</commentsAfter> <outPattern location="55:2-80:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="56:3-58:4" varName="a"> <type xsi:type="ocl:OclModelElement" location="56:7-56:20" name="Metamodel"> - <model href="temp#/0"/> + <model href="new-model#/17"/> </type> <bindings location="57:4-57:30" propertyName="contents"> <value xsi:type="ocl:SequenceExp" location="57:16-57:30"> @@ -204,7 +245,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="59:3-76:5" varName="b" variableExp="//@elements.3/@outPattern/@elements.0/@bindings.0/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="59:7-59:18" name="Package"> - <model href="temp#/0"/> + <model href="new-model#/18"/> </type> <bindings location="60:4-60:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="60:12-60:18" name="name"> @@ -221,7 +262,7 @@ <source xsi:type="ocl:OperationCallExp" location="65:8-65:32" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="65:8-65:9" referredVariable="//@elements.3/@outPattern/@elements.1/@bindings.1/@value/@elements.0/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="65:22-65:31" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </arguments> </source> <arguments xsi:type="ocl:IfExp" location="66:8-71:13"> @@ -231,7 +272,7 @@ <condition xsi:type="ocl:OperationCallExp" location="66:11-66:42" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="66:11-66:12" referredVariable="//@elements.3/@outPattern/@elements.1/@bindings.1/@value/@elements.0/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="66:25-66:41" name="Relationship"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="70:9-70:14"/> @@ -246,7 +287,7 @@ <body xsi:type="ocl:OperationCallExp" location="74:20-74:50" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="74:20-74:21" referredVariable="//@elements.3/@outPattern/@elements.1/@bindings.1/@value/@elements.1/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="74:34-74:49" name="Enumeration"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </arguments> </body> <iterators location="74:16-74:17" varName="a" variableExp="//@elements.3/@outPattern/@elements.1/@bindings.1/@value/@elements.1/@body/@source"/> @@ -256,7 +297,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="77:3-80:4" varName="c" variableExp="//@elements.3/@outPattern/@elements.0/@bindings.0/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="77:7-77:18" name="Package"> - <model href="temp#/0"/> + <model href="new-model#/22"/> </type> <bindings location="78:4-78:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="78:12-78:28" stringSymbol="PrimitiveTypes"/> @@ -269,7 +310,7 @@ <body xsi:type="ocl:OperationCallExp" location="79:36-79:65" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="79:36-79:37" referredVariable="//@elements.3/@outPattern/@elements.2/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="79:50-79:64" name="SimpleType"> - <model href="temp#/1"/> + <model href="new-model#/23"/> </arguments> </body> <iterators location="79:32-79:33" varName="a" variableExp="//@elements.3/@outPattern/@elements.2/@bindings.1/@value/@body/@source"/> @@ -280,16 +321,22 @@ <inPattern location="53:2-54:22"> <elements xsi:type="atl:SimpleInPatternElement" location="54:3-54:22" varName="e" variableExp="//@elements.3/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.3/@outPattern/@elements.1/@bindings.1/@value/@elements.0/@source/@source //@elements.3/@outPattern/@elements.1/@bindings.1/@value/@elements.1/@source/@source //@elements.3/@outPattern/@elements.2/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="54:7-54:22" name="DomainModel"> - <model href="temp#/1"/> + <model href="new-model#/16"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="86:1-99:2" name="Class"> + <commentsBefore>-- Rule 'Class'.</commentsBefore> + <commentsBefore>-- This rule generates a KM3!Class corresponding to a DSL!Class</commentsBefore> + <commentsBefore>-- and mark his name if it is the Root class</commentsBefore> + <commentsAfter>-- Rule 'Relation2Class'.</commentsAfter> + <commentsAfter>-- This rule generates a KM3!Class from a Relationship</commentsAfter> + <commentsAfter>-- if it needs</commentsAfter> <outPattern location="89:2-98:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="90:3-98:4" varName="a"> <type xsi:type="ocl:OclModelElement" location="90:7-90:16" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/25"/> </type> <bindings location="91:4-91:16" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="91:10-91:16" name="name"> @@ -310,14 +357,14 @@ <body xsi:type="ocl:OperationCallExp" location="94:33-94:65" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="94:33-94:34" referredVariable="//@elements.4/@outPattern/@elements.0/@bindings.2/@value/@elements.0/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="94:47-94:64" name="ValueProperty"> - <model href="temp#/1"/> + <model href="new-model#/26"/> </arguments> </body> <iterators location="94:29-94:30" varName="c" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.2/@value/@elements.0/@body/@source"/> </elements> <elements xsi:type="ocl:OperationCallExp" location="95:5-95:27" operationName="getRoles"> <source xsi:type="ocl:VariableExp" location="95:5-95:15"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/27"/> </source> <arguments xsi:type="ocl:VariableExp" location="95:25-95:26" referredVariable="//@elements.4/@inPattern/@elements.0"/> </elements> @@ -343,16 +390,22 @@ <inPattern location="87:2-88:16"> <elements xsi:type="atl:SimpleInPatternElement" location="88:3-88:16" varName="e" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.4/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.4/@outPattern/@elements.0/@bindings.2/@value/@elements.0/@source/@source //@elements.4/@outPattern/@elements.0/@bindings.2/@value/@elements.1/@arguments.0 //@elements.4/@outPattern/@elements.0/@bindings.3/@value/@condition/@source/@source //@elements.4/@outPattern/@elements.0/@bindings.3/@value/@elseExpression/@elements.0/@source"> <type xsi:type="ocl:OclModelElement" location="88:7-88:16" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="104:1-119:2" name="Relation2Class"> + <commentsBefore>-- Rule 'Relation2Class'.</commentsBefore> + <commentsBefore>-- This rule generates a KM3!Class from a Relationship</commentsBefore> + <commentsBefore>-- if it needs</commentsBefore> + <commentsAfter>-- Rule 'SimpleReference'.</commentsAfter> + <commentsAfter>-- This rule generates a Reference in a KM3!Class by copying the features</commentsAfter> + <commentsAfter>-- of the corresponding DSL!Role</commentsAfter> <outPattern location="109:2-118:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="110:2-118:3" varName="a"> <type xsi:type="ocl:OclModelElement" location="110:6-110:15" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/29"/> </type> <bindings location="111:3-111:15" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="111:9-111:15" name="name"> @@ -373,7 +426,7 @@ <body xsi:type="ocl:OperationCallExp" location="114:32-114:64" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="114:32-114:33" referredVariable="//@elements.5/@outPattern/@elements.0/@bindings.2/@value/@elements.0/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="114:46-114:63" name="ValueProperty"> - <model href="temp#/1"/> + <model href="new-model#/30"/> </arguments> </body> <iterators location="114:28-114:29" varName="c" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.2/@value/@elements.0/@body/@source"/> @@ -405,7 +458,7 @@ <inPattern location="105:2-108:4"> <elements xsi:type="atl:SimpleInPatternElement" location="106:2-106:22" varName="e" variableExp="//@elements.5/@inPattern/@filter/@source //@elements.5/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.2/@value/@elements.0/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.2/@value/@elements.1/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.3/@value/@condition/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.3/@value/@elseExpression/@elements.0/@source"> <type xsi:type="ocl:OclModelElement" location="106:6-106:22" name="Relationship"> - <model href="temp#/1"/> + <model href="new-model#/28"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="107:4-107:23" operationName="needTurnOnClass"> @@ -414,10 +467,16 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="124:1-141:2" name="SimpleReference"> + <commentsBefore>-- Rule 'SimpleReference'.</commentsBefore> + <commentsBefore>-- This rule generates a Reference in a KM3!Class by copying the features</commentsBefore> + <commentsBefore>-- of the corresponding DSL!Role</commentsBefore> + <commentsAfter>-- Rule 'ComplexReference'.</commentsAfter> + <commentsAfter>-- This rule generates two opposites references which will be the link</commentsAfter> + <commentsAfter>-- between the new Relationship and his adjoining Classes</commentsAfter> <outPattern location="129:2-140:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="130:3-140:4" varName="rf"> <type xsi:type="ocl:OclModelElement" location="130:8-130:21" name="Reference"> - <model href="temp#/0"/> + <model href="new-model#/32"/> </type> <bindings location="131:4-131:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="131:12-131:18" name="name"> @@ -488,7 +547,7 @@ <inPattern location="125:2-128:4"> <elements xsi:type="atl:SimpleInPatternElement" location="126:3-126:15" varName="r" variableExp="//@elements.6/@inPattern/@filter/@source/@source/@source //@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.3/@value/@condition/@source/@source //@elements.6/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.5/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.6/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.7/@value/@source/@source/@source/@source //@elements.6/@outPattern/@elements.0/@bindings.7/@value/@source/@body/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="126:7-126:15" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/31"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="127:4-127:36" operationName="not"> @@ -501,10 +560,15 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="146:1-178:2" name="ComplexReference"> + <commentsBefore>-- Rule 'ComplexReference'.</commentsBefore> + <commentsBefore>-- This rule generates two opposites references which will be the link</commentsBefore> + <commentsBefore>-- between the new Relationship and his adjoining Classes</commentsBefore> + <commentsAfter>-- Rule 'Attribute'.</commentsAfter> + <commentsAfter>-- This rule generates a KM3!Attribut, corresponding to a DSL!ValueProperty</commentsAfter> <outPattern location="154:2-177:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="155:3-166:4" varName="rfInOwner" variableExp="//@elements.7/@outPattern/@elements.1/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="155:15-155:28" name="Reference"> - <model href="temp#/0"/> + <model href="new-model#/35"/> </type> <bindings location="156:4-156:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="156:12-156:18" name="name"> @@ -560,7 +624,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="167:3-177:4" varName="rfInRelationship" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="167:22-167:35" name="Reference"> - <model href="temp#/0"/> + <model href="new-model#/36"/> </type> <bindings location="168:4-168:29" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="168:12-168:29" name="name"> @@ -617,7 +681,7 @@ </outPattern> <variables location="152:3-152:75" varName="oppositeRole" variableExp="//@elements.7/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.1/@bindings.4/@value/@source //@elements.7/@outPattern/@elements.1/@bindings.5/@value/@condition/@source/@source //@elements.7/@outPattern/@elements.1/@bindings.6/@value/@source //@elements.7/@outPattern/@elements.1/@bindings.7/@value/@source"> <type xsi:type="ocl:OclModelElement" location="152:18-152:26" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/34"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="152:29-152:74" operationName="first"> <source xsi:type="ocl:IteratorExp" location="152:29-152:65" name="select"> @@ -637,7 +701,7 @@ <inPattern location="147:2-150:4"> <elements xsi:type="atl:SimpleInPatternElement" location="148:3-148:15" varName="r" variableExp="//@elements.7/@inPattern/@filter/@source/@source //@elements.7/@variables.0/@initExpression/@source/@source/@source/@source //@elements.7/@variables.0/@initExpression/@source/@body/@arguments.0 //@elements.7/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.5/@value/@condition/@source/@source //@elements.7/@outPattern/@elements.0/@bindings.6/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.7/@value/@source //@elements.7/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.7/@outPattern/@elements.1/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="148:7-148:15" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="149:4-149:32" operationName="needTurnOnClass"> @@ -648,10 +712,14 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="182:1-194:2" name="Attribute"> + <commentsBefore>-- Rule 'Attribute'.</commentsBefore> + <commentsBefore>-- This rule generates a KM3!Attribut, corresponding to a DSL!ValueProperty</commentsBefore> + <commentsAfter>-- Rule 'Enumeration'.</commentsAfter> + <commentsAfter>-- This rule generates the KM3!Enumeration corresponding to a DSL!Enumeration</commentsAfter> <outPattern location="185:2-193:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="186:3-193:4" varName="a"> <type xsi:type="ocl:OclModelElement" location="186:7-186:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/38"/> </type> <bindings location="187:4-187:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="187:12-187:18" name="name"> @@ -680,16 +748,21 @@ <inPattern location="183:2-184:24"> <elements xsi:type="atl:SimpleInPatternElement" location="184:3-184:24" varName="e" variableExp="//@elements.8/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.8/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="184:7-184:24" name="ValueProperty"> - <model href="temp#/1"/> + <model href="new-model#/37"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="198:1-206:2" name="Enumeration"> + <commentsBefore>-- Rule 'Enumeration'.</commentsBefore> + <commentsBefore>-- This rule generates the KM3!Enumeration corresponding to a DSL!Enumeration</commentsBefore> + <commentsAfter>-- Rule 'EnumLiteral'.</commentsAfter> + <commentsAfter>-- This rule generates the KM3!EnumLiteral corresponding to a </commentsAfter> + <commentsAfter>-- DSL!EnumerationLiteral</commentsAfter> <outPattern location="201:2-205:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="202:3-205:4" varName="a"> <type xsi:type="ocl:OclModelElement" location="202:7-202:22" name="Enumeration"> - <model href="temp#/0"/> + <model href="new-model#/40"/> </type> <bindings location="203:5-203:19" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="203:13-203:19" name="name"> @@ -704,7 +777,7 @@ <body xsi:type="ocl:OperationCallExp" location="204:42-204:79" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="204:42-204:43" referredVariable="//@elements.9/@outPattern/@elements.0/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="204:56-204:78" name="EnumerationLiteral"> - <model href="temp#/1"/> + <model href="new-model#/41"/> </arguments> </body> <iterators location="204:38-204:39" varName="a" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.1/@value/@body/@source"/> @@ -715,16 +788,21 @@ <inPattern location="199:2-200:22"> <elements xsi:type="atl:SimpleInPatternElement" location="200:3-200:22" varName="e" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="200:7-200:22" name="Enumeration"> - <model href="temp#/1"/> + <model href="new-model#/39"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="211:1-218:2" name="EnumLiteral"> + <commentsBefore>-- Rule 'EnumLiteral'.</commentsBefore> + <commentsBefore>-- This rule generates the KM3!EnumLiteral corresponding to a </commentsBefore> + <commentsBefore>-- DSL!EnumerationLiteral</commentsBefore> + <commentsAfter>-- Rule 'Datatype'.</commentsAfter> + <commentsAfter>-- This rule generates the KM3!Datatype corresponding to a DSL!SimpleType</commentsAfter> <outPattern location="214:2-217:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="215:3-217:4" varName="l"> <type xsi:type="ocl:OclModelElement" location="215:7-215:22" name="EnumLiteral"> - <model href="temp#/0"/> + <model href="new-model#/43"/> </type> <bindings location="216:4-216:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="216:12-216:18" name="name"> @@ -736,16 +814,18 @@ <inPattern location="212:2-213:29"> <elements xsi:type="atl:SimpleInPatternElement" location="213:3-213:29" varName="e" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="213:7-213:29" name="EnumerationLiteral"> - <model href="temp#/1"/> + <model href="new-model#/42"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="222:1-227:2" name="DataType"> + <commentsBefore>-- Rule 'Datatype'.</commentsBefore> + <commentsBefore>-- This rule generates the KM3!Datatype corresponding to a DSL!SimpleType</commentsBefore> <outPattern location="225:2-226:31"> <elements xsi:type="atl:SimpleOutPatternElement" location="226:2-226:31" varName="e"> <type xsi:type="ocl:OclModelElement" location="226:5-226:17" name="DataType"> - <model href="temp#/0"/> + <model href="new-model#/45"/> </type> <bindings location="226:18-226:30" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="226:24-226:30" name="name"> @@ -757,7 +837,7 @@ <inPattern location="223:2-224:20"> <elements xsi:type="atl:SimpleInPatternElement" location="224:2-224:20" varName="t" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="224:6-224:20" name="SimpleType"> - <model href="temp#/1"/> + <model href="new-model#/44"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/DSL2EMF/XML2DSL/XML2DSL.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/DSL2EMF/XML2DSL/XML2DSL.atl.xmi index db58876b..cb88a2fe 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/DSL2EMF/XML2DSL/XML2DSL.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/DSL2EMF/XML2DSL/XML2DSL.atl.xmi @@ -1,12 +1,23 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="4:1-365:2" name="XML2DSL"> + <commentsBefore>-- DSL to Ecore</commentsBefore> + <commentsBefore>-- first transformation : XML to DSL</commentsBefore> <inModels location="5:23-5:31" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="5:8-5:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="14:1-17:45"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper gets the Attribute who has value name = name and return it to a Boolean</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper gets the Attribute who has value name = name</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="14:8-17:44"> <feature xsi:type="ocl:Operation" location="14:33-17:44" name="getAttrBool"> <parameters location="14:45-14:58" varName="name" variableExp="//@elements.0/@definition/@feature/@body/@variable/@initExpression/@source/@source/@body/@arguments.0/@arguments.0"> @@ -21,14 +32,14 @@ <source xsi:type="ocl:IteratorExp" location="16:5-16:78" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="16:5-16:18" name="children"> <source xsi:type="ocl:VariableExp" location="16:5-16:9"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/3"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="16:31-16:77" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="16:31-16:59" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="16:31-16:32" referredVariable="//@elements.0/@definition/@feature/@body/@variable/@initExpression/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="16:45-16:58" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="16:64-16:77" operationName="="> @@ -55,12 +66,19 @@ </feature> <context_ location="14:8-14:27"> <context_ xsi:type="ocl:OclModelElement" location="14:16-14:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="22:1-23:94"> + <commentsBefore>-- This helper gets the Attribute who has value name = name</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper gets the value of the attribute who has value name=name </commentsAfter> + <commentsAfter>-- from a child of self</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="22:8-23:93"> <feature xsi:type="ocl:Operation" location="22:33-23:93" name="getAttrVal"> <parameters location="22:44-22:57" varName="name" variableExp="//@elements.1/@definition/@feature/@body/@source/@source/@body/@arguments.0/@arguments.0"> @@ -72,14 +90,14 @@ <source xsi:type="ocl:IteratorExp" location="23:5-23:78" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="23:5-23:18" name="children"> <source xsi:type="ocl:VariableExp" location="23:5-23:9"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/6"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="23:31-23:77" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="23:31-23:59" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="23:31-23:32" referredVariable="//@elements.1/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="23:45-23:58" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="23:64-23:77" operationName="="> @@ -96,12 +114,19 @@ </feature> <context_ location="22:8-22:27"> <context_ xsi:type="ocl:OclModelElement" location="22:16-22:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="29:1-31:79"> + <commentsBefore>-- This helper gets the value of the attribute who has value name=name </commentsBefore> + <commentsBefore>-- from a child of self</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper gets the Type of a property.</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="29:8-31:78"> <feature xsi:type="ocl:Operation" location="29:33-31:78" name="get"> <parameters location="29:37-29:51" varName="child" variableExp="//@elements.2/@definition/@feature/@body/@source/@source/@source/@source/@source/@body/@arguments.0/@arguments.0"> @@ -119,14 +144,14 @@ <source xsi:type="ocl:IteratorExp" location="30:5-30:79" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="30:5-30:18" name="children"> <source xsi:type="ocl:VariableExp" location="30:5-30:9"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/9"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="30:33-30:78" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="30:33-30:59" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="30:33-30:34" referredVariable="//@elements.2/@definition/@feature/@body/@source/@source/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="30:47-30:58" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="30:64-30:78" operationName="="> @@ -148,7 +173,7 @@ <source xsi:type="ocl:OperationCallExp" location="31:15-31:43" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="31:15-31:16" referredVariable="//@elements.2/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="31:29-31:42" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="31:48-31:61" operationName="="> @@ -165,12 +190,18 @@ </feature> <context_ location="29:8-29:27"> <context_ xsi:type="ocl:OclModelElement" location="29:16-29:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="36:1-39:38"> + <commentsBefore>-- This helper gets the Type of a property.</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper stores an integer value used to assign an ID to each generated.</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="36:8-39:37"> <feature xsi:type="ocl:Operation" location="36:33-39:37" name="getType"> <returnType xsi:type="ocl:StringType" location="36:45-36:51"/> @@ -182,14 +213,14 @@ <source xsi:type="ocl:IteratorExp" location="37:22-38:31" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="37:22-37:35" name="children"> <source xsi:type="ocl:VariableExp" location="37:22-37:26"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/13"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="37:48-38:30" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="37:48-37:74" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="37:48-37:49" referredVariable="//@elements.3/@definition/@feature/@body/@variable/@initExpression/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="37:62-37:73" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="38:7-38:30" operationName="="> @@ -219,12 +250,19 @@ </feature> <context_ location="36:8-36:27"> <context_ xsi:type="ocl:OclModelElement" location="36:16-36:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="44:1-46:35"> + <commentsBefore>-- This helper stores an integer value used to assign an ID to each generated.</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper gets Text from an XML!Element who has a child with a name value = name </commentsAfter> + <commentsAfter>-- and with a child XML!Text.</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="44:8-46:34"> <feature xsi:type="ocl:Operation" location="44:33-46:34" name="getEnumId"> <returnType xsi:type="ocl:StringType" location="44:47-44:53"/> @@ -233,14 +271,14 @@ <source xsi:type="ocl:IteratorExp" location="45:3-45:84" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="45:3-45:16" name="children"> <source xsi:type="ocl:VariableExp" location="45:3-45:7"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/16"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="45:29-45:83" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="45:29-45:55" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="45:29-45:30" referredVariable="//@elements.4/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="45:43-45:54" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="45:60-45:83" operationName="="> @@ -258,12 +296,19 @@ </feature> <context_ location="44:8-44:27"> <context_ xsi:type="ocl:OclModelElement" location="44:16-44:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="52:1-65:8"> + <commentsBefore>-- This helper gets Text from an XML!Element who has a child with a name value = name </commentsBefore> + <commentsBefore>-- and with a child XML!Text.</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper return a Sequence of XML!Element from a child name of a child names of self</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: Sequence(XML!Element)</commentsAfter> <definition location="52:8-65:7"> <feature xsi:type="ocl:Operation" location="52:33-65:7" name="getText"> <parameters location="52:41-52:54" varName="name" variableExp="//@elements.5/@definition/@feature/@body/@in_/@elseExpression/@variable/@initExpression/@body/@arguments.0"> @@ -274,19 +319,19 @@ <variable location="53:6-54:57" varName="e" variableExp="//@elements.5/@definition/@feature/@body/@in_/@condition/@source //@elements.5/@definition/@feature/@body/@in_/@elseExpression/@variable/@initExpression/@source"> <type xsi:type="ocl:SequenceType" location="53:9-53:30"> <elementType xsi:type="ocl:OclModelElement" location="53:18-53:29" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="54:2-54:57" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="54:2-54:15" name="children"> <source xsi:type="ocl:VariableExp" location="54:2-54:6"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/20"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="54:29-54:55" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="54:29-54:30" referredVariable="//@elements.5/@definition/@feature/@body/@variable/@initExpression/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="54:43-54:54" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </arguments> </body> <iterators location="54:25-54:26" varName="m" variableExp="//@elements.5/@definition/@feature/@body/@variable/@initExpression/@body/@source"/> @@ -301,7 +346,7 @@ <variable location="57:7-58:31" varName="r" variableExp="//@elements.5/@definition/@feature/@body/@in_/@elseExpression/@in_/@condition/@source //@elements.5/@definition/@feature/@body/@in_/@elseExpression/@in_/@elseExpression/@source/@source/@source/@source/@source/@source"> <type xsi:type="ocl:SequenceType" location="57:9-57:30"> <elementType xsi:type="ocl:OclModelElement" location="57:18-57:29" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/22"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="58:6-58:31" name="select"> @@ -336,7 +381,7 @@ <body xsi:type="ocl:OperationCallExp" location="62:17-62:40" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="62:17-62:18" referredVariable="//@elements.5/@definition/@feature/@body/@in_/@elseExpression/@in_/@elseExpression/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="62:31-62:39" name="Text"> - <model href="temp#/1"/> + <model href="new-model#/23"/> </arguments> </body> <iterators location="62:13-62:14" varName="f" variableExp="//@elements.5/@definition/@feature/@body/@in_/@elseExpression/@in_/@elseExpression/@source/@source/@source/@body/@source"/> @@ -358,12 +403,18 @@ </feature> <context_ location="52:8-52:27"> <context_ xsi:type="ocl:OclModelElement" location="52:16-52:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="70:1-72:100"> + <commentsBefore>-- This helper return a Sequence of XML!Element from a child name of a child names of self</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Sequence(XML!Element)</commentsBefore> + <commentsAfter>-- This helper say if an XML!Element has a child with value name = name</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="70:8-72:99"> <feature xsi:type="ocl:Operation" location="70:33-72:99" name="getSeq"> <parameters location="70:40-70:54" varName="names" variableExp="//@elements.6/@definition/@feature/@body/@source/@source/@source/@body/@arguments.0/@arguments.0"> @@ -374,7 +425,7 @@ </parameters> <returnType xsi:type="ocl:SequenceType" location="70:72-70:93"> <elementType xsi:type="ocl:OclModelElement" location="70:81-70:92" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/25"/> </elementType> </returnType> <body xsi:type="ocl:IteratorExp" location="71:2-72:99" name="select"> @@ -383,14 +434,14 @@ <source xsi:type="ocl:IteratorExp" location="71:2-71:77" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="71:2-71:15" name="children"> <source xsi:type="ocl:VariableExp" location="71:2-71:6"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/26"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="71:30-71:75" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="71:30-71:56" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="71:30-71:31" referredVariable="//@elements.6/@definition/@feature/@body/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="71:44-71:55" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/27"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="71:61-71:75" operationName="="> @@ -412,7 +463,7 @@ <source xsi:type="ocl:OperationCallExp" location="72:53-72:79" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="72:53-72:54" referredVariable="//@elements.6/@definition/@feature/@body/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="72:67-72:78" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/28"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="72:84-72:97" operationName="="> @@ -427,12 +478,19 @@ </feature> <context_ location="70:8-70:27"> <context_ xsi:type="ocl:OclModelElement" location="70:16-70:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="77:1-82:8"> + <commentsBefore>-- This helper say if an XML!Element has a child with value name = name</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper stores an integer value used to assign an ID to each generated</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> + <commentsAfter>--teste si l'element possede un certain XMLattribut</commentsAfter> <definition location="77:8-82:7"> <feature xsi:type="ocl:Operation" location="77:33-82:7" name="hasChildren"> <parameters location="77:45-77:58" varName="name" variableExp="//@elements.7/@definition/@feature/@body/@variable/@initExpression/@source/@body/@arguments.0/@arguments.0 //@elements.7/@definition/@feature/@body/@in_/@condition/@arguments.0/@arguments.0"> @@ -442,20 +500,20 @@ <body xsi:type="ocl:LetExp" location="78:2-82:7"> <variable location="78:6-79:84" varName="a" variableExp="//@elements.7/@definition/@feature/@body/@in_/@condition/@source/@source //@elements.7/@definition/@feature/@body/@in_/@condition/@arguments.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="78:10-78:21" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/30"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="79:2-79:84" operationName="first"> <source xsi:type="ocl:IteratorExp" location="79:2-79:75" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="79:2-79:15" name="children"> <source xsi:type="ocl:VariableExp" location="79:2-79:6"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/31"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="79:29-79:73" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="79:29-79:55" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="79:29-79:30" referredVariable="//@elements.7/@definition/@feature/@body/@variable/@initExpression/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="79:43-79:54" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/32"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="79:60-79:73" operationName="="> @@ -475,7 +533,7 @@ <source xsi:type="ocl:OperationCallExp" location="80:9-80:35" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="80:9-80:10" referredVariable="//@elements.7/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="80:23-80:34" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="80:40-80:53" operationName="="> @@ -491,12 +549,20 @@ </feature> <context_ location="77:8-77:27"> <context_ xsi:type="ocl:OclModelElement" location="77:16-77:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/29"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="88:1-93:8"> + <commentsBefore>-- This helper stores an integer value used to assign an ID to each generated</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsBefore>--teste si l'element possede un certain XMLattribut</commentsBefore> + <commentsAfter>-- This helper indicates if a Classifier is Abstract or not by searching in</commentsAfter> + <commentsAfter>-- the child mdfmetada of self</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="88:8-93:7"> <feature xsi:type="ocl:Operation" location="88:33-93:7" name="hasAttr"> <parameters location="88:41-88:54" varName="name" variableExp="//@elements.8/@definition/@feature/@body/@variable/@initExpression/@source/@body/@arguments.0/@arguments.0 //@elements.8/@definition/@feature/@body/@in_/@thenExpression/@arguments.0"> @@ -506,20 +572,20 @@ <body xsi:type="ocl:LetExp" location="89:2-93:7"> <variable location="89:6-90:86" varName="a" variableExp="//@elements.8/@definition/@feature/@body/@in_/@condition/@source/@source //@elements.8/@definition/@feature/@body/@in_/@thenExpression/@source/@source"> <type xsi:type="ocl:OclModelElement" location="89:10-89:23" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/35"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="90:2-90:86" operationName="first"> <source xsi:type="ocl:IteratorExp" location="90:2-90:77" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="90:2-90:15" name="children"> <source xsi:type="ocl:VariableExp" location="90:2-90:6"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/36"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="90:29-90:75" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="90:29-90:57" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="90:29-90:30" referredVariable="//@elements.8/@definition/@feature/@body/@variable/@initExpression/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="90:43-90:56" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/37"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="90:62-90:75" operationName="="> @@ -551,26 +617,34 @@ </feature> <context_ location="88:8-88:27"> <context_ xsi:type="ocl:OclModelElement" location="88:16-88:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/34"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="99:1-114:8"> + <commentsBefore>-- This helper indicates if a Classifier is Abstract or not by searching in</commentsBefore> + <commentsBefore>-- the child mdfmetada of self</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper produce a Map of XML!Element corresponding to concept,relationship,enumeration</commentsAfter> + <commentsAfter>-- by identity to help majing references</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Map(String, XML!Element)</commentsAfter> <definition location="99:8-114:7"> <feature xsi:type="ocl:Operation" location="99:33-114:7" name="isAbstract"> <returnType xsi:type="ocl:BooleanType" location="99:48-99:55"/> <body xsi:type="ocl:LetExp" location="100:2-114:7"> <variable location="100:6-105:8" varName="a" variableExp="//@elements.9/@definition/@feature/@body/@in_/@condition/@source //@elements.9/@definition/@feature/@body/@in_/@elseExpression/@condition/@source //@elements.9/@definition/@feature/@body/@in_/@elseExpression/@thenExpression/@source/@source"> <type xsi:type="ocl:OclModelElement" location="100:10-100:21" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/39"/> </type> <initExpression xsi:type="ocl:IfExp" location="101:3-105:8"> <thenExpression xsi:type="ocl:CollectionOperationCallExp" location="103:3-103:59" operationName="first"> <source xsi:type="ocl:IteratorExp" location="103:3-103:50" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="103:3-103:16" name="children"> <source xsi:type="ocl:VariableExp" location="103:3-103:7"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/41"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="103:27-103:49" operationName="="> @@ -584,12 +658,12 @@ </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="101:6-101:37" operationName="hasChildren"> <source xsi:type="ocl:VariableExp" location="101:6-101:10"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/40"/> </source> <arguments xsi:type="ocl:StringExp" location="101:23-101:36" stringSymbol="mdfmetadata"/> </condition> <elseExpression xsi:type="ocl:VariableExp" location="104:8-104:12"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/42"/> </elseExpression> </initExpression> </variable> @@ -598,7 +672,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="107:5-107:13" operationName="="> <source xsi:type="ocl:VariableExp" location="107:5-107:6" referredVariable="//@elements.9/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:VariableExp" location="107:9-107:13"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/43"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="110:4-113:9"> @@ -620,18 +694,25 @@ </feature> <context_ location="99:8-99:27"> <context_ xsi:type="ocl:OclModelElement" location="99:16-99:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/38"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="120:1-127:7"> + <commentsBefore>-- This helper produce a Map of XML!Element corresponding to concept,relationship,enumeration</commentsBefore> + <commentsBefore>-- by identity to help majing references</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Map(String, XML!Element)</commentsBefore> + <commentsAfter>-- This helper produce a Map of roles, containmentstyle</commentsAfter> + <commentsAfter>-- for all the roles of the selected Relationship, we look for it in the map</commentsAfter> + <commentsAfter>-- return true for embedding, false for reference</commentsAfter> <definition location="120:8-127:6"> <feature xsi:type="ocl:Attribute" location="120:13-127:6" name="dslElementsById"> <initExpression xsi:type="ocl:IterateExp" location="121:5-127:6"> <source xsi:type="ocl:OperationCallExp" location="121:5-121:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="121:5-121:16" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/45"/> </source> </source> <body xsi:type="ocl:IfExp" location="122:9-126:14"> @@ -677,7 +758,7 @@ <result location="121:44-121:82" varName="acc" variableExp="//@elements.10/@definition/@feature/@initExpression/@body/@thenExpression/@source //@elements.10/@definition/@feature/@initExpression/@body/@elseExpression"> <type xsi:type="ocl:MapType" location="121:50-121:73"> <valueType xsi:type="ocl:OclModelElement" location="121:61-121:72" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/46"/> </valueType> <keyType xsi:type="ocl:StringType" location="121:54-121:60"/> </type> @@ -686,7 +767,7 @@ </initExpression> <type xsi:type="ocl:MapType" location="120:31-120:55"> <valueType xsi:type="ocl:OclModelElement" location="120:43-120:54" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/44"/> </valueType> <keyType xsi:type="ocl:StringType" location="120:35-120:41"/> </type> @@ -694,6 +775,13 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="132:1-147:26"> + <commentsBefore>-- This helper produce a Map of roles, containmentstyle</commentsBefore> + <commentsBefore>-- for all the roles of the selected Relationship, we look for it in the map</commentsBefore> + <commentsBefore>-- return true for embedding, false for reference</commentsBefore> + <commentsAfter>-- This helper return a Sequence of XML!Element who are subType of the XML!Element </commentsAfter> + <commentsAfter>-- who has is id = id</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(XML!Element)</commentsAfter> <definition location="132:8-147:25"> <feature xsi:type="ocl:Operation" location="132:33-147:25" name="getContainment"> <returnType xsi:type="ocl:BooleanType" location="132:52-132:59"/> @@ -704,7 +792,7 @@ <source xsi:type="ocl:OperationCallExp" location="133:19-133:54" operationName="first"> <source xsi:type="ocl:OperationCallExp" location="133:19-133:46" operationName="getSeq"> <source xsi:type="ocl:VariableExp" location="133:19-133:23"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/48"/> </source> <arguments xsi:type="ocl:StringExp" location="133:31-133:38" stringSymbol="roles"/> <arguments xsi:type="ocl:StringExp" location="133:39-133:45" stringSymbol="role"/> @@ -720,7 +808,7 @@ <source xsi:type="ocl:OperationCallExp" location="134:19-134:53" operationName="last"> <source xsi:type="ocl:OperationCallExp" location="134:19-134:46" operationName="getSeq"> <source xsi:type="ocl:VariableExp" location="134:19-134:23"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/49"/> </source> <arguments xsi:type="ocl:StringExp" location="134:31-134:38" stringSymbol="roles"/> <arguments xsi:type="ocl:StringExp" location="134:39-134:45" stringSymbol="role"/> @@ -737,7 +825,7 @@ <source xsi:type="ocl:IteratorExp" location="136:2-145:19" name="select"> <source xsi:type="ocl:OperationCallExp" location="136:2-136:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="136:2-136:13" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/50"/> </source> </source> <body xsi:type="ocl:IfExp" location="138:2-145:18"> @@ -816,12 +904,19 @@ </feature> <context_ location="132:8-132:27"> <context_ xsi:type="ocl:OclModelElement" location="132:16-132:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/47"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="153:1-160:11"> + <commentsBefore>-- This helper return a Sequence of XML!Element who are subType of the XML!Element </commentsBefore> + <commentsBefore>-- who has is id = id</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(XML!Element)</commentsBefore> + <commentsAfter>-- This helper return the DSL!SimpleType that match String</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: DSL!SimpleType</commentsAfter> <definition location="153:8-160:10"> <feature xsi:type="ocl:Operation" location="153:13-160:10" name="getSubTypes"> <parameters location="153:25-153:34" varName="id" variableExp="//@elements.12/@definition/@feature/@body/@body/@thenExpression/@condition/@arguments.0"> @@ -829,13 +924,13 @@ </parameters> <returnType xsi:type="ocl:SequenceType" location="153:37-153:58"> <elementType xsi:type="ocl:OclModelElement" location="153:46-153:57" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/51"/> </elementType> </returnType> <body xsi:type="ocl:IterateExp" location="154:1-160:10"> <source xsi:type="ocl:OperationCallExp" location="154:1-154:27" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="154:1-154:12" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/52"/> </source> </source> <body xsi:type="ocl:IfExp" location="155:9-160:8"> @@ -879,7 +974,7 @@ <result location="154:40-154:81" varName="acc" variableExp="//@elements.12/@definition/@feature/@body/@body/@thenExpression/@thenExpression/@source //@elements.12/@definition/@feature/@body/@body/@thenExpression/@elseExpression //@elements.12/@definition/@feature/@body/@body/@elseExpression"> <type xsi:type="ocl:SequenceType" location="154:46-154:67"> <elementType xsi:type="ocl:OclModelElement" location="154:55-154:66" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/53"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="154:70-154:81"/> @@ -889,24 +984,33 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="165:1-185:8"> + <commentsBefore>-- This helper return the DSL!SimpleType that match String</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: DSL!SimpleType</commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- Rule 'DomainModel'.</commentsAfter> + <commentsAfter>-- This rule generates the DomainModel, which will content all the relevants </commentsAfter> + <commentsAfter>-- informations of the model</commentsAfter> <definition location="165:8-185:7"> <feature xsi:type="ocl:Operation" location="165:13-185:7" name="findType"> <parameters location="165:22-165:30" varName="s" variableExp="//@elements.13/@definition/@feature/@body/@in_/@condition/@source //@elements.13/@definition/@feature/@body/@in_/@elseExpression/@condition/@source/@source //@elements.13/@definition/@feature/@body/@in_/@elseExpression/@condition/@arguments.0/@source //@elements.13/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@condition/@source"> <type xsi:type="ocl:StringType" location="165:24-165:30"/> </parameters> <returnType xsi:type="ocl:OclModelElement" location="165:34-165:48" name="SimpleType"> - <model href="temp#/0"/> + <model href="new-model#/54"/> </returnType> <body xsi:type="ocl:LetExp" location="166:2-185:7"> <variable location="166:6-172:22" varName="a" variableExp="//@elements.13/@definition/@feature/@body/@in_/@thenExpression/@arguments.0 //@elements.13/@definition/@feature/@body/@in_/@elseExpression/@thenExpression/@arguments.0 //@elements.13/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@thenExpression/@arguments.0 //@elements.13/@definition/@feature/@body/@in_/@elseExpression/@elseExpression/@elseExpression/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="166:10-166:21" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/55"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="167:3-172:22" operationName="first"> <source xsi:type="ocl:IteratorExp" location="167:3-172:12" name="select"> <source xsi:type="ocl:OperationCallExp" location="167:3-167:29" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="167:3-167:14" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/56"/> </source> </source> <body xsi:type="ocl:IfExp" location="167:44-172:10"> @@ -943,7 +1047,7 @@ <in_ xsi:type="ocl:IfExp" location="174:2-185:7"> <thenExpression xsi:type="ocl:OperationCallExp" location="175:7-175:38" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="175:7-175:17"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/57"/> </source> <arguments xsi:type="ocl:VariableExp" location="175:30-175:31" referredVariable="//@elements.13/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:StringExp" location="175:32-175:37" stringSymbol="str"/> @@ -955,7 +1059,7 @@ <elseExpression xsi:type="ocl:IfExp" location="177:3-184:8"> <thenExpression xsi:type="ocl:OperationCallExp" location="178:8-178:39" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="178:8-178:18"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/58"/> </source> <arguments xsi:type="ocl:VariableExp" location="178:31-178:32" referredVariable="//@elements.13/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:StringExp" location="178:33-178:38" stringSymbol="int"/> @@ -973,7 +1077,7 @@ <elseExpression xsi:type="ocl:IfExp" location="180:4-183:9"> <thenExpression xsi:type="ocl:OperationCallExp" location="181:9-181:43" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="181:9-181:19"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/59"/> </source> <arguments xsi:type="ocl:VariableExp" location="181:32-181:33" referredVariable="//@elements.13/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:StringExp" location="181:34-181:42" stringSymbol="double"/> @@ -984,7 +1088,7 @@ </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="182:9-182:41" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="182:9-182:19"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/60"/> </source> <arguments xsi:type="ocl:VariableExp" location="182:32-182:33" referredVariable="//@elements.13/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:StringExp" location="182:34-182:40" stringSymbol="bool"/> @@ -997,10 +1101,19 @@ </definition> </elements> <elements xsi:type="atl:MatchedRule" location="194:1-228:2" name="DomainModel"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- Rule 'DomainModel'.</commentsBefore> + <commentsBefore>-- This rule generates the DomainModel, which will content all the relevants </commentsBefore> + <commentsBefore>-- informations of the model</commentsBefore> + <commentsAfter>-- Rule 'Class'.</commentsAfter> + <commentsAfter>-- This rule generates a DSL!Class and link it to his supertypes,</commentsAfter> + <commentsAfter>-- subtypes and properties</commentsAfter> <outPattern location="204:2-227:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="205:3-215:4" varName="d"> <type xsi:type="ocl:OclModelElement" location="205:7-205:22" name="DomainModel"> - <model href="temp#/0"/> + <model href="new-model#/62"/> </type> <bindings location="206:4-206:32" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="206:12-206:32" operationName="getAttrVal"> @@ -1056,7 +1169,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="216:3-218:4" varName="str" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.5/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="216:9-216:23" name="SimpleType"> - <model href="temp#/0"/> + <model href="new-model#/63"/> </type> <bindings location="217:4-217:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="217:10-217:18" stringSymbol="String"/> @@ -1064,7 +1177,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="219:3-221:4" varName="int" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.5/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="219:9-219:23" name="SimpleType"> - <model href="temp#/0"/> + <model href="new-model#/64"/> </type> <bindings location="220:4-220:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="220:10-220:19" stringSymbol="Integer"/> @@ -1072,7 +1185,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="222:3-224:4" varName="bool" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.5/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="222:10-222:24" name="SimpleType"> - <model href="temp#/0"/> + <model href="new-model#/65"/> </type> <bindings location="223:4-223:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="223:10-223:19" stringSymbol="Boolean"/> @@ -1080,7 +1193,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="225:3-227:4" varName="double" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.5/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="225:12-225:26" name="SimpleType"> - <model href="temp#/0"/> + <model href="new-model#/66"/> </type> <bindings location="226:4-226:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="226:10-226:18" stringSymbol="Double"/> @@ -1090,7 +1203,7 @@ <inPattern location="195:2-203:4"> <elements xsi:type="atl:SimpleInPatternElement" location="196:3-196:18" varName="e" variableExp="//@elements.14/@inPattern/@filter/@condition/@source/@source //@elements.14/@inPattern/@filter/@thenExpression/@condition/@source/@source/@source //@elements.14/@inPattern/@filter/@thenExpression/@thenExpression/@source/@source //@elements.14/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.14/@outPattern/@elements.0/@bindings.4/@value/@elements.0/@source //@elements.14/@outPattern/@elements.0/@bindings.4/@value/@elements.1/@source //@elements.14/@outPattern/@elements.0/@bindings.5/@value/@elements.0/@source"> <type xsi:type="ocl:OclModelElement" location="196:7-196:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/61"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="197:5-202:10"> @@ -1123,10 +1236,26 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="233:1-255:2" name="Class"> + <commentsBefore>-- Rule 'Class'.</commentsBefore> + <commentsBefore>-- This rule generates a DSL!Class and link it to his supertypes,</commentsBefore> + <commentsBefore>-- subtypes and properties</commentsBefore> + <commentsAfter>-- Rule 'Relationship'.</commentsAfter> + <commentsAfter>-- This rule generates a DSL!Relationship and link it to his supertypes,</commentsAfter> + <commentsAfter>-- subtypes, roles and properties</commentsAfter> <outPattern location="238:2-250:4"> + <commentsAfter>--,</commentsAfter> + <commentsAfter>--		nm : DSL!ValueProperty (</commentsAfter> + <commentsAfter>--			name<-'Name',</commentsAfter> + <commentsAfter>--			type<-thisModule.findType('String')</commentsAfter> + <commentsAfter>--		)</commentsAfter> <elements xsi:type="atl:SimpleOutPatternElement" location="239:3-250:4" varName="c"> + <commentsAfter>--,</commentsAfter> + <commentsAfter>--		nm : DSL!ValueProperty (</commentsAfter> + <commentsAfter>--			name<-'Name',</commentsAfter> + <commentsAfter>--			type<-thisModule.findType('String')</commentsAfter> + <commentsAfter>--		)</commentsAfter> <type xsi:type="ocl:OclModelElement" location="239:7-239:16" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/68"/> </type> <bindings location="240:4-240:32" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="240:12-240:32" operationName="getAttrVal"> @@ -1158,6 +1287,7 @@ </value> </bindings> <bindings location="246:4-246:66" propertyName="properties"> + <commentsBefore>--			properties <- Sequence{e.getSeq('valueProperties','property').append(nm)},</commentsBefore> <value xsi:type="ocl:SequenceExp" location="246:18-246:66"> <elements xsi:type="ocl:OperationCallExp" location="246:27-246:65" operationName="getSeq"> <source xsi:type="ocl:VariableExp" location="246:27-246:28" referredVariable="//@elements.15/@inPattern/@elements.0"/> @@ -1177,7 +1307,7 @@ <value xsi:type="ocl:OperationCallExp" location="248:17-248:71" operationName="get"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="248:17-248:43" name="dslElementsById"> <source xsi:type="ocl:VariableExp" location="248:17-248:27"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/69"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="248:48-248:70" operationName="getText"> @@ -1189,7 +1319,7 @@ <bindings location="249:4-249:56" propertyName="subTypes"> <value xsi:type="ocl:OperationCallExp" location="249:14-249:56" operationName="getSubTypes"> <source xsi:type="ocl:VariableExp" location="249:14-249:24"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/70"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="249:37-249:55" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="249:37-249:38" referredVariable="//@elements.15/@inPattern/@elements.0"/> @@ -1202,7 +1332,7 @@ <inPattern location="234:2-237:4"> <elements xsi:type="atl:SimpleInPatternElement" location="235:3-235:18" varName="e" variableExp="//@elements.15/@inPattern/@filter/@source/@source //@elements.15/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.15/@outPattern/@elements.0/@bindings.5/@value/@elements.0/@source //@elements.15/@outPattern/@elements.0/@bindings.6/@value/@source/@source //@elements.15/@outPattern/@elements.0/@bindings.7/@value/@arguments.0/@source //@elements.15/@outPattern/@elements.0/@bindings.8/@value/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="235:7-235:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/67"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="236:4-236:22" operationName="="> @@ -1214,10 +1344,15 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="260:1-279:2" name="Relationship"> + <commentsBefore>-- Rule 'Relationship'.</commentsBefore> + <commentsBefore>-- This rule generates a DSL!Relationship and link it to his supertypes,</commentsBefore> + <commentsBefore>-- subtypes, roles and properties</commentsBefore> + <commentsAfter>-- Rule 'Role'.</commentsAfter> + <commentsAfter>-- This rule generates a DSL!Role and link it to his ends</commentsAfter> <outPattern location="265:2-278:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="266:3-278:4" varName="r"> <type xsi:type="ocl:OclModelElement" location="266:7-266:23" name="Relationship"> - <model href="temp#/0"/> + <model href="new-model#/72"/> </type> <bindings location="267:4-267:32" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="267:12-267:32" operationName="getAttrVal"> @@ -1278,7 +1413,7 @@ <value xsi:type="ocl:OperationCallExp" location="276:17-276:71" operationName="get"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="276:17-276:43" name="dslElementsById"> <source xsi:type="ocl:VariableExp" location="276:17-276:27"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/73"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="276:48-276:70" operationName="getText"> @@ -1290,7 +1425,7 @@ <bindings location="277:4-277:56" propertyName="subTypes"> <value xsi:type="ocl:OperationCallExp" location="277:14-277:56" operationName="getSubTypes"> <source xsi:type="ocl:VariableExp" location="277:14-277:24"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/74"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="277:37-277:55" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="277:37-277:38" referredVariable="//@elements.16/@inPattern/@elements.0"/> @@ -1303,7 +1438,7 @@ <inPattern location="261:2-264:4"> <elements xsi:type="atl:SimpleInPatternElement" location="262:3-262:18" varName="e" variableExp="//@elements.16/@inPattern/@filter/@source/@source //@elements.16/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.5/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.6/@value/@source/@source //@elements.16/@outPattern/@elements.0/@bindings.7/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.8/@value/@source //@elements.16/@outPattern/@elements.0/@bindings.9/@value/@arguments.0/@source //@elements.16/@outPattern/@elements.0/@bindings.10/@value/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="262:7-262:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/71"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="263:4-263:27" operationName="="> @@ -1315,10 +1450,14 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="283:1-307:2" name="Role"> + <commentsBefore>-- Rule 'Role'.</commentsBefore> + <commentsBefore>-- This rule generates a DSL!Role and link it to his ends</commentsBefore> + <commentsAfter>-- Rule 'ValueProperty'.</commentsAfter> + <commentsAfter>-- This rule generates a property of a classifier</commentsAfter> <outPattern location="291:2-306:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="292:3-306:4" varName="r"> <type xsi:type="ocl:OclModelElement" location="292:7-292:15" name="Role"> - <model href="temp#/0"/> + <model href="new-model#/76"/> </type> <bindings location="293:4-293:32" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="293:12-293:32" operationName="getAttrVal"> @@ -1336,7 +1475,7 @@ <value xsi:type="ocl:OperationCallExp" location="295:14-295:65" operationName="get"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="295:14-295:40" name="dslElementsById"> <source xsi:type="ocl:VariableExp" location="295:14-295:24"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/77"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="295:45-295:64" operationName="getText"> @@ -1349,7 +1488,7 @@ <value xsi:type="ocl:OperationCallExp" location="296:12-296:61" operationName="get"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="296:12-296:38" name="dslElementsById"> <source xsi:type="ocl:VariableExp" location="296:12-296:22"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/78"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="296:43-296:60" operationName="getText"> @@ -1404,7 +1543,7 @@ <source xsi:type="ocl:OperationCallExp" location="302:40-302:66" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="302:40-302:41" referredVariable="//@elements.17/@outPattern/@elements.0/@bindings.9/@value/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="302:54-302:65" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/79"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="302:71-302:91" operationName="="> @@ -1431,7 +1570,7 @@ <source xsi:type="ocl:OperationCallExp" location="304:46-304:72" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="304:46-304:47" referredVariable="//@elements.17/@outPattern/@elements.0/@bindings.10/@value/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="304:60-304:71" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/80"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="304:77-304:97" operationName="="> @@ -1452,7 +1591,7 @@ <inPattern location="284:2-290:4"> <elements xsi:type="atl:SimpleInPatternElement" location="285:3-285:18" varName="e" variableExp="//@elements.17/@inPattern/@filter/@condition/@source/@source //@elements.17/@inPattern/@filter/@thenExpression/@source/@source/@source //@elements.17/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.17/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.17/@outPattern/@elements.0/@bindings.2/@value/@arguments.0/@source //@elements.17/@outPattern/@elements.0/@bindings.3/@value/@arguments.0/@source //@elements.17/@outPattern/@elements.0/@bindings.4/@value/@source/@source //@elements.17/@outPattern/@elements.0/@bindings.5/@value/@source/@source //@elements.17/@outPattern/@elements.0/@bindings.6/@value/@source/@source //@elements.17/@outPattern/@elements.0/@bindings.7/@value/@source //@elements.17/@outPattern/@elements.0/@bindings.8/@value/@source //@elements.17/@outPattern/@elements.0/@bindings.9/@value/@source/@source/@source/@source //@elements.17/@outPattern/@elements.0/@bindings.10/@value/@source/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="285:7-285:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/75"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="286:4-289:9"> @@ -1475,10 +1614,14 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="311:1-328:2" name="ValueProperty"> + <commentsBefore>-- Rule 'ValueProperty'.</commentsBefore> + <commentsBefore>-- This rule generates a property of a classifier</commentsBefore> + <commentsAfter>-- Rule 'Enumeration'.</commentsAfter> + <commentsAfter>-- This rule generates an Enumeration</commentsAfter> <outPattern location="319:2-327:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="320:3-327:4" varName="p"> <type xsi:type="ocl:OclModelElement" location="320:7-320:24" name="ValueProperty"> - <model href="temp#/0"/> + <model href="new-model#/82"/> </type> <bindings location="321:4-321:32" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="321:12-321:32" operationName="getAttrVal"> @@ -1496,7 +1639,7 @@ <value xsi:type="ocl:IfExp" location="323:12-326:11"> <thenExpression xsi:type="ocl:OperationCallExp" location="324:12-324:44" operationName="findType"> <source xsi:type="ocl:VariableExp" location="324:12-324:22"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/83"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="324:32-324:43" operationName="getType"> <source xsi:type="ocl:VariableExp" location="324:32-324:33" referredVariable="//@elements.18/@inPattern/@elements.0"/> @@ -1511,7 +1654,7 @@ <elseExpression xsi:type="ocl:OperationCallExp" location="325:12-325:57" operationName="get"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="325:12-325:38" name="dslElementsById"> <source xsi:type="ocl:VariableExp" location="325:12-325:22"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/84"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="325:43-325:56" operationName="getEnumId"> @@ -1525,7 +1668,7 @@ <inPattern location="312:2-318:4"> <elements xsi:type="atl:SimpleInPatternElement" location="313:3-313:18" varName="e" variableExp="//@elements.18/@inPattern/@filter/@condition/@source/@source //@elements.18/@inPattern/@filter/@thenExpression/@source/@source/@source //@elements.18/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.2/@value/@condition/@source/@source //@elements.18/@outPattern/@elements.0/@bindings.2/@value/@thenExpression/@arguments.0/@source //@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elseExpression/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="313:7-313:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/81"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="314:4-317:9"> @@ -1548,10 +1691,14 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="332:1-347:2" name="Enumeration"> + <commentsBefore>-- Rule 'Enumeration'.</commentsBefore> + <commentsBefore>-- This rule generates an Enumeration</commentsBefore> + <commentsAfter>-- Rule 'EnumerationLiteral'.</commentsAfter> + <commentsAfter>-- This rule generates an single element of an Enumeration</commentsAfter> <outPattern location="340:2-346:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="341:3-346:4" varName="r"> <type xsi:type="ocl:OclModelElement" location="341:7-341:22" name="Enumeration"> - <model href="temp#/0"/> + <model href="new-model#/86"/> </type> <bindings location="342:4-342:32" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="342:12-342:32" operationName="getAttrVal"> @@ -1583,7 +1730,7 @@ <inPattern location="333:2-339:4"> <elements xsi:type="atl:SimpleInPatternElement" location="334:3-334:18" varName="e" variableExp="//@elements.19/@inPattern/@filter/@condition/@source/@source //@elements.19/@inPattern/@filter/@thenExpression/@source/@source/@source //@elements.19/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="334:7-334:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/85"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="335:4-338:9"> @@ -1606,10 +1753,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="351:1-365:2" name="EnumerationLiteral"> + <commentsBefore>-- Rule 'EnumerationLiteral'.</commentsBefore> + <commentsBefore>-- This rule generates an single element of an Enumeration</commentsBefore> <outPattern location="359:2-364:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="360:3-364:4" varName="r"> <type xsi:type="ocl:OclModelElement" location="360:7-360:29" name="EnumerationLiteral"> - <model href="temp#/0"/> + <model href="new-model#/88"/> </type> <bindings location="361:4-361:32" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="361:12-361:32" operationName="getAttrVal"> @@ -1636,7 +1785,7 @@ <inPattern location="352:2-358:4"> <elements xsi:type="atl:SimpleInPatternElement" location="353:3-353:18" varName="e" variableExp="//@elements.20/@inPattern/@filter/@condition/@source/@source //@elements.20/@inPattern/@filter/@thenExpression/@source/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.2/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="353:7-353:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/87"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="354:4-357:9"> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/EMF2DSL/DSL2XML/DSL2XML.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/EMF2DSL/DSL2XML/DSL2XML.atl.xmi index d54335da..4abba68f 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/EMF2DSL/DSL2XML/DSL2XML.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/EMF2DSL/DSL2XML/DSL2XML.atl.xmi @@ -1,19 +1,30 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="4:1-1464:2" name="DSL2XML"> + <commentsBefore>-- Ecore to DSL</commentsBefore> + <commentsBefore>-- second transformation : DSL to XML</commentsBefore> <inModels location="5:23-5:31" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="5:8-5:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="14:1-15:41"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper converts boolean to string</commentsBefore> + <commentsBefore>-- CONTEXT: Boolean</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper get the containmentstyle of a Relationship</commentsAfter> + <commentsAfter>-- CONTEXT: DSL!Relationship</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="14:8-15:40"> <feature xsi:type="ocl:Operation" location="14:29-15:40" name="bool2string"> <returnType xsi:type="ocl:StringType" location="14:45-14:51"/> <body xsi:type="ocl:IfExp" location="15:2-15:40"> <thenExpression xsi:type="ocl:StringExp" location="15:15-15:21" stringSymbol="true"/> <condition xsi:type="ocl:VariableExp" location="15:5-15:9"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/2"/> </condition> <elseExpression xsi:type="ocl:StringExp" location="15:27-15:34" stringSymbol="false"/> </body> @@ -24,6 +35,13 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="20:1-21:62"> + <commentsBefore>-- This helper get the containmentstyle of a Relationship</commentsBefore> + <commentsBefore>-- CONTEXT: DSL!Relationship</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper stores an integer value used to assign an ID to each generated</commentsAfter> + <commentsAfter>-- Task.</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Integer</commentsAfter> <definition location="20:8-21:61"> <feature xsi:type="ocl:Operation" location="20:39-21:61" name="getContainment"> <returnType xsi:type="ocl:StringType" location="20:58-20:64"/> @@ -31,7 +49,7 @@ <thenExpression xsi:type="ocl:StringExp" location="21:27-21:38" stringSymbol="embedding"/> <condition xsi:type="ocl:NavigationOrAttributeCallExp" location="21:5-21:21" name="isEmbedding"> <source xsi:type="ocl:VariableExp" location="21:5-21:9"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/4"/> </source> </condition> <elseExpression xsi:type="ocl:StringExp" location="21:44-21:55" stringSymbol="reference"/> @@ -39,12 +57,22 @@ </feature> <context_ location="20:8-20:32"> <context_ xsi:type="ocl:OclModelElement" location="20:16-20:32" name="Relationship"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="27:1-27:33"> + <commentsBefore>-- This helper stores an integer value used to assign an ID to each generated</commentsBefore> + <commentsBefore>-- Task.</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Integer</commentsBefore> + <commentsAfter>-- This helper computes the value to be assigned to the ID field of a</commentsAfter> + <commentsAfter>-- generated Task. </commentsAfter> + <commentsAfter>-- It increments the value stored by the "curId" helper and returns its</commentsAfter> + <commentsAfter>-- new value as a String.</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="27:8-27:32"> <feature xsi:type="ocl:Attribute" location="27:13-27:32" name="curId"> <initExpression xsi:type="ocl:IntegerExp" location="27:31-27:32" integerSymbol="0"/> @@ -53,6 +81,15 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="35:1-42:20"> + <commentsBefore>-- This helper computes the value to be assigned to the ID field of a</commentsBefore> + <commentsBefore>-- generated Task. </commentsBefore> + <commentsBefore>-- It increments the value stored by the "curId" helper and returns its</commentsBefore> + <commentsBefore>-- new value as a String.</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper converts identity in id</commentsAfter> + <commentsAfter>-- CONTEXT: DSL!NamedElement</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="35:8-42:19"> <feature xsi:type="ocl:Operation" location="35:13-42:19" name="makeIdentity"> <returnType xsi:type="ocl:StringType" location="35:30-35:36"/> @@ -62,13 +99,13 @@ <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="36:20-36:79" name="curId"> <source xsi:type="ocl:OperationCallExp" location="36:20-36:73" operationName="refSetValue"> <source xsi:type="ocl:VariableExp" location="36:20-36:30"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/5"/> </source> <arguments xsi:type="ocl:StringExp" location="36:43-36:50" stringSymbol="curId"/> <arguments xsi:type="ocl:OperatorCallExp" location="36:52-36:72" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="36:52-36:68" name="curId"> <source xsi:type="ocl:VariableExp" location="36:52-36:62"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/6"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="36:71-36:72" integerSymbol="1"/> @@ -126,6 +163,12 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="47:1-51:35"> + <commentsBefore>-- This helper converts identity in id</commentsBefore> + <commentsBefore>-- CONTEXT: DSL!NamedElement</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper generates an new id</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="47:8-51:34"> <feature xsi:type="ocl:Operation" location="47:39-51:34" name="makeId"> <returnType xsi:type="ocl:StringType" location="47:50-47:56"/> @@ -134,7 +177,7 @@ <type xsi:type="ocl:StringType" location="48:11-48:17"/> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="48:20-48:33" name="identity"> <source xsi:type="ocl:VariableExp" location="48:20-48:24"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/8"/> </source> </initExpression> </variable> @@ -192,12 +235,18 @@ </feature> <context_ location="47:8-47:32"> <context_ xsi:type="ocl:OclModelElement" location="47:16-47:32" name="NamedElement"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="56:1-63:20"> + <commentsBefore>-- This helper generates an new id</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper searchs if a Class is pointed by another</commentsAfter> + <commentsAfter>-- CONTEXT: DSL!Class</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="56:8-63:19"> <feature xsi:type="ocl:Operation" location="56:14-63:19" name="makeId2"> <returnType xsi:type="ocl:StringType" location="56:26-56:32"/> @@ -207,13 +256,13 @@ <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="57:20-57:79" name="curId"> <source xsi:type="ocl:OperationCallExp" location="57:20-57:73" operationName="refSetValue"> <source xsi:type="ocl:VariableExp" location="57:20-57:30"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/9"/> </source> <arguments xsi:type="ocl:StringExp" location="57:43-57:50" stringSymbol="curId"/> <arguments xsi:type="ocl:OperatorCallExp" location="57:52-57:72" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="57:52-57:68" name="curId"> <source xsi:type="ocl:VariableExp" location="57:52-57:62"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/10"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="57:71-57:72" integerSymbol="1"/> @@ -271,13 +320,19 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="68:1-71:41"> + <commentsBefore>-- This helper searchs if a Class is pointed by another</commentsBefore> + <commentsBefore>-- CONTEXT: DSL!Class</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper searchs the Class which need to be marked as "root" in CompleteDiagram</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(DSL!Class)</commentsAfter> <definition location="68:8-71:40"> <feature xsi:type="ocl:Operation" location="68:32-71:40" name="isType"> <returnType xsi:type="ocl:BooleanType" location="68:42-68:49"/> <body xsi:type="ocl:IterateExp" location="69:1-71:40"> <source xsi:type="ocl:OperationCallExp" location="69:1-69:32" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="69:1-69:17" name="Relationship"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="71:3-71:39" operationName="or"> @@ -291,7 +346,7 @@ </source> </source> <arguments xsi:type="ocl:VariableExp" location="71:34-71:38"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/13"/> </arguments> </arguments> </body> @@ -304,25 +359,31 @@ </feature> <context_ location="68:8-68:25"> <context_ xsi:type="ocl:OclModelElement" location="68:16-68:25" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="76:1-92:8"> + <commentsBefore>-- This helper searchs the Class which need to be marked as "root" in CompleteDiagram</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(DSL!Class)</commentsBefore> + <commentsAfter>-- This helper stores a list of treated classes</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(KM3!Class)</commentsAfter> <definition location="76:8-92:7"> <feature xsi:type="ocl:Attribute" location="76:14-92:7" name="getRoots"> <initExpression xsi:type="ocl:LetExp" location="77:2-92:7"> <variable location="77:6-78:85" varName="r1" variableExp="//@elements.7/@definition/@feature/@initExpression/@in_/@condition/@source/@source //@elements.7/@definition/@feature/@initExpression/@in_/@thenExpression"> <type xsi:type="ocl:SequenceType" location="77:11-77:30"> <elementType xsi:type="ocl:OclModelElement" location="77:20-77:29" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="78:2-78:85" name="select"> <source xsi:type="ocl:OperationCallExp" location="78:2-78:26" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="78:2-78:11" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/16"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="78:37-78:84" operationName="and"> @@ -351,13 +412,13 @@ <variable location="81:12-82:67" varName="r2" variableExp="//@elements.7/@definition/@feature/@initExpression/@in_/@elseExpression/@in_/@condition/@source/@source //@elements.7/@definition/@feature/@initExpression/@in_/@elseExpression/@in_/@thenExpression"> <type xsi:type="ocl:SequenceType" location="81:17-81:36"> <elementType xsi:type="ocl:OclModelElement" location="81:26-81:35" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="82:3-82:67" name="select"> <source xsi:type="ocl:OperationCallExp" location="82:3-82:27" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="82:3-82:12" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="82:38-82:66" operationName="oclIsUndefined"> @@ -379,13 +440,13 @@ <variable location="85:13-86:54" varName="r3" variableExp="//@elements.7/@definition/@feature/@initExpression/@in_/@elseExpression/@in_/@elseExpression/@in_/@condition/@source/@source //@elements.7/@definition/@feature/@initExpression/@in_/@elseExpression/@in_/@elseExpression/@in_/@thenExpression"> <type xsi:type="ocl:SequenceType" location="85:18-85:37"> <elementType xsi:type="ocl:OclModelElement" location="85:27-85:36" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="86:4-86:54" name="select"> <source xsi:type="ocl:OperationCallExp" location="86:4-86:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="86:4-86:13" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="86:39-86:53" operationName="not"> @@ -406,7 +467,7 @@ <elseExpression xsi:type="ocl:CollectionOperationCallExp" location="89:10-89:43" operationName="first"> <source xsi:type="ocl:OperationCallExp" location="89:10-89:34" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="89:10-89:19" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </source> </source> </elseExpression> @@ -418,29 +479,59 @@ </initExpression> <type xsi:type="ocl:SequenceType" location="76:25-76:44"> <elementType xsi:type="ocl:OclModelElement" location="76:34-76:43" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="97:1-97:61"> + <commentsBefore>-- This helper stores a list of treated classes</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(KM3!Class)</commentsBefore> + <commentsAfter>-- This helper computes the definitionlevel of a treeExpression</commentsAfter> + <commentsAfter>-- if the class has ever been treated, its definitionlevel is "use"</commentsAfter> + <commentsAfter>-- elsewhere we put it into Acc, and the definitionlevel is "definition"</commentsAfter> + <commentsAfter>-- CONTEXT: context DSL!Class</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="97:8-97:60"> <feature xsi:type="ocl:Attribute" location="97:13-97:60" name="Acc"> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="97:41-97:60" name="getRoots"> <source xsi:type="ocl:VariableExp" location="97:41-97:51"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/23"/> </source> </initExpression> <type xsi:type="ocl:SequenceType" location="97:19-97:38"> <elementType xsi:type="ocl:OclModelElement" location="97:28-97:37" name="Class"> - <model href="temp#/10"/> + <model href="new-model#/22"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="104:1-110:8"> + <commentsBefore>-- This helper computes the definitionlevel of a treeExpression</commentsBefore> + <commentsBefore>-- if the class has ever been treated, its definitionlevel is "use"</commentsBefore> + <commentsBefore>-- elsewhere we put it into Acc, and the definitionlevel is "definition"</commentsBefore> + <commentsBefore>-- CONTEXT: context DSL!Class</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- Rule 'DMD'.</commentsAfter> + <commentsAfter>-- This rule generates the .dsldm file structure :</commentsAfter> + <commentsAfter>-- DMD</commentsAfter> + <commentsAfter>-- 	- Model</commentsAfter> + <commentsAfter>--		-	MdfMetaData</commentsAfter> + <commentsAfter>--		-	Extended</commentsAfter> + <commentsAfter>--		-	Enumerations</commentsAfter> + <commentsAfter>-- 		-	Relationships</commentsAfter> + <commentsAfter>--		-	Concepts</commentsAfter> + <commentsAfter>--		-	Trees</commentsAfter> + <commentsAfter>--				-	treeNavigator Intrinsic</commentsAfter> + <commentsAfter>--				-	treeNavigator CompleteDiagram</commentsAfter> + <commentsAfter>--				-	treeNavigator Serialization</commentsAfter> + <commentsAfter>--				-	treeNavigator Delete</commentsAfter> <definition location="104:8-110:7"> <feature xsi:type="ocl:Operation" location="104:32-110:7" name="definitionlevel"> <returnType xsi:type="ocl:StringType" location="104:50-104:56"/> @@ -449,33 +540,33 @@ <condition xsi:type="ocl:CollectionOperationCallExp" location="105:5-105:35" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="105:5-105:19" name="Acc"> <source xsi:type="ocl:VariableExp" location="105:5-105:15"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/25"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="105:30-105:34"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/26"/> </arguments> </condition> <elseExpression xsi:type="ocl:LetExp" location="108:4-109:19"> <variable location="108:8-108:93" varName="c"> <type xsi:type="ocl:OclModelElement" location="108:12-108:21" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/27"/> </type> <initExpression xsi:type="ocl:OperationCallExp" location="108:24-108:93" operationName="first"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="108:24-108:85" name="Acc"> <source xsi:type="ocl:OperationCallExp" location="108:24-108:81" operationName="refSetValue"> <source xsi:type="ocl:VariableExp" location="108:24-108:34"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/28"/> </source> <arguments xsi:type="ocl:StringExp" location="108:47-108:52" stringSymbol="Acc"/> <arguments xsi:type="ocl:OperationCallExp" location="108:53-108:80" operationName="append"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="108:53-108:67" name="Acc"> <source xsi:type="ocl:VariableExp" location="108:53-108:63"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/29"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="108:75-108:79"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/30"/> </arguments> </arguments> </source> @@ -488,21 +579,46 @@ </feature> <context_ location="104:8-104:25"> <context_ xsi:type="ocl:OclModelElement" location="104:16-104:25" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="131:1-362:2" name="DMD"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- Rule 'DMD'.</commentsBefore> + <commentsBefore>-- This rule generates the .dsldm file structure :</commentsBefore> + <commentsBefore>-- DMD</commentsBefore> + <commentsBefore>-- 	- Model</commentsBefore> + <commentsBefore>--		-	MdfMetaData</commentsBefore> + <commentsBefore>--		-	Extended</commentsBefore> + <commentsBefore>--		-	Enumerations</commentsBefore> + <commentsBefore>-- 		-	Relationships</commentsBefore> + <commentsBefore>--		-	Concepts</commentsBefore> + <commentsBefore>--		-	Trees</commentsBefore> + <commentsBefore>--				-	treeNavigator Intrinsic</commentsBefore> + <commentsBefore>--				-	treeNavigator CompleteDiagram</commentsBefore> + <commentsBefore>--				-	treeNavigator Serialization</commentsBefore> + <commentsBefore>--				-	treeNavigator Delete</commentsBefore> + <commentsAfter>-- Rule 'Concept'.</commentsAfter> + <commentsAfter>-- This rule generates the Concepts which are :</commentsAfter> + <commentsAfter>-- * not subtypes of any class</commentsAfter> + <commentsAfter>-- * not abstract</commentsAfter> <outPattern location="135:3-361:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="139:4-143:5" varName="r"> + <commentsBefore>--------------</commentsBefore> + <commentsBefore>-- Root DMD --</commentsBefore> + <commentsBefore>--------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="139:8-139:16" name="Root"> - <model href="temp#/0"/> + <model href="new-model#/32"/> </type> <bindings location="140:5-140:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="140:11-140:16" stringSymbol="dmd"/> </bindings> <bindings location="141:4-141:15" propertyName="value"> + <commentsBefore>--+thisModule.getRoots.toString(),</commentsBefore> <value xsi:type="ocl:StringExp" location="141:13-141:15" stringSymbol=""/> </bindings> <bindings location="142:4-142:43" propertyName="children"> @@ -516,7 +632,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="145:6-145:96" varName="xsi" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="145:12-145:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/33"/> </type> <bindings location="145:27-145:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="145:33-145:44" stringSymbol="xmlns:xsi"/> @@ -527,7 +643,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="146:3-146:84" varName="xsd" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="146:9-146:22" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/34"/> </type> <bindings location="146:24-146:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="146:30-146:41" stringSymbol="xmlns:xsd"/> @@ -538,7 +654,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="147:3-147:79" varName="xmlns" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="147:11-147:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/35"/> </type> <bindings location="147:26-147:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="147:32-147:39" stringSymbol="xmlns"/> @@ -548,8 +664,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="152:3-162:5" varName="model" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> + <commentsBefore>-----------</commentsBefore> + <commentsBefore>-- Model --</commentsBefore> + <commentsBefore>-----------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="152:11-152:22" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/36"/> </type> <bindings location="153:5-153:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="153:11-153:18" stringSymbol="model"/> @@ -575,7 +694,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="163:3-163:52" varName="name" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="163:10-163:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/37"/> </type> <bindings location="163:25-163:37" propertyName="name"> <value xsi:type="ocl:StringExp" location="163:31-163:37" stringSymbol="name"/> @@ -588,7 +707,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="164:3-164:63" varName="identity" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="164:13-164:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/38"/> </type> <bindings location="164:28-164:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="164:34-164:44" stringSymbol="identity"/> @@ -601,7 +720,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="165:3-165:51" varName="id" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="165:7-165:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/39"/> </type> <bindings location="165:22-165:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="165:28-165:32" stringSymbol="id"/> @@ -614,7 +733,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="166:3-166:66" varName="namespace" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="166:14-166:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/40"/> </type> <bindings location="166:29-166:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="166:35-166:46" stringSymbol="namespace"/> @@ -627,7 +746,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="167:3-167:77" varName="isLoaded" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="167:13-167:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/41"/> </type> <bindings location="167:28-167:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="167:34-167:44" stringSymbol="isLoaded"/> @@ -641,8 +760,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="172:3-181:4" varName="mdfmetadata" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.5"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="172:16-172:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/42"/> </type> <bindings location="173:4-173:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="173:10-173:23" stringSymbol="mdfmetadata"/> @@ -670,7 +792,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="182:3-182:69" varName="xsitype" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="182:11-182:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/43"/> </type> <bindings location="182:26-182:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="182:32-182:42" stringSymbol="xsi:type"/> @@ -681,7 +803,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="183:3-183:72" varName="accessmodifier" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="183:18-183:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/44"/> </type> <bindings location="183:33-183:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="183:39-183:55" stringSymbol="accessmodifier"/> @@ -692,7 +814,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="184:3-184:59" varName="category" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="184:14-184:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/45"/> </type> <bindings location="184:28-184:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="184:36-184:46" stringSymbol="category"/> @@ -703,7 +825,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="185:3-185:65" varName="description" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="185:17-185:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/46"/> </type> <bindings location="185:31-185:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="185:39-185:52" stringSymbol="description"/> @@ -714,7 +836,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="186:3-186:63" varName="doccomment" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="186:16-186:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/47"/> </type> <bindings location="186:30-186:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="186:38-186:50" stringSymbol="doccomment"/> @@ -725,7 +847,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="187:3-187:59" varName="localize" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="187:12-187:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/48"/> </type> <bindings location="187:27-187:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="187:33-187:43" stringSymbol="localize"/> @@ -736,7 +858,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="188:3-188:63" varName="majorversion" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="188:16-188:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/49"/> </type> <bindings location="188:31-188:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="188:37-188:51" stringSymbol="majorversion"/> @@ -747,7 +869,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="189:3-189:63" varName="minorversion" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="189:16-189:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/50"/> </type> <bindings location="189:31-189:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="189:37-189:51" stringSymbol="minorversion"/> @@ -758,7 +880,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="190:3-190:91" varName="alwaysgeneratecollection" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.8"> <type xsi:type="ocl:OclModelElement" location="190:28-190:41" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/51"/> </type> <bindings location="190:43-190:75" propertyName="name"> <value xsi:type="ocl:StringExp" location="190:49-190:75" stringSymbol="alwaysgeneratecollection"/> @@ -769,7 +891,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="191:3-191:59" varName="copyright" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.9"> <type xsi:type="ocl:OclModelElement" location="191:15-191:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/52"/> </type> <bindings location="191:27-191:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="191:35-191:46" stringSymbol="copyright"/> @@ -780,7 +902,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="193:3-193:107" varName="stringtable" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.10"> <type xsi:type="ocl:OclModelElement" location="193:17-193:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/53"/> </type> <bindings location="193:29-193:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="193:37-193:50" stringSymbol="stringtable"/> @@ -798,7 +920,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="194:4-194:82" varName="resxfile" variableExp="//@elements.10/@outPattern/@elements.21/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="194:15-194:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/54"/> </type> <bindings location="194:30-194:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="194:38-194:48" stringSymbol="resxfile"/> @@ -814,7 +936,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="195:4-195:98" varName="ressfile" variableExp="//@elements.10/@outPattern/@elements.21/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="195:15-195:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/55"/> </type> <bindings location="195:30-195:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="195:38-195:53" stringSymbol="resourcesfile"/> @@ -838,7 +960,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="196:4-196:74" varName="use" variableExp="//@elements.10/@outPattern/@elements.21/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="196:10-196:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/56"/> </type> <bindings location="196:25-196:56" propertyName="name"> <value xsi:type="ocl:StringExp" location="196:33-196:56" stringSymbol="usefullyqualifiedname"/> @@ -849,7 +971,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="198:3-199:73" varName="copyclosure" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.11"> <type xsi:type="ocl:OclModelElement" location="198:17-198:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/57"/> </type> <bindings location="199:4-199:25" propertyName="name"> <value xsi:type="ocl:StringExp" location="199:12-199:25" stringSymbol="copyclosure"/> @@ -866,7 +988,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="200:4-200:73" varName="cpname" variableExp="//@elements.10/@outPattern/@elements.25/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="200:13-200:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/58"/> </type> <bindings location="200:28-200:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="200:36-200:42" stringSymbol="name"/> @@ -882,7 +1004,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="201:4-201:87" varName="cpdoc" variableExp="//@elements.10/@outPattern/@elements.25/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="201:12-201:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/59"/> </type> <bindings location="201:27-201:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="201:35-201:47" stringSymbol="doccomment"/> @@ -893,7 +1015,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="203:3-203:102" varName="removeclosure" variableExp="//@elements.10/@outPattern/@elements.10/@bindings.2/@value/@elements.12"> <type xsi:type="ocl:OclModelElement" location="203:19-203:30" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/60"/> </type> <bindings location="203:31-203:54" propertyName="name"> <value xsi:type="ocl:StringExp" location="203:39-203:54" stringSymbol="removeclosure"/> @@ -910,7 +1032,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="204:4-204:75" varName="rmname" variableExp="//@elements.10/@outPattern/@elements.28/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="204:13-204:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/61"/> </type> <bindings location="204:28-204:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="204:36-204:42" stringSymbol="name"/> @@ -926,7 +1048,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="205:4-205:89" varName="rmdoc" variableExp="//@elements.10/@outPattern/@elements.28/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="205:12-205:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/62"/> </type> <bindings location="205:27-205:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="205:35-205:47" stringSymbol="doccomment"/> @@ -936,8 +1058,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="210:3-210:74" varName="extended" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.6"> + <commentsBefore>--------------</commentsBefore> + <commentsBefore>-- Extended --</commentsBefore> + <commentsBefore>--------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="210:13-210:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/63"/> </type> <bindings location="210:26-210:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="210:32-210:42" stringSymbol="extended"/> @@ -951,7 +1076,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="211:3-211:76" varName="extmod" variableExp="//@elements.10/@outPattern/@elements.31/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="211:12-211:23" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/64"/> </type> <bindings location="211:25-211:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="211:33-211:40" stringSymbol="model"/> @@ -965,7 +1090,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="212:3-212:91" varName="extmodText" variableExp="//@elements.10/@outPattern/@elements.32/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="212:16-212:24" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/65"/> </type> <bindings location="212:26-212:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="212:34-212:41" stringSymbol="#text"/> @@ -975,8 +1100,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="217:3-221:4" varName="enumerations" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.7"> + <commentsBefore>------------------</commentsBefore> + <commentsBefore>-- Enumerations --</commentsBefore> + <commentsBefore>------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="217:18-217:29" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/66"/> </type> <bindings location="218:4-218:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="218:10-218:24" stringSymbol="enumerations"/> @@ -992,7 +1120,7 @@ <body xsi:type="ocl:OperationCallExp" location="220:32-220:62" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="220:32-220:33" referredVariable="//@elements.10/@outPattern/@elements.34/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="220:46-220:61" name="Enumeration"> - <model href="temp#/1"/> + <model href="new-model#/67"/> </arguments> </body> <iterators location="220:30-220:31" varName="c" variableExp="//@elements.10/@outPattern/@elements.34/@bindings.2/@value/@body/@source"/> @@ -1000,8 +1128,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="226:3-230:4" varName="relationships" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.8"> + <commentsBefore>-------------------</commentsBefore> + <commentsBefore>-- Relationships --</commentsBefore> + <commentsBefore>-------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="226:19-226:30" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/68"/> </type> <bindings location="227:4-227:25" propertyName="name"> <value xsi:type="ocl:StringExp" location="227:10-227:25" stringSymbol="relationships"/> @@ -1017,7 +1148,7 @@ <body xsi:type="ocl:OperationCallExp" location="229:38-229:69" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="229:38-229:39" referredVariable="//@elements.10/@outPattern/@elements.35/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="229:52-229:68" name="Relationship"> - <model href="temp#/1"/> + <model href="new-model#/69"/> </arguments> </body> <iterators location="229:36-229:37" varName="c" variableExp="//@elements.10/@outPattern/@elements.35/@bindings.2/@value/@body/@source"/> @@ -1025,8 +1156,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="235:3-239:4" varName="concepts" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.10"> + <commentsBefore>--------------	</commentsBefore> + <commentsBefore>-- Concepts --</commentsBefore> + <commentsBefore>--------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="235:14-235:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/70"/> </type> <bindings location="236:4-236:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="236:10-236:20" stringSymbol="concepts"/> @@ -1042,7 +1176,7 @@ <body xsi:type="ocl:OperationCallExp" location="238:38-238:62" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="238:38-238:39" referredVariable="//@elements.10/@outPattern/@elements.36/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="238:52-238:61" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/71"/> </arguments> </body> <iterators location="238:36-238:37" varName="c" variableExp="//@elements.10/@outPattern/@elements.36/@bindings.2/@value/@body/@source"/> @@ -1050,8 +1184,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="244:3-251:4" varName="trees" variableExp="//@elements.10/@outPattern/@elements.4/@bindings.2/@value/@elements.9"> + <commentsBefore>-----------</commentsBefore> + <commentsBefore>-- Trees --</commentsBefore> + <commentsBefore>-----------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="244:11-244:22" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/72"/> </type> <bindings location="245:4-245:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="245:12-245:19" stringSymbol="trees"/> @@ -1069,8 +1206,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="256:3-263:4" varName="treeNavIntr" variableExp="//@elements.10/@outPattern/@elements.37/@bindings.2/@value/@elements.0"> + <commentsBefore>-----------------------------</commentsBefore> + <commentsBefore>-- treeNavigator Intrinsic --</commentsBefore> + <commentsBefore>-----------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="256:17-256:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/73"/> </type> <bindings location="257:4-257:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="257:12-257:27" stringSymbol="treenavigator"/> @@ -1090,7 +1230,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="264:3-264:70" varName="treeNavIntrna" variableExp="//@elements.10/@outPattern/@elements.38/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="264:19-264:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/74"/> </type> <bindings location="264:34-264:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="264:42-264:48" stringSymbol="name"/> @@ -1101,7 +1241,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="265:3-265:77" varName="treeNavIntrId" variableExp="//@elements.10/@outPattern/@elements.38/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="265:19-265:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/75"/> </type> <bindings location="265:34-265:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="265:42-265:46" stringSymbol="id"/> @@ -1109,14 +1249,14 @@ <bindings location="265:47-265:76" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="265:56-265:76" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="265:56-265:66"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/76"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="266:3-266:94" varName="treeNavIntrIdentity" variableExp="//@elements.10/@outPattern/@elements.38/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="266:25-266:38" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/77"/> </type> <bindings location="266:40-266:58" propertyName="name"> <value xsi:type="ocl:StringExp" location="266:48-266:58" stringSymbol="identity"/> @@ -1124,14 +1264,14 @@ <bindings location="266:59-266:93" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="266:68-266:93" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="266:68-266:78"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/78"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="267:3-267:56" varName="exp" variableExp="//@elements.10/@outPattern/@elements.38/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="267:9-267:20" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/79"/> </type> <bindings location="267:22-267:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="267:30-267:43" stringSymbol="expressions"/> @@ -1142,7 +1282,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="268:3-268:54" varName="IntrRoot" variableExp="//@elements.10/@outPattern/@elements.38/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="268:14-268:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/80"/> </type> <bindings location="268:26-268:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="268:34-268:41" stringSymbol="roots"/> @@ -1152,8 +1292,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="273:3-281:4" varName="treeNavDiagram" variableExp="//@elements.10/@outPattern/@elements.37/@bindings.2/@value/@elements.1"> + <commentsBefore>-----------------------------------</commentsBefore> + <commentsBefore>-- treeNavigator CompleteDiagram --</commentsBefore> + <commentsBefore>-----------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="273:20-273:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/81"/> </type> <bindings location="274:4-274:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="274:12-274:27" stringSymbol="treenavigator"/> @@ -1175,7 +1318,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="282:3-282:86" varName="treeNavDiagType" variableExp="//@elements.10/@outPattern/@elements.44/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="282:21-282:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/82"/> </type> <bindings location="282:36-282:54" propertyName="name"> <value xsi:type="ocl:StringExp" location="282:44-282:54" stringSymbol="xsi:type"/> @@ -1186,7 +1329,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="283:3-283:76" varName="treeNavDiagna" variableExp="//@elements.10/@outPattern/@elements.44/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="283:19-283:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/83"/> </type> <bindings location="283:34-283:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="283:42-283:48" stringSymbol="name"/> @@ -1197,7 +1340,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="284:3-284:77" varName="treeNavDiagId" variableExp="//@elements.10/@outPattern/@elements.44/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="284:19-284:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/84"/> </type> <bindings location="284:34-284:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="284:42-284:46" stringSymbol="id"/> @@ -1205,14 +1348,14 @@ <bindings location="284:47-284:76" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="284:56-284:76" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="284:56-284:66"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/85"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="285:3-285:94" varName="treeNavDiagIdentity" variableExp="//@elements.10/@outPattern/@elements.44/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="285:25-285:38" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/86"/> </type> <bindings location="285:40-285:58" propertyName="name"> <value xsi:type="ocl:StringExp" location="285:48-285:58" stringSymbol="identity"/> @@ -1220,14 +1363,14 @@ <bindings location="285:59-285:93" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="285:68-285:93" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="285:68-285:78"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/87"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="286:3-286:60" varName="Diagexp" variableExp="//@elements.10/@outPattern/@elements.44/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="286:13-286:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/88"/> </type> <bindings location="286:26-286:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="286:34-286:47" stringSymbol="expressions"/> @@ -1238,7 +1381,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="287:3-287:56" varName="DiagRoots" variableExp="//@elements.10/@outPattern/@elements.44/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="287:15-287:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/89"/> </type> <bindings location="287:28-287:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="287:36-287:43" stringSymbol="roots"/> @@ -1249,7 +1392,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="288:3-288:85" varName="DiagSource" variableExp="//@elements.10/@outPattern/@elements.44/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="288:16-288:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/90"/> </type> <bindings location="288:29-288:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="288:37-288:45" stringSymbol="source"/> @@ -1263,7 +1406,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="289:3-292:4" varName="DiagSourceText" variableExp="//@elements.10/@outPattern/@elements.51/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="289:20-289:28" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/91"/> </type> <bindings location="290:4-290:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="290:12-290:19" stringSymbol="#text"/> @@ -1272,7 +1415,7 @@ <value xsi:type="ocl:NavigationOrAttributeCallExp" location="291:13-291:60" name="value"> <source xsi:type="ocl:OperationCallExp" location="291:13-291:54" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="291:13-291:23"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/92"/> </source> <arguments xsi:type="ocl:VariableExp" location="291:36-291:37" referredVariable="//@elements.10/@inPattern/@elements.0"/> <arguments xsi:type="ocl:StringExp" location="291:38-291:53" stringSymbol="treeNavIntrId"/> @@ -1281,8 +1424,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="297:3-305:4" varName="treeNavSeria" variableExp="//@elements.10/@outPattern/@elements.37/@bindings.2/@value/@elements.2"> + <commentsBefore>---------------------------------</commentsBefore> + <commentsBefore>-- treeNavigator Serialization --</commentsBefore> + <commentsBefore>---------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="297:18-297:29" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/93"/> </type> <bindings location="298:4-298:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="298:12-298:27" stringSymbol="treenavigator"/> @@ -1304,7 +1450,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="306:3-306:87" varName="treeNavSeriaType" variableExp="//@elements.10/@outPattern/@elements.53/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="306:22-306:35" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/94"/> </type> <bindings location="306:37-306:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="306:45-306:55" stringSymbol="xsi:type"/> @@ -1315,7 +1461,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="307:3-307:75" varName="treeNavSeriana" variableExp="//@elements.10/@outPattern/@elements.53/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="307:20-307:33" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/95"/> </type> <bindings location="307:35-307:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="307:43-307:49" stringSymbol="name"/> @@ -1326,7 +1472,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="308:3-308:78" varName="treeNavSeriaId" variableExp="//@elements.10/@outPattern/@elements.53/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="308:20-308:33" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/96"/> </type> <bindings location="308:35-308:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="308:43-308:47" stringSymbol="id"/> @@ -1334,14 +1480,14 @@ <bindings location="308:48-308:77" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="308:57-308:77" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="308:57-308:67"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/97"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="309:3-309:95" varName="treeNavSeriaIdentity" variableExp="//@elements.10/@outPattern/@elements.53/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="309:26-309:39" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/98"/> </type> <bindings location="309:41-309:59" propertyName="name"> <value xsi:type="ocl:StringExp" location="309:49-309:59" stringSymbol="identity"/> @@ -1349,14 +1495,14 @@ <bindings location="309:60-309:94" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="309:69-309:94" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="309:69-309:79"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/99"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="310:3-310:61" varName="Seriaexp" variableExp="//@elements.10/@outPattern/@elements.53/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="310:14-310:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/100"/> </type> <bindings location="310:27-310:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="310:35-310:48" stringSymbol="expressions"/> @@ -1367,7 +1513,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="311:3-311:79" varName="SeriaRoots" variableExp="//@elements.10/@outPattern/@elements.53/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="311:16-311:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/101"/> </type> <bindings location="311:29-311:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="311:37-311:44" stringSymbol="roots"/> @@ -1381,7 +1527,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="313:3-320:4" varName="SeriaRoot" variableExp="//@elements.10/@outPattern/@elements.59/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="313:15-313:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/102"/> </type> <bindings location="314:4-314:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="314:12-314:18" stringSymbol="root"/> @@ -1401,7 +1547,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="321:3-324:4" varName="SeriaRootname" variableExp="//@elements.10/@outPattern/@elements.60/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="321:19-321:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/103"/> </type> <bindings location="322:4-322:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="322:12-322:18" stringSymbol="name"/> @@ -1411,7 +1557,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="323:13-323:41" operationName="first"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="323:13-323:32" name="getRoots"> <source xsi:type="ocl:VariableExp" location="323:13-323:23"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/104"/> </source> </source> </source> @@ -1420,7 +1566,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="325:3-325:92" varName="SeriaRootidentity" variableExp="//@elements.10/@outPattern/@elements.60/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="325:23-325:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/105"/> </type> <bindings location="325:38-325:56" propertyName="name"> <value xsi:type="ocl:StringExp" location="325:46-325:56" stringSymbol="identity"/> @@ -1428,14 +1574,14 @@ <bindings location="325:57-325:91" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="325:66-325:91" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="325:66-325:76"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/106"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="326:3-326:75" varName="SeriaRootid" variableExp="//@elements.10/@outPattern/@elements.60/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="326:17-326:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/107"/> </type> <bindings location="326:32-326:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="326:40-326:44" stringSymbol="id"/> @@ -1443,14 +1589,14 @@ <bindings location="326:45-326:74" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="326:54-326:74" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="326:54-326:64"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/108"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="327:3-327:63" varName="SeriaRootSource" variableExp="//@elements.10/@outPattern/@elements.60/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="327:21-327:32" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/109"/> </type> <bindings location="327:34-327:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="327:42-327:50" stringSymbol="source"/> @@ -1461,7 +1607,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="328:3-328:116" varName="SeriaRootReferenceType" variableExp="//@elements.10/@outPattern/@elements.60/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="328:28-328:39" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/110"/> </type> <bindings location="328:41-328:64" propertyName="name"> <value xsi:type="ocl:StringExp" location="328:49-328:64" stringSymbol="referencetype"/> @@ -1475,7 +1621,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="329:3-332:4" varName="SeriaRootReferenceTypeText" variableExp="//@elements.10/@outPattern/@elements.65/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="329:32-329:40" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/111"/> </type> <bindings location="330:4-330:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="330:12-330:19" stringSymbol="#text"/> @@ -1485,7 +1631,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="331:13-331:41" operationName="first"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="331:13-331:32" name="getRoots"> <source xsi:type="ocl:VariableExp" location="331:13-331:23"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/112"/> </source> </source> </source> @@ -1494,7 +1640,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="333:3-333:87" varName="SeriaSource" variableExp="//@elements.10/@outPattern/@elements.53/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="333:17-333:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/113"/> </type> <bindings location="333:30-333:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="333:38-333:46" stringSymbol="source"/> @@ -1508,7 +1654,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="334:3-337:4" varName="SeriaSourceText" variableExp="//@elements.10/@outPattern/@elements.67/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="334:21-334:29" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/114"/> </type> <bindings location="335:4-335:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="335:12-335:19" stringSymbol="#text"/> @@ -1517,7 +1663,7 @@ <value xsi:type="ocl:NavigationOrAttributeCallExp" location="336:13-336:60" name="value"> <source xsi:type="ocl:OperationCallExp" location="336:13-336:54" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="336:13-336:23"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/115"/> </source> <arguments xsi:type="ocl:VariableExp" location="336:36-336:37" referredVariable="//@elements.10/@inPattern/@elements.0"/> <arguments xsi:type="ocl:StringExp" location="336:38-336:53" stringSymbol="treeNavIntrId"/> @@ -1526,8 +1672,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="342:3-350:4" varName="treeNavDel" variableExp="//@elements.10/@outPattern/@elements.37/@bindings.2/@value/@elements.3"> + <commentsBefore>--------------------------</commentsBefore> + <commentsBefore>-- treeNavigator Delete --</commentsBefore> + <commentsBefore>--------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="342:16-342:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/116"/> </type> <bindings location="343:4-343:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="343:12-343:27" stringSymbol="treenavigator"/> @@ -1549,7 +1698,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="351:3-351:85" varName="treeNavDelType" variableExp="//@elements.10/@outPattern/@elements.69/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="351:20-351:33" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/117"/> </type> <bindings location="351:35-351:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="351:43-351:53" stringSymbol="xsi:type"/> @@ -1560,7 +1709,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="352:3-352:66" varName="treeNavDelna" variableExp="//@elements.10/@outPattern/@elements.69/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="352:18-352:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/118"/> </type> <bindings location="352:33-352:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="352:41-352:47" stringSymbol="name"/> @@ -1571,7 +1720,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="353:3-353:76" varName="treeNavDelId" variableExp="//@elements.10/@outPattern/@elements.69/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="353:18-353:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/119"/> </type> <bindings location="353:33-353:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="353:41-353:45" stringSymbol="id"/> @@ -1579,14 +1728,14 @@ <bindings location="353:46-353:75" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="353:55-353:75" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="353:55-353:65"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/120"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="354:3-354:93" varName="treeNavDelIdentity" variableExp="//@elements.10/@outPattern/@elements.69/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="354:24-354:37" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/121"/> </type> <bindings location="354:39-354:57" propertyName="name"> <value xsi:type="ocl:StringExp" location="354:47-354:57" stringSymbol="identity"/> @@ -1594,14 +1743,14 @@ <bindings location="354:58-354:92" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="354:67-354:92" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="354:67-354:77"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/122"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="355:3-355:59" varName="Delexp" variableExp="//@elements.10/@outPattern/@elements.69/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="355:12-355:23" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/123"/> </type> <bindings location="355:25-355:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="355:33-355:46" stringSymbol="expressions"/> @@ -1612,7 +1761,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="356:3-356:55" varName="DelRoots" variableExp="//@elements.10/@outPattern/@elements.69/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="356:14-356:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/124"/> </type> <bindings location="356:27-356:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="356:35-356:42" stringSymbol="roots"/> @@ -1623,7 +1772,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="357:3-357:83" varName="DelSource" variableExp="//@elements.10/@outPattern/@elements.69/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="357:15-357:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/125"/> </type> <bindings location="357:28-357:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="357:36-357:44" stringSymbol="source"/> @@ -1637,7 +1786,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="358:3-361:4" varName="DelSourceText" variableExp="//@elements.10/@outPattern/@elements.76/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="358:19-358:27" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/126"/> </type> <bindings location="359:4-359:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="359:12-359:19" stringSymbol="#text"/> @@ -1646,7 +1795,7 @@ <value xsi:type="ocl:NavigationOrAttributeCallExp" location="360:13-360:60" name="value"> <source xsi:type="ocl:OperationCallExp" location="360:13-360:54" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="360:13-360:23"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/127"/> </source> <arguments xsi:type="ocl:VariableExp" location="360:36-360:37" referredVariable="//@elements.10/@inPattern/@elements.0"/> <arguments xsi:type="ocl:StringExp" location="360:38-360:53" stringSymbol="treeNavIntrId"/> @@ -1658,16 +1807,28 @@ <inPattern location="133:3-134:23"> <elements xsi:type="atl:SimpleInPatternElement" location="134:4-134:23" varName="d" variableExp="//@elements.10/@outPattern/@elements.5/@bindings.1/@value/@source //@elements.10/@outPattern/@elements.6/@bindings.1/@value/@source //@elements.10/@outPattern/@elements.7/@bindings.1/@value/@source //@elements.10/@outPattern/@elements.8/@bindings.1/@value/@source //@elements.10/@outPattern/@elements.9/@bindings.1/@value/@source/@source //@elements.10/@outPattern/@elements.22/@bindings.1/@value/@source/@source //@elements.10/@outPattern/@elements.23/@bindings.1/@value/@source/@source/@source/@source //@elements.10/@outPattern/@elements.23/@bindings.1/@value/@source/@arguments.0/@source //@elements.10/@outPattern/@elements.26/@bindings.1/@value/@source/@source //@elements.10/@outPattern/@elements.29/@bindings.1/@value/@source/@source //@elements.10/@outPattern/@elements.34/@bindings.2/@value/@source/@source //@elements.10/@outPattern/@elements.35/@bindings.2/@value/@source/@source //@elements.10/@outPattern/@elements.36/@bindings.2/@value/@source/@source //@elements.10/@outPattern/@elements.52/@bindings.1/@value/@source/@arguments.0 //@elements.10/@outPattern/@elements.68/@bindings.1/@value/@source/@arguments.0 //@elements.10/@outPattern/@elements.77/@bindings.1/@value/@source/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="134:8-134:23" name="DomainModel"> - <model href="temp#/1"/> + <model href="new-model#/31"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="368:1-419:2" name="Concept"> + <commentsBefore>-- Rule 'Concept'.</commentsBefore> + <commentsBefore>-- This rule generates the Concepts which are :</commentsBefore> + <commentsBefore>-- * not subtypes of any class</commentsBefore> + <commentsBefore>-- * not abstract</commentsBefore> + <commentsAfter>-- Rule 'ConceptRoot'.</commentsAfter> + <commentsAfter>-- This rule generates the Concepts which are:</commentsAfter> + <commentsAfter>-- * included into the roots list </commentsAfter> + <commentsAfter>-- * not subtypes of any class</commentsAfter> + <commentsAfter>-- * not abstract</commentsAfter> <outPattern location="372:2-418:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="376:3-384:4" varName="c"> + <commentsBefore>-------------</commentsBefore> + <commentsBefore>-- Concept --</commentsBefore> + <commentsBefore>-------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="376:5-376:16" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/130"/> </type> <bindings location="377:4-377:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="377:10-377:19" stringSymbol="concept"/> @@ -1690,7 +1851,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="385:3-385:49" varName="name" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="385:8-385:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/131"/> </type> <bindings location="385:22-385:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="385:28-385:34" stringSymbol="name"/> @@ -1703,7 +1864,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="386:3-386:63" varName="identity" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="386:13-386:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/132"/> </type> <bindings location="386:28-386:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="386:34-386:44" stringSymbol="identity"/> @@ -1716,7 +1877,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="387:3-387:51" varName="id" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="387:7-387:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/133"/> </type> <bindings location="387:22-387:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="387:28-387:32" stringSymbol="id"/> @@ -1729,7 +1890,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="388:3-388:66" varName="namespace" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="388:14-388:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/134"/> </type> <bindings location="388:29-388:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="388:35-388:46" stringSymbol="namespace"/> @@ -1742,7 +1903,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="390:3-390:77" varName="isLoaded" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="390:13-390:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/135"/> </type> <bindings location="390:28-390:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="390:34-390:44" stringSymbol="isLoaded"/> @@ -1757,7 +1918,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="391:3-391:64" varName="isAbstract" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="391:15-391:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/136"/> </type> <bindings location="391:30-391:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="391:36-391:48" stringSymbol="isAbstract"/> @@ -1767,8 +1928,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="396:3-403:4" varName="mdfmetadata" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="396:16-396:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/137"/> </type> <bindings location="397:4-397:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="397:10-397:23" stringSymbol="mdfmetadata"/> @@ -1789,7 +1953,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="404:3-404:78" varName="xsitype" variableExp="//@elements.11/@outPattern/@elements.7/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="404:11-404:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/138"/> </type> <bindings location="404:26-404:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="404:32-404:42" stringSymbol="xsi:type"/> @@ -1800,7 +1964,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="405:3-405:72" varName="accessmodifier" variableExp="//@elements.11/@outPattern/@elements.7/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="405:18-405:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/139"/> </type> <bindings location="405:33-405:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="405:39-405:55" stringSymbol="accessmodifier"/> @@ -1811,7 +1975,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="406:3-406:59" varName="category" variableExp="//@elements.11/@outPattern/@elements.7/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="406:14-406:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/140"/> </type> <bindings location="406:28-406:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="406:36-406:46" stringSymbol="category"/> @@ -1822,7 +1986,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="407:3-407:65" varName="description" variableExp="//@elements.11/@outPattern/@elements.7/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="407:17-407:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/141"/> </type> <bindings location="407:31-407:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="407:39-407:52" stringSymbol="description"/> @@ -1833,7 +1997,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="408:3-408:63" varName="doccomment" variableExp="//@elements.11/@outPattern/@elements.7/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="408:16-408:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/142"/> </type> <bindings location="408:30-408:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="408:38-408:50" stringSymbol="doccomment"/> @@ -1844,7 +2008,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="409:3-409:61" varName="localize" variableExp="//@elements.11/@outPattern/@elements.7/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="409:14-409:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/143"/> </type> <bindings location="409:29-409:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="409:35-409:45" stringSymbol="localize"/> @@ -1854,8 +2018,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="414:3-418:4" varName="valueProperties" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> + <commentsBefore>----------------</commentsBefore> + <commentsBefore>-- Properties --</commentsBefore> + <commentsBefore>----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="414:20-414:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/144"/> </type> <bindings location="415:4-415:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="415:10-415:27" stringSymbol="valueProperties"/> @@ -1875,7 +2042,7 @@ <inPattern location="369:2-371:47"> <elements xsi:type="atl:SimpleInPatternElement" location="370:3-370:14" varName="e" variableExp="//@elements.11/@inPattern/@filter/@source/@source/@source/@source //@elements.11/@inPattern/@filter/@source/@arguments.0/@source/@source //@elements.11/@inPattern/@filter/@arguments.0/@source/@arguments.0 //@elements.11/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.11/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.11/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.11/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.11/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.11/@outPattern/@elements.14/@bindings.2/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="370:5-370:14" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/128"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="370:16-371:46" operationName="and"> @@ -1895,7 +2062,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="371:13-371:45" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="371:13-371:32" name="getRoots"> <source xsi:type="ocl:VariableExp" location="371:13-371:23"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/129"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="371:43-371:44" referredVariable="//@elements.11/@inPattern/@elements.0"/> @@ -1905,10 +2072,23 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="426:1-510:2" name="ConceptRoot"> + <commentsBefore>-- Rule 'ConceptRoot'.</commentsBefore> + <commentsBefore>-- This rule generates the Concepts which are:</commentsBefore> + <commentsBefore>-- * included into the roots list </commentsBefore> + <commentsBefore>-- * not subtypes of any class</commentsBefore> + <commentsBefore>-- * not abstract</commentsBefore> + <commentsAfter>-- Rule 'ConceptRootisAbstract'.</commentsAfter> + <commentsAfter>-- This rule generates the Concepts which are :</commentsAfter> + <commentsAfter>-- * included into the roots list </commentsAfter> + <commentsAfter>-- * not subtypes of any classes</commentsAfter> + <commentsAfter>-- * abstract</commentsAfter> <outPattern location="430:2-509:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="434:3-442:4" varName="c"> + <commentsBefore>-------------</commentsBefore> + <commentsBefore>-- Concept --</commentsBefore> + <commentsBefore>-------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="434:5-434:16" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/147"/> </type> <bindings location="435:4-435:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="435:10-435:19" stringSymbol="concept"/> @@ -1931,7 +2111,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="443:3-443:49" varName="name" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="443:8-443:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/148"/> </type> <bindings location="443:22-443:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="443:28-443:34" stringSymbol="name"/> @@ -1944,7 +2124,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="444:3-444:63" varName="identity" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="444:13-444:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/149"/> </type> <bindings location="444:28-444:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="444:34-444:44" stringSymbol="identity"/> @@ -1957,7 +2137,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="445:3-445:51" varName="id" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="445:7-445:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/150"/> </type> <bindings location="445:22-445:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="445:28-445:32" stringSymbol="id"/> @@ -1970,7 +2150,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="446:3-446:66" varName="namespace" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="446:14-446:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/151"/> </type> <bindings location="446:29-446:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="446:35-446:46" stringSymbol="namespace"/> @@ -1983,7 +2163,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="448:3-448:77" varName="isLoaded" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="448:13-448:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/152"/> </type> <bindings location="448:28-448:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="448:34-448:44" stringSymbol="isLoaded"/> @@ -1998,7 +2178,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="449:3-449:64" varName="isAbstract" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="449:15-449:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/153"/> </type> <bindings location="449:30-449:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="449:36-449:48" stringSymbol="isAbstract"/> @@ -2008,8 +2188,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="454:3-461:4" varName="mdfmetadata" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="454:16-454:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/154"/> </type> <bindings location="455:4-455:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="455:10-455:23" stringSymbol="mdfmetadata"/> @@ -2030,7 +2213,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="462:3-462:78" varName="xsitype" variableExp="//@elements.12/@outPattern/@elements.7/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="462:11-462:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/155"/> </type> <bindings location="462:26-462:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="462:32-462:42" stringSymbol="xsi:type"/> @@ -2041,7 +2224,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="463:3-463:72" varName="accessmodifier" variableExp="//@elements.12/@outPattern/@elements.7/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="463:18-463:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/156"/> </type> <bindings location="463:33-463:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="463:39-463:55" stringSymbol="accessmodifier"/> @@ -2052,7 +2235,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="464:3-464:59" varName="category" variableExp="//@elements.12/@outPattern/@elements.7/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="464:14-464:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/157"/> </type> <bindings location="464:28-464:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="464:36-464:46" stringSymbol="category"/> @@ -2063,7 +2246,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="465:3-465:65" varName="description" variableExp="//@elements.12/@outPattern/@elements.7/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="465:17-465:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/158"/> </type> <bindings location="465:31-465:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="465:39-465:52" stringSymbol="description"/> @@ -2074,7 +2257,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="466:3-466:63" varName="doccomment" variableExp="//@elements.12/@outPattern/@elements.7/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="466:16-466:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/159"/> </type> <bindings location="466:30-466:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="466:38-466:50" stringSymbol="doccomment"/> @@ -2085,7 +2268,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="467:3-467:61" varName="localize" variableExp="//@elements.12/@outPattern/@elements.7/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="467:14-467:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/160"/> </type> <bindings location="467:29-467:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="467:35-467:45" stringSymbol="localize"/> @@ -2095,8 +2278,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="472:3-476:4" varName="valueProperties" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> + <commentsBefore>----------------</commentsBefore> + <commentsBefore>-- Properties --</commentsBefore> + <commentsBefore>----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="472:20-472:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/161"/> </type> <bindings location="473:4-473:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="473:10-473:27" stringSymbol="valueProperties"/> @@ -2114,7 +2300,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="477:3-485:4" varName="DiagRoot" variableExp="//@elements.12/@outPattern/@elements.16/@bindings.1/@value //@elements.12/@outPattern/@elements.17/@bindings.1/@value //@elements.12/@outPattern/@elements.18/@bindings.1/@value //@elements.12/@outPattern/@elements.19/@bindings.1/@value //@elements.12/@outPattern/@elements.20/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="477:14-477:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/162"/> </type> <bindings location="478:4-478:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="478:12-478:18" stringSymbol="root"/> @@ -2125,7 +2311,7 @@ <bindings location="480:4-480:61" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="480:12-480:61" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="480:12-480:22"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/163"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="480:35-480:48" name="domainModel"> <source xsi:type="ocl:VariableExp" location="480:35-480:36" referredVariable="//@elements.12/@inPattern/@elements.0"/> @@ -2145,7 +2331,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="486:3-489:20" varName="DiagRootname" variableExp="//@elements.12/@outPattern/@elements.15/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="486:18-486:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/164"/> </type> <bindings location="487:4-487:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="487:12-487:18" stringSymbol="name"/> @@ -2161,7 +2347,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="490:3-493:39" varName="DiagRootidentity" variableExp="//@elements.12/@outPattern/@elements.15/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="490:22-490:35" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/165"/> </type> <bindings location="491:4-491:22" propertyName="name"> <value xsi:type="ocl:StringExp" location="491:12-491:22" stringSymbol="identity"/> @@ -2172,14 +2358,14 @@ <bindings location="493:4-493:38" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="493:13-493:38" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="493:13-493:23"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/166"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="494:3-497:34" varName="DiagRootid" variableExp="//@elements.12/@outPattern/@elements.15/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="494:16-494:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/167"/> </type> <bindings location="495:4-495:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="495:12-495:16" stringSymbol="id"/> @@ -2190,14 +2376,14 @@ <bindings location="497:4-497:33" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="497:13-497:33" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="497:13-497:23"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/168"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="498:3-501:16" varName="DiagRootSource" variableExp="//@elements.12/@outPattern/@elements.15/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="498:20-498:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/169"/> </type> <bindings location="499:4-499:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="499:12-499:20" stringSymbol="source"/> @@ -2211,7 +2397,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="502:3-505:42" varName="DiagRootReferenceType" variableExp="//@elements.12/@outPattern/@elements.15/@bindings.3/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="502:27-502:38" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/170"/> </type> <bindings location="503:4-503:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="503:12-503:27" stringSymbol="referencetype"/> @@ -2228,7 +2414,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="506:3-509:4" varName="DiagRootReferenceTypeText" variableExp="//@elements.12/@outPattern/@elements.20/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="506:31-506:39" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/171"/> </type> <bindings location="507:4-507:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="507:12-507:19" stringSymbol="#text"/> @@ -2243,7 +2429,7 @@ <inPattern location="427:2-429:45"> <elements xsi:type="atl:SimpleInPatternElement" location="428:3-428:14" varName="e" variableExp="//@elements.12/@inPattern/@filter/@source/@source/@source/@source //@elements.12/@inPattern/@filter/@source/@arguments.0/@source/@source //@elements.12/@inPattern/@filter/@arguments.0/@arguments.0 //@elements.12/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.12/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.12/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.12/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.12/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.12/@outPattern/@elements.14/@bindings.2/@value/@source/@source //@elements.12/@outPattern/@elements.15/@bindings.2/@value/@arguments.0/@source //@elements.12/@outPattern/@elements.16/@bindings.2/@value/@source //@elements.12/@outPattern/@elements.21/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="428:5-428:14" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/145"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="428:16-429:44" operationName="and"> @@ -2262,7 +2448,7 @@ <arguments xsi:type="ocl:CollectionOperationCallExp" location="429:11-429:43" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="429:11-429:30" name="getRoots"> <source xsi:type="ocl:VariableExp" location="429:11-429:21"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/146"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="429:41-429:42" referredVariable="//@elements.12/@inPattern/@elements.0"/> @@ -2271,10 +2457,22 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="517:1-606:2" name="ConceptRootisAbstract"> + <commentsBefore>-- Rule 'ConceptRootisAbstract'.</commentsBefore> + <commentsBefore>-- This rule generates the Concepts which are :</commentsBefore> + <commentsBefore>-- * included into the roots list </commentsBefore> + <commentsBefore>-- * not subtypes of any classes</commentsBefore> + <commentsBefore>-- * abstract</commentsBefore> + <commentsAfter>-- Rule 'Concept'.</commentsAfter> + <commentsAfter>-- This rule generates the Concepts which are :</commentsAfter> + <commentsAfter>-- * subtypes of some classes</commentsAfter> + <commentsAfter>-- * not abstract</commentsAfter> <outPattern location="521:2-605:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="525:3-533:4" varName="c"> + <commentsBefore>-------------</commentsBefore> + <commentsBefore>-- Concept --</commentsBefore> + <commentsBefore>-------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="525:5-525:16" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/174"/> </type> <bindings location="526:4-526:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="526:10-526:19" stringSymbol="concept"/> @@ -2297,7 +2495,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="534:3-534:49" varName="name" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="534:8-534:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/175"/> </type> <bindings location="534:22-534:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="534:28-534:34" stringSymbol="name"/> @@ -2310,7 +2508,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="535:3-535:63" varName="identity" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="535:13-535:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/176"/> </type> <bindings location="535:28-535:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="535:34-535:44" stringSymbol="identity"/> @@ -2323,7 +2521,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="536:3-536:51" varName="id" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="536:7-536:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/177"/> </type> <bindings location="536:22-536:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="536:28-536:32" stringSymbol="id"/> @@ -2336,7 +2534,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="537:3-537:66" varName="namespace" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="537:14-537:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/178"/> </type> <bindings location="537:29-537:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="537:35-537:46" stringSymbol="namespace"/> @@ -2349,7 +2547,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="538:3-538:77" varName="isLoaded" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="538:13-538:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/179"/> </type> <bindings location="538:28-538:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="538:34-538:44" stringSymbol="isLoaded"/> @@ -2364,7 +2562,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="539:3-540:5" varName="isAbstract" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="539:15-539:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/180"/> </type> <bindings location="539:30-539:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="539:36-539:48" stringSymbol="isAbstract"/> @@ -2374,8 +2572,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="545:3-553:4" varName="mdfmetadata" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="545:16-545:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/181"/> </type> <bindings location="546:4-546:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="546:10-546:23" stringSymbol="mdfmetadata"/> @@ -2397,7 +2598,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="554:3-554:78" varName="xsitype" variableExp="//@elements.13/@outPattern/@elements.7/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="554:11-554:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/182"/> </type> <bindings location="554:26-554:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="554:32-554:42" stringSymbol="xsi:type"/> @@ -2408,7 +2609,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="555:3-555:72" varName="accessmodifier" variableExp="//@elements.13/@outPattern/@elements.7/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="555:18-555:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/183"/> </type> <bindings location="555:33-555:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="555:39-555:55" stringSymbol="accessmodifier"/> @@ -2419,7 +2620,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="556:3-556:59" varName="category" variableExp="//@elements.13/@outPattern/@elements.7/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="556:14-556:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/184"/> </type> <bindings location="556:28-556:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="556:36-556:46" stringSymbol="category"/> @@ -2430,7 +2631,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="557:3-557:65" varName="description" variableExp="//@elements.13/@outPattern/@elements.7/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="557:17-557:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/185"/> </type> <bindings location="557:31-557:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="557:39-557:52" stringSymbol="description"/> @@ -2441,7 +2642,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="558:3-558:63" varName="doccomment" variableExp="//@elements.13/@outPattern/@elements.7/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="558:16-558:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/186"/> </type> <bindings location="558:30-558:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="558:38-558:50" stringSymbol="doccomment"/> @@ -2452,7 +2653,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="559:3-559:61" varName="localize" variableExp="//@elements.13/@outPattern/@elements.7/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="559:14-559:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/187"/> </type> <bindings location="559:29-559:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="559:35-559:45" stringSymbol="localize"/> @@ -2463,7 +2664,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="560:3-562:61" varName="classmodifier" variableExp="//@elements.13/@outPattern/@elements.7/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="560:19-560:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/188"/> </type> <bindings location="561:4-561:25" propertyName="name"> <value xsi:type="ocl:StringExp" location="561:10-561:25" stringSymbol="classmodifier"/> @@ -2479,8 +2680,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="567:3-571:4" varName="valueProperties" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> + <commentsBefore>----------------</commentsBefore> + <commentsBefore>-- Properties --</commentsBefore> + <commentsBefore>----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="567:20-567:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/189"/> </type> <bindings location="568:4-568:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="568:10-568:27" stringSymbol="valueProperties"/> @@ -2498,7 +2702,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="573:3-581:4" varName="DiagRoot" variableExp="//@elements.13/@outPattern/@elements.17/@bindings.1/@value //@elements.13/@outPattern/@elements.18/@bindings.1/@value //@elements.13/@outPattern/@elements.19/@bindings.1/@value //@elements.13/@outPattern/@elements.20/@bindings.1/@value //@elements.13/@outPattern/@elements.21/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="573:14-573:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/190"/> </type> <bindings location="574:4-574:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="574:12-574:18" stringSymbol="root"/> @@ -2509,7 +2713,7 @@ <bindings location="576:4-576:61" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="576:12-576:61" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="576:12-576:22"> - <referredVariable href="temp#/38"/> + <referredVariable href="new-model#/191"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="576:35-576:48" name="domainModel"> <source xsi:type="ocl:VariableExp" location="576:35-576:36" referredVariable="//@elements.13/@inPattern/@elements.0"/> @@ -2529,7 +2733,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="582:3-585:20" varName="DiagRootname" variableExp="//@elements.13/@outPattern/@elements.16/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="582:18-582:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/192"/> </type> <bindings location="583:4-583:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="583:12-583:18" stringSymbol="name"/> @@ -2545,7 +2749,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="586:3-589:39" varName="DiagRootidentity" variableExp="//@elements.13/@outPattern/@elements.16/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="586:22-586:35" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/193"/> </type> <bindings location="587:4-587:22" propertyName="name"> <value xsi:type="ocl:StringExp" location="587:12-587:22" stringSymbol="identity"/> @@ -2556,14 +2760,14 @@ <bindings location="589:4-589:38" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="589:13-589:38" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="589:13-589:23"> - <referredVariable href="temp#/39"/> + <referredVariable href="new-model#/194"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="590:3-593:34" varName="DiagRootid" variableExp="//@elements.13/@outPattern/@elements.16/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="590:16-590:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/195"/> </type> <bindings location="591:4-591:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="591:12-591:16" stringSymbol="id"/> @@ -2574,14 +2778,14 @@ <bindings location="593:4-593:33" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="593:13-593:33" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="593:13-593:23"> - <referredVariable href="temp#/40"/> + <referredVariable href="new-model#/196"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="594:3-597:16" varName="DiagRootSource" variableExp="//@elements.13/@outPattern/@elements.16/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="594:20-594:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/197"/> </type> <bindings location="595:4-595:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="595:12-595:20" stringSymbol="source"/> @@ -2595,7 +2799,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="598:3-601:42" varName="DiagRootReferenceType" variableExp="//@elements.13/@outPattern/@elements.16/@bindings.3/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="598:27-598:38" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/198"/> </type> <bindings location="599:4-599:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="599:12-599:27" stringSymbol="referencetype"/> @@ -2612,7 +2816,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="602:3-605:4" varName="DiagRootReferenceTypeText" variableExp="//@elements.13/@outPattern/@elements.21/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="602:31-602:39" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/199"/> </type> <bindings location="603:4-603:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="603:12-603:19" stringSymbol="#text"/> @@ -2627,7 +2831,7 @@ <inPattern location="518:2-520:43"> <elements xsi:type="atl:SimpleInPatternElement" location="519:3-519:14" varName="e" variableExp="//@elements.13/@inPattern/@filter/@source/@source/@source/@source //@elements.13/@inPattern/@filter/@source/@arguments.0/@source //@elements.13/@inPattern/@filter/@arguments.0/@arguments.0 //@elements.13/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.13/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.13/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.13/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.13/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.13/@outPattern/@elements.14/@bindings.1/@value/@condition/@source //@elements.13/@outPattern/@elements.15/@bindings.2/@value/@source/@source //@elements.13/@outPattern/@elements.16/@bindings.2/@value/@arguments.0/@source //@elements.13/@outPattern/@elements.17/@bindings.2/@value/@source //@elements.13/@outPattern/@elements.22/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="519:5-519:14" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/172"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="519:16-520:42" operationName="and"> @@ -2644,7 +2848,7 @@ <arguments xsi:type="ocl:CollectionOperationCallExp" location="520:9-520:41" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="520:9-520:28" name="getRoots"> <source xsi:type="ocl:VariableExp" location="520:9-520:19"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/173"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="520:39-520:40" referredVariable="//@elements.13/@inPattern/@elements.0"/> @@ -2653,10 +2857,21 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="612:1-715:2" name="ConceptHasSuper"> + <commentsBefore>-- Rule 'Concept'.</commentsBefore> + <commentsBefore>-- This rule generates the Concepts which are :</commentsBefore> + <commentsBefore>-- * subtypes of some classes</commentsBefore> + <commentsBefore>-- * not abstract</commentsBefore> + <commentsAfter>-- Rule 'Concept'.</commentsAfter> + <commentsAfter>-- This rule generates the Concepts which are :</commentsAfter> + <commentsAfter>-- * not subtypes of any classes</commentsAfter> + <commentsAfter>-- * abstract</commentsAfter> <outPattern location="616:2-714:57"> <elements xsi:type="atl:SimpleOutPatternElement" location="620:3-628:4" varName="c"> + <commentsBefore>-------------</commentsBefore> + <commentsBefore>-- Concept --</commentsBefore> + <commentsBefore>-------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="620:5-620:16" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/202"/> </type> <bindings location="621:4-621:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="621:10-621:19" stringSymbol="concept"/> @@ -2680,7 +2895,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="630:3-630:49" varName="name" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="630:8-630:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/203"/> </type> <bindings location="630:22-630:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="630:28-630:34" stringSymbol="name"/> @@ -2693,7 +2908,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="631:3-631:63" varName="identity" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="631:13-631:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/204"/> </type> <bindings location="631:28-631:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="631:34-631:44" stringSymbol="identity"/> @@ -2706,7 +2921,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="632:3-632:66" varName="namespace" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="632:14-632:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/205"/> </type> <bindings location="632:29-632:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="632:35-632:46" stringSymbol="namespace"/> @@ -2719,7 +2934,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="633:3-633:51" varName="id" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="633:7-633:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/206"/> </type> <bindings location="633:22-633:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="633:28-633:32" stringSymbol="id"/> @@ -2732,7 +2947,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="634:3-634:77" varName="isLoaded" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="634:13-634:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/207"/> </type> <bindings location="634:28-634:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="634:34-634:44" stringSymbol="isLoaded"/> @@ -2747,7 +2962,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="635:3-635:64" varName="isAbstract" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="635:15-635:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/208"/> </type> <bindings location="635:30-635:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="635:36-635:48" stringSymbol="isAbstract"/> @@ -2757,8 +2972,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="640:3-647:4" varName="mdfmetadata" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="640:16-640:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/209"/> </type> <bindings location="641:4-641:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="641:10-641:23" stringSymbol="mdfmetadata"/> @@ -2779,7 +2997,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="649:3-649:78" varName="xsitype" variableExp="//@elements.14/@outPattern/@elements.7/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="649:11-649:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/210"/> </type> <bindings location="649:26-649:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="649:32-649:42" stringSymbol="xsi:type"/> @@ -2790,7 +3008,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="650:3-650:72" varName="accessmodifier" variableExp="//@elements.14/@outPattern/@elements.7/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="650:18-650:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/211"/> </type> <bindings location="650:33-650:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="650:39-650:55" stringSymbol="accessmodifier"/> @@ -2801,7 +3019,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="651:3-651:59" varName="category" variableExp="//@elements.14/@outPattern/@elements.7/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="651:14-651:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/212"/> </type> <bindings location="651:28-651:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="651:36-651:46" stringSymbol="category"/> @@ -2812,7 +3030,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="652:3-652:65" varName="description" variableExp="//@elements.14/@outPattern/@elements.7/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="652:17-652:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/213"/> </type> <bindings location="652:31-652:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="652:39-652:52" stringSymbol="description"/> @@ -2823,7 +3041,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="653:3-653:63" varName="doccomment" variableExp="//@elements.14/@outPattern/@elements.7/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="653:16-653:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/214"/> </type> <bindings location="653:30-653:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="653:38-653:50" stringSymbol="doccomment"/> @@ -2834,7 +3052,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="654:3-654:59" varName="localize" variableExp="//@elements.14/@outPattern/@elements.7/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="654:12-654:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/215"/> </type> <bindings location="654:27-654:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="654:33-654:43" stringSymbol="localize"/> @@ -2845,7 +3063,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="656:3-656:74" varName="superType" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="656:15-656:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/216"/> </type> <bindings location="656:28-656:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="656:36-656:47" stringSymbol="superType"/> @@ -2856,7 +3074,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="657:3-657:75" varName="superTypeText" variableExp="//@elements.14/@outPattern/@elements.14/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="657:19-657:27" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/217"/> </type> <bindings location="657:29-657:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="657:37-657:44" stringSymbol="#text"/> @@ -2870,8 +3088,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="662:3-666:4" varName="valueProperties" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.2/@value/@elements.8"> + <commentsBefore>----------------</commentsBefore> + <commentsBefore>-- Properties --</commentsBefore> + <commentsBefore>----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="662:20-662:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/218"/> </type> <bindings location="663:4-663:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="663:10-663:27" stringSymbol="valueProperties"/> @@ -2888,8 +3109,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="671:3-679:4" varName="treeHerite"> + <commentsBefore>---------------------------</commentsBefore> + <commentsBefore>-- inheritanceExpression --</commentsBefore> + <commentsBefore>--------------------------- </commentsBefore> <type xsi:type="ocl:OclModelElement" location="671:16-671:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/219"/> </type> <bindings location="672:4-672:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="672:12-672:28" stringSymbol="treeExpression"/> @@ -2900,7 +3124,7 @@ <bindings location="674:4-674:57" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="674:14-674:57" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="674:14-674:24"> - <referredVariable href="temp#/42"/> + <referredVariable href="new-model#/220"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="674:37-674:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="674:37-674:38" referredVariable="//@elements.14/@inPattern/@elements.0"/> @@ -2923,7 +3147,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="680:3-680:85" varName="treeHXsiType" variableExp="//@elements.14/@outPattern/@elements.17/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="680:18-680:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/221"/> </type> <bindings location="680:33-680:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="680:41-680:51" stringSymbol="xsi:type"/> @@ -2934,7 +3158,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="681:3-681:81" varName="treeHName" variableExp="//@elements.14/@outPattern/@elements.17/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="681:15-681:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/222"/> </type> <bindings location="681:29-681:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="681:37-681:43" stringSymbol="name"/> @@ -2957,7 +3181,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="682:3-682:87" varName="treeHIdentity" variableExp="//@elements.14/@outPattern/@elements.17/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="682:19-682:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/223"/> </type> <bindings location="682:33-682:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="682:41-682:51" stringSymbol="identity"/> @@ -2965,14 +3189,14 @@ <bindings location="682:52-682:86" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="682:61-682:86" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="682:61-682:71"> - <referredVariable href="temp#/43"/> + <referredVariable href="new-model#/224"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="683:3-683:70" varName="treeHId" variableExp="//@elements.14/@outPattern/@elements.17/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="683:13-683:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/225"/> </type> <bindings location="683:27-683:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="683:35-683:39" stringSymbol="id"/> @@ -2980,14 +3204,14 @@ <bindings location="683:40-683:69" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="683:49-683:69" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="683:49-683:59"> - <referredVariable href="temp#/44"/> + <referredVariable href="new-model#/226"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="684:3-684:70" varName="treeHDef" variableExp="//@elements.14/@outPattern/@elements.17/@bindings.3/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="684:14-684:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/227"/> </type> <bindings location="684:28-684:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="684:36-684:53" stringSymbol="definitionlevel"/> @@ -2998,7 +3222,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="685:3-685:54" varName="source" variableExp="//@elements.14/@outPattern/@elements.17/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="685:12-685:23" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/228"/> </type> <bindings location="685:25-685:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="685:33-685:41" stringSymbol="source"/> @@ -3009,7 +3233,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="686:3-686:81" varName="superELT" variableExp="//@elements.14/@outPattern/@elements.17/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="686:14-686:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/229"/> </type> <bindings location="686:27-686:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="686:35-686:46" stringSymbol="superType"/> @@ -3023,7 +3247,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="687:3-687:68" varName="superText" variableExp="//@elements.14/@outPattern/@elements.24/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="687:15-687:23" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/230"/> </type> <bindings location="687:24-687:37" propertyName="name"> <value xsi:type="ocl:StringExp" location="687:30-687:37" stringSymbol="#text"/> @@ -3038,7 +3262,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="688:3-688:72" varName="sub" variableExp="//@elements.14/@outPattern/@elements.17/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="688:9-688:20" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/231"/> </type> <bindings location="688:22-688:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="688:30-688:39" stringSymbol="subType"/> @@ -3052,7 +3276,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="689:3-689:55" varName="subText" variableExp="//@elements.14/@outPattern/@elements.26/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="689:13-689:21" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/232"/> </type> <bindings location="689:23-689:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="689:29-689:36" stringSymbol="#text"/> @@ -3064,8 +3288,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="694:3-702:4" varName="DiagtreeExp"> + <commentsBefore>----------------------------------</commentsBefore> + <commentsBefore>-- Inheritance Complete Diagram --</commentsBefore> + <commentsBefore>----------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="694:17-694:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/233"/> </type> <bindings location="695:4-695:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="695:12-695:28" stringSymbol="treeExpression"/> @@ -3076,7 +3303,7 @@ <bindings location="697:4-697:61" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="697:14-697:61" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="697:14-697:24"> - <referredVariable href="temp#/45"/> + <referredVariable href="new-model#/234"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="697:37-697:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="697:37-697:38" referredVariable="//@elements.14/@inPattern/@elements.0"/> @@ -3099,7 +3326,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="703:3-703:87" varName="treeHCDXsiType" variableExp="//@elements.14/@outPattern/@elements.28/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="703:20-703:33" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/235"/> </type> <bindings location="703:35-703:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="703:43-703:53" stringSymbol="xsi:type"/> @@ -3110,7 +3337,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="704:3-704:83" varName="treeHCDName" variableExp="//@elements.14/@outPattern/@elements.28/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="704:17-704:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/236"/> </type> <bindings location="704:31-704:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="704:39-704:45" stringSymbol="name"/> @@ -3133,7 +3360,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="705:3-705:89" varName="treeHCDIdentity" variableExp="//@elements.14/@outPattern/@elements.28/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="705:21-705:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/237"/> </type> <bindings location="705:35-705:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="705:43-705:53" stringSymbol="identity"/> @@ -3141,14 +3368,14 @@ <bindings location="705:54-705:88" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="705:63-705:88" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="705:63-705:73"> - <referredVariable href="temp#/46"/> + <referredVariable href="new-model#/238"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="706:3-706:72" varName="treeHCDid" variableExp="//@elements.14/@outPattern/@elements.28/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="706:15-706:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/239"/> </type> <bindings location="706:29-706:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="706:37-706:41" stringSymbol="id"/> @@ -3156,14 +3383,15 @@ <bindings location="706:42-706:71" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="706:51-706:71" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="706:51-706:61"> - <referredVariable href="temp#/47"/> + <referredVariable href="new-model#/240"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="708:3-708:85" varName="treeHCDDef" variableExp="//@elements.14/@outPattern/@elements.28/@bindings.3/@value/@elements.4"> + <commentsBefore>---------------------------------------------------------------------------------------------------------------	</commentsBefore> <type xsi:type="ocl:OclModelElement" location="708:16-708:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/241"/> </type> <bindings location="708:30-708:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="708:38-708:55" stringSymbol="definitionlevel"/> @@ -3176,7 +3404,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="709:3-709:83" varName="sourceHCD" variableExp="//@elements.14/@outPattern/@elements.28/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="709:15-709:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/242"/> </type> <bindings location="709:28-709:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="709:36-709:44" stringSymbol="source"/> @@ -3190,7 +3418,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="710:3-710:93" varName="sourceHCDText" variableExp="//@elements.14/@outPattern/@elements.34/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="710:19-710:27" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/243"/> </type> <bindings location="710:29-710:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="710:35-710:42" stringSymbol="#text"/> @@ -3199,7 +3427,7 @@ <value xsi:type="ocl:NavigationOrAttributeCallExp" location="710:51-710:92" name="value"> <source xsi:type="ocl:OperationCallExp" location="710:51-710:86" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="710:51-710:61"> - <referredVariable href="temp#/48"/> + <referredVariable href="new-model#/244"/> </source> <arguments xsi:type="ocl:VariableExp" location="710:74-710:75" referredVariable="//@elements.14/@inPattern/@elements.0"/> <arguments xsi:type="ocl:StringExp" location="710:76-710:85" stringSymbol="treeHId"/> @@ -3209,7 +3437,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="711:3-711:82" varName="superCD" variableExp="//@elements.14/@outPattern/@elements.28/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="711:13-711:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/245"/> </type> <bindings location="711:26-711:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="711:34-711:45" stringSymbol="superType"/> @@ -3223,7 +3451,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="712:3-712:70" varName="superTextCD" variableExp="//@elements.14/@outPattern/@elements.36/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="712:17-712:25" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/246"/> </type> <bindings location="712:26-712:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="712:32-712:39" stringSymbol="#text"/> @@ -3238,7 +3466,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="713:3-713:76" varName="subCD" variableExp="//@elements.14/@outPattern/@elements.28/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="713:11-713:22" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/247"/> </type> <bindings location="713:24-713:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="713:32-713:41" stringSymbol="subType"/> @@ -3252,7 +3480,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="714:3-714:57" varName="subTextCD" variableExp="//@elements.14/@outPattern/@elements.38/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="714:15-714:23" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/248"/> </type> <bindings location="714:25-714:38" propertyName="name"> <value xsi:type="ocl:StringExp" location="714:31-714:38" stringSymbol="#text"/> @@ -3267,7 +3495,7 @@ <inPattern location="613:2-615:47"> <elements xsi:type="atl:SimpleInPatternElement" location="614:3-614:14" varName="e" variableExp="//@elements.14/@inPattern/@filter/@source/@source/@source/@source/@source //@elements.14/@inPattern/@filter/@source/@arguments.0/@source/@source //@elements.14/@inPattern/@filter/@arguments.0/@source/@arguments.0 //@elements.14/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.14/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.14/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.14/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.14/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.14/@outPattern/@elements.15/@bindings.1/@value/@source/@source //@elements.14/@outPattern/@elements.16/@bindings.2/@value/@source/@source //@elements.14/@outPattern/@elements.17/@bindings.2/@value/@arguments.0/@source //@elements.14/@outPattern/@elements.19/@bindings.1/@value/@source/@source/@source //@elements.14/@outPattern/@elements.19/@bindings.1/@value/@arguments.0/@source/@source //@elements.14/@outPattern/@elements.25/@bindings.1/@value/@source/@source //@elements.14/@outPattern/@elements.27/@bindings.1/@value/@source //@elements.14/@outPattern/@elements.28/@bindings.2/@value/@arguments.0/@source //@elements.14/@outPattern/@elements.30/@bindings.1/@value/@source/@source/@source //@elements.14/@outPattern/@elements.30/@bindings.1/@value/@arguments.0/@source/@source //@elements.14/@outPattern/@elements.33/@bindings.1/@value/@source //@elements.14/@outPattern/@elements.35/@bindings.1/@value/@source/@arguments.0 //@elements.14/@outPattern/@elements.37/@bindings.1/@value/@source/@source //@elements.14/@outPattern/@elements.39/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="614:5-614:14" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/200"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="614:16-615:46" operationName="and"> @@ -3289,7 +3517,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="615:13-615:45" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="615:13-615:32" name="getRoots"> <source xsi:type="ocl:VariableExp" location="615:13-615:23"> - <referredVariable href="temp#/41"/> + <referredVariable href="new-model#/201"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="615:43-615:44" referredVariable="//@elements.14/@inPattern/@elements.0"/> @@ -3299,10 +3527,21 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="721:1-777:2" name="ConceptisAbstract"> + <commentsBefore>-- Rule 'Concept'.</commentsBefore> + <commentsBefore>-- This rule generates the Concepts which are :</commentsBefore> + <commentsBefore>-- * not subtypes of any classes</commentsBefore> + <commentsBefore>-- * abstract</commentsBefore> + <commentsAfter>-- Rule 'Concept'.</commentsAfter> + <commentsAfter>-- This rule generates the Concepts which are :</commentsAfter> + <commentsAfter>-- * subtypes of some classes</commentsAfter> + <commentsAfter>-- * abstract</commentsAfter> <outPattern location="725:2-776:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="729:3-737:4" varName="c"> + <commentsBefore>-------------</commentsBefore> + <commentsBefore>-- Concept --</commentsBefore> + <commentsBefore>-------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="729:5-729:16" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/251"/> </type> <bindings location="730:4-730:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="730:10-730:19" stringSymbol="concept"/> @@ -3325,7 +3564,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="738:3-738:49" varName="name" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="738:8-738:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/252"/> </type> <bindings location="738:22-738:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="738:28-738:34" stringSymbol="name"/> @@ -3338,7 +3577,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="739:3-739:63" varName="identity" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="739:13-739:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/253"/> </type> <bindings location="739:28-739:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="739:34-739:44" stringSymbol="identity"/> @@ -3351,7 +3590,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="740:3-740:51" varName="id" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="740:7-740:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/254"/> </type> <bindings location="740:22-740:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="740:28-740:32" stringSymbol="id"/> @@ -3364,7 +3603,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="741:3-741:66" varName="namespace" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="741:14-741:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/255"/> </type> <bindings location="741:29-741:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="741:35-741:46" stringSymbol="namespace"/> @@ -3377,7 +3616,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="742:3-742:77" varName="isLoaded" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="742:13-742:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/256"/> </type> <bindings location="742:28-742:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="742:34-742:44" stringSymbol="isLoaded"/> @@ -3392,7 +3631,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="743:3-744:5" varName="isAbstract" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="743:15-743:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/257"/> </type> <bindings location="743:30-743:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="743:36-743:48" stringSymbol="isAbstract"/> @@ -3402,8 +3641,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="749:3-757:4" varName="mdfmetadata" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="749:16-749:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/258"/> </type> <bindings location="750:4-750:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="750:10-750:23" stringSymbol="mdfmetadata"/> @@ -3425,7 +3667,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="758:3-758:78" varName="xsitype" variableExp="//@elements.15/@outPattern/@elements.7/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="758:11-758:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/259"/> </type> <bindings location="758:26-758:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="758:32-758:42" stringSymbol="xsi:type"/> @@ -3436,7 +3678,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="759:3-759:72" varName="accessmodifier" variableExp="//@elements.15/@outPattern/@elements.7/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="759:18-759:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/260"/> </type> <bindings location="759:33-759:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="759:39-759:55" stringSymbol="accessmodifier"/> @@ -3447,7 +3689,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="760:3-760:59" varName="category" variableExp="//@elements.15/@outPattern/@elements.7/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="760:14-760:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/261"/> </type> <bindings location="760:28-760:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="760:36-760:46" stringSymbol="category"/> @@ -3458,7 +3700,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="761:3-761:65" varName="description" variableExp="//@elements.15/@outPattern/@elements.7/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="761:17-761:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/262"/> </type> <bindings location="761:31-761:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="761:39-761:52" stringSymbol="description"/> @@ -3469,7 +3711,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="762:3-762:63" varName="doccomment" variableExp="//@elements.15/@outPattern/@elements.7/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="762:16-762:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/263"/> </type> <bindings location="762:30-762:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="762:38-762:50" stringSymbol="doccomment"/> @@ -3480,7 +3722,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="763:3-763:61" varName="localize" variableExp="//@elements.15/@outPattern/@elements.7/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="763:14-763:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/264"/> </type> <bindings location="763:29-763:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="763:35-763:45" stringSymbol="localize"/> @@ -3491,7 +3733,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="765:3-767:61" varName="classmodifier" variableExp="//@elements.15/@outPattern/@elements.7/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="765:19-765:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/265"/> </type> <bindings location="766:4-766:25" propertyName="name"> <value xsi:type="ocl:StringExp" location="766:10-766:25" stringSymbol="classmodifier"/> @@ -3507,8 +3749,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="772:3-776:4" varName="valueProperties" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> + <commentsBefore>----------------</commentsBefore> + <commentsBefore>-- Properties --</commentsBefore> + <commentsBefore>----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="772:20-772:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/266"/> </type> <bindings location="773:4-773:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="773:10-773:27" stringSymbol="valueProperties"/> @@ -3528,7 +3773,7 @@ <inPattern location="722:2-724:47"> <elements xsi:type="atl:SimpleInPatternElement" location="723:3-723:14" varName="e" variableExp="//@elements.15/@inPattern/@filter/@source/@source/@source/@source //@elements.15/@inPattern/@filter/@source/@arguments.0/@source //@elements.15/@inPattern/@filter/@arguments.0/@source/@arguments.0 //@elements.15/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.15/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.15/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.15/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.15/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.15/@outPattern/@elements.14/@bindings.1/@value/@condition/@source //@elements.15/@outPattern/@elements.15/@bindings.2/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="723:5-723:14" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/249"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="723:16-724:46" operationName="and"> @@ -3546,7 +3791,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="724:13-724:45" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="724:13-724:32" name="getRoots"> <source xsi:type="ocl:VariableExp" location="724:13-724:23"> - <referredVariable href="temp#/49"/> + <referredVariable href="new-model#/250"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="724:43-724:44" referredVariable="//@elements.15/@inPattern/@elements.0"/> @@ -3556,10 +3801,19 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="783:1-891:2" name="ConceptHasSuperAndisAbstract"> + <commentsBefore>-- Rule 'Concept'.</commentsBefore> + <commentsBefore>-- This rule generates the Concepts which are :</commentsBefore> + <commentsBefore>-- * subtypes of some classes</commentsBefore> + <commentsBefore>-- * abstract</commentsBefore> + <commentsAfter>-- Rule 'Relationship'.</commentsAfter> + <commentsAfter>-- This rule generates the Relationships which are not subtypes of any classes</commentsAfter> <outPattern location="787:2-890:57"> <elements xsi:type="atl:SimpleOutPatternElement" location="791:3-799:4" varName="c"> + <commentsBefore>-------------</commentsBefore> + <commentsBefore>-- Concept --</commentsBefore> + <commentsBefore>-------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="791:5-791:16" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/269"/> </type> <bindings location="792:4-792:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="792:10-792:19" stringSymbol="concept"/> @@ -3583,7 +3837,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="801:3-801:49" varName="name" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="801:8-801:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/270"/> </type> <bindings location="801:22-801:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="801:28-801:34" stringSymbol="name"/> @@ -3596,7 +3850,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="802:3-802:63" varName="identity" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="802:13-802:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/271"/> </type> <bindings location="802:28-802:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="802:34-802:44" stringSymbol="identity"/> @@ -3609,7 +3863,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="803:3-803:66" varName="namespace" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="803:14-803:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/272"/> </type> <bindings location="803:29-803:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="803:35-803:46" stringSymbol="namespace"/> @@ -3622,7 +3876,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="804:3-804:51" varName="id" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="804:7-804:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/273"/> </type> <bindings location="804:22-804:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="804:28-804:32" stringSymbol="id"/> @@ -3635,7 +3889,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="805:3-805:77" varName="isLoaded" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="805:13-805:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/274"/> </type> <bindings location="805:28-805:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="805:34-805:44" stringSymbol="isLoaded"/> @@ -3650,7 +3904,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="806:3-806:64" varName="isAbstract" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="806:15-806:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/275"/> </type> <bindings location="806:30-806:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="806:36-806:48" stringSymbol="isAbstract"/> @@ -3660,8 +3914,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="811:3-819:4" varName="mdfmetadata" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="811:16-811:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/276"/> </type> <bindings location="812:4-812:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="812:10-812:23" stringSymbol="mdfmetadata"/> @@ -3683,7 +3940,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="821:3-821:78" varName="xsitype" variableExp="//@elements.16/@outPattern/@elements.7/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="821:11-821:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/277"/> </type> <bindings location="821:26-821:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="821:32-821:42" stringSymbol="xsi:type"/> @@ -3694,7 +3951,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="822:3-822:72" varName="accessmodifier" variableExp="//@elements.16/@outPattern/@elements.7/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="822:18-822:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/278"/> </type> <bindings location="822:33-822:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="822:39-822:55" stringSymbol="accessmodifier"/> @@ -3705,7 +3962,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="823:3-823:59" varName="category" variableExp="//@elements.16/@outPattern/@elements.7/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="823:14-823:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/279"/> </type> <bindings location="823:28-823:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="823:36-823:46" stringSymbol="category"/> @@ -3716,7 +3973,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="824:3-824:65" varName="description" variableExp="//@elements.16/@outPattern/@elements.7/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="824:17-824:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/280"/> </type> <bindings location="824:31-824:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="824:39-824:52" stringSymbol="description"/> @@ -3727,7 +3984,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="825:3-825:63" varName="doccomment" variableExp="//@elements.16/@outPattern/@elements.7/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="825:16-825:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/281"/> </type> <bindings location="825:30-825:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="825:38-825:50" stringSymbol="doccomment"/> @@ -3738,7 +3995,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="826:3-826:59" varName="localize" variableExp="//@elements.16/@outPattern/@elements.7/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="826:12-826:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/282"/> </type> <bindings location="826:27-826:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="826:33-826:43" stringSymbol="localize"/> @@ -3749,7 +4006,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="827:3-829:61" varName="classmodifier" variableExp="//@elements.16/@outPattern/@elements.7/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="827:19-827:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/283"/> </type> <bindings location="828:4-828:25" propertyName="name"> <value xsi:type="ocl:StringExp" location="828:10-828:25" stringSymbol="classmodifier"/> @@ -3766,7 +4023,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="832:3-832:74" varName="superType" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="832:15-832:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/284"/> </type> <bindings location="832:28-832:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="832:36-832:47" stringSymbol="superType"/> @@ -3777,7 +4034,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="833:3-833:75" varName="superTypeText" variableExp="//@elements.16/@outPattern/@elements.15/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="833:19-833:27" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/285"/> </type> <bindings location="833:29-833:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="833:37-833:44" stringSymbol="#text"/> @@ -3791,8 +4048,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="838:3-842:4" varName="valueProperties" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.2/@value/@elements.8"> + <commentsBefore>----------------			</commentsBefore> + <commentsBefore>-- Properties --</commentsBefore> + <commentsBefore>----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="838:20-838:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/286"/> </type> <bindings location="839:4-839:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="839:10-839:27" stringSymbol="valueProperties"/> @@ -3809,8 +4069,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="847:3-855:4" varName="treeHerite"> + <commentsBefore>---------------------------</commentsBefore> + <commentsBefore>-- inheritanceExpression --</commentsBefore> + <commentsBefore>--------------------------- </commentsBefore> <type xsi:type="ocl:OclModelElement" location="847:16-847:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/287"/> </type> <bindings location="848:4-848:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="848:12-848:28" stringSymbol="treeExpression"/> @@ -3821,7 +4084,7 @@ <bindings location="850:4-850:57" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="850:14-850:57" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="850:14-850:24"> - <referredVariable href="temp#/51"/> + <referredVariable href="new-model#/288"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="850:37-850:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="850:37-850:38" referredVariable="//@elements.16/@inPattern/@elements.0"/> @@ -3844,7 +4107,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="856:3-856:85" varName="treeHXsiType" variableExp="//@elements.16/@outPattern/@elements.18/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="856:18-856:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/289"/> </type> <bindings location="856:33-856:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="856:41-856:51" stringSymbol="xsi:type"/> @@ -3855,7 +4118,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="857:3-857:81" varName="treeHName" variableExp="//@elements.16/@outPattern/@elements.18/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="857:15-857:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/290"/> </type> <bindings location="857:29-857:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="857:37-857:43" stringSymbol="name"/> @@ -3878,7 +4141,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="858:3-858:87" varName="treeHIdentity" variableExp="//@elements.16/@outPattern/@elements.18/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="858:19-858:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/291"/> </type> <bindings location="858:33-858:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="858:41-858:51" stringSymbol="identity"/> @@ -3886,14 +4149,14 @@ <bindings location="858:52-858:86" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="858:61-858:86" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="858:61-858:71"> - <referredVariable href="temp#/52"/> + <referredVariable href="new-model#/292"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="859:3-859:70" varName="treeHId" variableExp="//@elements.16/@outPattern/@elements.18/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="859:13-859:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/293"/> </type> <bindings location="859:27-859:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="859:35-859:39" stringSymbol="id"/> @@ -3901,14 +4164,14 @@ <bindings location="859:40-859:69" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="859:49-859:69" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="859:49-859:59"> - <referredVariable href="temp#/53"/> + <referredVariable href="new-model#/294"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="860:3-860:70" varName="treeHDef" variableExp="//@elements.16/@outPattern/@elements.18/@bindings.3/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="860:14-860:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/295"/> </type> <bindings location="860:28-860:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="860:36-860:53" stringSymbol="definitionlevel"/> @@ -3919,7 +4182,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="861:3-861:54" varName="source" variableExp="//@elements.16/@outPattern/@elements.18/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="861:12-861:23" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/296"/> </type> <bindings location="861:25-861:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="861:33-861:41" stringSymbol="source"/> @@ -3930,7 +4193,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="862:3-862:81" varName="superELT" variableExp="//@elements.16/@outPattern/@elements.18/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="862:14-862:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/297"/> </type> <bindings location="862:27-862:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="862:35-862:46" stringSymbol="superType"/> @@ -3944,7 +4207,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="863:3-863:68" varName="superText" variableExp="//@elements.16/@outPattern/@elements.25/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="863:15-863:23" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/298"/> </type> <bindings location="863:24-863:37" propertyName="name"> <value xsi:type="ocl:StringExp" location="863:30-863:37" stringSymbol="#text"/> @@ -3959,7 +4222,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="864:3-864:72" varName="sub" variableExp="//@elements.16/@outPattern/@elements.18/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="864:9-864:20" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/299"/> </type> <bindings location="864:22-864:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="864:30-864:39" stringSymbol="subType"/> @@ -3973,7 +4236,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="865:3-865:55" varName="subText" variableExp="//@elements.16/@outPattern/@elements.27/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="865:13-865:21" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/300"/> </type> <bindings location="865:23-865:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="865:29-865:36" stringSymbol="#text"/> @@ -3985,8 +4248,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="870:3-878:4" varName="DiagtreeExp"> + <commentsBefore>----------------------------------</commentsBefore> + <commentsBefore>-- Inheritance Complete Diagram --</commentsBefore> + <commentsBefore>----------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="870:17-870:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/301"/> </type> <bindings location="871:4-871:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="871:12-871:28" stringSymbol="treeExpression"/> @@ -3997,7 +4263,7 @@ <bindings location="873:4-873:61" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="873:14-873:61" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="873:14-873:24"> - <referredVariable href="temp#/54"/> + <referredVariable href="new-model#/302"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="873:37-873:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="873:37-873:38" referredVariable="//@elements.16/@inPattern/@elements.0"/> @@ -4020,7 +4286,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="879:3-879:87" varName="treeHCDXsiType" variableExp="//@elements.16/@outPattern/@elements.29/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="879:20-879:33" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/303"/> </type> <bindings location="879:35-879:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="879:43-879:53" stringSymbol="xsi:type"/> @@ -4031,7 +4297,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="880:3-880:83" varName="treeHCDName" variableExp="//@elements.16/@outPattern/@elements.29/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="880:17-880:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/304"/> </type> <bindings location="880:31-880:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="880:39-880:45" stringSymbol="name"/> @@ -4054,7 +4320,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="881:3-881:89" varName="treeHCDIdentity" variableExp="//@elements.16/@outPattern/@elements.29/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="881:21-881:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/305"/> </type> <bindings location="881:35-881:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="881:43-881:53" stringSymbol="identity"/> @@ -4062,14 +4328,14 @@ <bindings location="881:54-881:88" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="881:63-881:88" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="881:63-881:73"> - <referredVariable href="temp#/55"/> + <referredVariable href="new-model#/306"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="882:3-882:72" varName="treeHCDid" variableExp="//@elements.16/@outPattern/@elements.29/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="882:15-882:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/307"/> </type> <bindings location="882:29-882:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="882:37-882:41" stringSymbol="id"/> @@ -4077,14 +4343,15 @@ <bindings location="882:42-882:71" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="882:51-882:71" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="882:51-882:61"> - <referredVariable href="temp#/56"/> + <referredVariable href="new-model#/308"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="884:3-884:85" varName="treeHCDDef" variableExp="//@elements.16/@outPattern/@elements.29/@bindings.3/@value/@elements.4"> + <commentsBefore>------------------------------------------------------------------------------------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="884:16-884:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/309"/> </type> <bindings location="884:30-884:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="884:38-884:55" stringSymbol="definitionlevel"/> @@ -4097,7 +4364,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="885:3-885:83" varName="sourceHCD" variableExp="//@elements.16/@outPattern/@elements.29/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="885:15-885:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/310"/> </type> <bindings location="885:28-885:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="885:36-885:44" stringSymbol="source"/> @@ -4111,7 +4378,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="886:3-886:93" varName="sourceHCDText" variableExp="//@elements.16/@outPattern/@elements.35/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="886:19-886:27" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/311"/> </type> <bindings location="886:29-886:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="886:35-886:42" stringSymbol="#text"/> @@ -4120,7 +4387,7 @@ <value xsi:type="ocl:NavigationOrAttributeCallExp" location="886:51-886:92" name="value"> <source xsi:type="ocl:OperationCallExp" location="886:51-886:86" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="886:51-886:61"> - <referredVariable href="temp#/57"/> + <referredVariable href="new-model#/312"/> </source> <arguments xsi:type="ocl:VariableExp" location="886:74-886:75" referredVariable="//@elements.16/@inPattern/@elements.0"/> <arguments xsi:type="ocl:StringExp" location="886:76-886:85" stringSymbol="treeHId"/> @@ -4130,7 +4397,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="887:3-887:82" varName="superCD" variableExp="//@elements.16/@outPattern/@elements.29/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="887:13-887:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/313"/> </type> <bindings location="887:26-887:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="887:34-887:45" stringSymbol="superType"/> @@ -4144,7 +4411,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="888:3-888:70" varName="superTextCD" variableExp="//@elements.16/@outPattern/@elements.37/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="888:17-888:25" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/314"/> </type> <bindings location="888:26-888:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="888:32-888:39" stringSymbol="#text"/> @@ -4159,7 +4426,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="889:3-889:76" varName="subCD" variableExp="//@elements.16/@outPattern/@elements.29/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="889:11-889:22" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/315"/> </type> <bindings location="889:24-889:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="889:32-889:41" stringSymbol="subType"/> @@ -4173,7 +4440,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="890:3-890:57" varName="subTextCD" variableExp="//@elements.16/@outPattern/@elements.39/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="890:15-890:23" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/316"/> </type> <bindings location="890:25-890:38" propertyName="name"> <value xsi:type="ocl:StringExp" location="890:31-890:38" stringSymbol="#text"/> @@ -4188,7 +4455,7 @@ <inPattern location="784:2-786:47"> <elements xsi:type="atl:SimpleInPatternElement" location="785:3-785:14" varName="e" variableExp="//@elements.16/@inPattern/@filter/@source/@source/@source/@source/@source //@elements.16/@inPattern/@filter/@source/@arguments.0/@source //@elements.16/@inPattern/@filter/@arguments.0/@source/@arguments.0 //@elements.16/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.16/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.16/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.16/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.16/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.16/@outPattern/@elements.14/@bindings.1/@value/@condition/@source //@elements.16/@outPattern/@elements.16/@bindings.1/@value/@source/@source //@elements.16/@outPattern/@elements.17/@bindings.2/@value/@source/@source //@elements.16/@outPattern/@elements.18/@bindings.2/@value/@arguments.0/@source //@elements.16/@outPattern/@elements.20/@bindings.1/@value/@source/@source/@source //@elements.16/@outPattern/@elements.20/@bindings.1/@value/@arguments.0/@source/@source //@elements.16/@outPattern/@elements.26/@bindings.1/@value/@source/@source //@elements.16/@outPattern/@elements.28/@bindings.1/@value/@source //@elements.16/@outPattern/@elements.29/@bindings.2/@value/@arguments.0/@source //@elements.16/@outPattern/@elements.31/@bindings.1/@value/@source/@source/@source //@elements.16/@outPattern/@elements.31/@bindings.1/@value/@arguments.0/@source/@source //@elements.16/@outPattern/@elements.34/@bindings.1/@value/@source //@elements.16/@outPattern/@elements.36/@bindings.1/@value/@source/@arguments.0 //@elements.16/@outPattern/@elements.38/@bindings.1/@value/@source/@source //@elements.16/@outPattern/@elements.40/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="785:5-785:14" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/267"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="785:16-786:46" operationName="and"> @@ -4208,7 +4475,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="786:13-786:45" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="786:13-786:32" name="getRoots"> <source xsi:type="ocl:VariableExp" location="786:13-786:23"> - <referredVariable href="temp#/50"/> + <referredVariable href="new-model#/268"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="786:43-786:44" referredVariable="//@elements.16/@inPattern/@elements.0"/> @@ -4218,10 +4485,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="895:1-1017:2" name="Relationship"> + <commentsBefore>-- Rule 'Relationship'.</commentsBefore> + <commentsBefore>-- This rule generates the Relationships which are not subtypes of any classes</commentsBefore> + <commentsAfter>-- Rule 'Relationship'.</commentsAfter> + <commentsAfter>-- This rule generates the Relationships which are subtypes of some classes</commentsAfter> <outPattern location="900:2-1016:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="904:3-912:4" varName="r"> + <commentsBefore>------------------</commentsBefore> + <commentsBefore>-- Relationship --</commentsBefore> + <commentsBefore>------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="904:7-904:18" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/318"/> </type> <bindings location="905:4-905:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="905:10-905:24" stringSymbol="relationship"/> @@ -4245,7 +4519,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="913:3-913:49" varName="name" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="913:8-913:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/319"/> </type> <bindings location="913:22-913:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="913:28-913:34" stringSymbol="name"/> @@ -4258,7 +4532,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="914:3-914:63" varName="identity" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="914:13-914:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/320"/> </type> <bindings location="914:28-914:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="914:34-914:44" stringSymbol="identity"/> @@ -4271,7 +4545,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="915:3-915:51" varName="id" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="915:7-915:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/321"/> </type> <bindings location="915:22-915:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="915:28-915:32" stringSymbol="id"/> @@ -4284,7 +4558,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="916:3-916:66" varName="namespace" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="916:14-916:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/322"/> </type> <bindings location="916:29-916:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="916:35-916:46" stringSymbol="namespace"/> @@ -4297,7 +4571,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="917:3-917:77" varName="isLoaded" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="917:13-917:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/323"/> </type> <bindings location="917:28-917:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="917:34-917:44" stringSymbol="isLoaded"/> @@ -4312,7 +4586,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="918:3-918:64" varName="isAbstract" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="918:15-918:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/324"/> </type> <bindings location="918:30-918:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="918:36-918:48" stringSymbol="isAbstract"/> @@ -4322,8 +4596,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="923:3-930:4" varName="mdfmetadata" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="923:16-923:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/325"/> </type> <bindings location="924:4-924:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="924:10-924:23" stringSymbol="mdfmetadata"/> @@ -4344,7 +4621,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="931:3-931:69" varName="xsitype" variableExp="//@elements.17/@outPattern/@elements.7/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="931:11-931:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/326"/> </type> <bindings location="931:26-931:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="931:32-931:42" stringSymbol="xsi:type"/> @@ -4355,7 +4632,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="932:3-932:72" varName="accessmodifier" variableExp="//@elements.17/@outPattern/@elements.7/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="932:18-932:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/327"/> </type> <bindings location="932:33-932:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="932:39-932:55" stringSymbol="accessmodifier"/> @@ -4366,7 +4643,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="933:3-933:59" varName="localize" variableExp="//@elements.17/@outPattern/@elements.7/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="933:12-933:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/328"/> </type> <bindings location="933:27-933:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="933:33-933:43" stringSymbol="localize"/> @@ -4377,7 +4654,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="934:3-934:56" varName="category" variableExp="//@elements.17/@outPattern/@elements.7/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="934:12-934:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/329"/> </type> <bindings location="934:27-934:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="934:33-934:43" stringSymbol="category"/> @@ -4388,7 +4665,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="935:3-935:62" varName="description" variableExp="//@elements.17/@outPattern/@elements.7/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="935:15-935:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/330"/> </type> <bindings location="935:30-935:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="935:36-935:49" stringSymbol="description"/> @@ -4399,7 +4676,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="936:3-936:60" varName="doccomment" variableExp="//@elements.17/@outPattern/@elements.7/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="936:14-936:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/331"/> </type> <bindings location="936:29-936:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="936:35-936:47" stringSymbol="doccomment"/> @@ -4409,8 +4686,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="941:3-945:4" varName="roles" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> + <commentsBefore>-----------</commentsBefore> + <commentsBefore>-- Roles --</commentsBefore> + <commentsBefore>-----------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="941:9-941:20" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/332"/> </type> <bindings location="942:4-942:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="942:10-942:17" stringSymbol="roles"/> @@ -4427,8 +4707,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="950:3-954:4" varName="valueProperties" variableExp="//@elements.17/@outPattern/@elements.0/@bindings.2/@value/@elements.8"> + <commentsBefore>----------------</commentsBefore> + <commentsBefore>-- Properties --</commentsBefore> + <commentsBefore>----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="950:20-950:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/333"/> </type> <bindings location="951:4-951:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="951:10-951:27" stringSymbol="valueProperties"/> @@ -4445,8 +4728,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="959:3-967:4" varName="treeExp"> + <commentsBefore>--------------------</commentsBefore> + <commentsBefore>-- RoleExpression --</commentsBefore> + <commentsBefore>--------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="959:13-959:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/334"/> </type> <bindings location="960:4-960:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="960:12-960:28" stringSymbol="treeExpression"/> @@ -4457,7 +4743,7 @@ <bindings location="962:4-962:57" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="962:14-962:57" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="962:14-962:24"> - <referredVariable href="temp#/58"/> + <referredVariable href="new-model#/335"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="962:37-962:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="962:37-962:38" referredVariable="//@elements.17/@inPattern/@elements.0"/> @@ -4480,7 +4766,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="968:3-968:74" varName="reXsiType" variableExp="//@elements.17/@outPattern/@elements.16/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="968:15-968:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/336"/> </type> <bindings location="968:29-968:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="968:37-968:47" stringSymbol="xsi:type"/> @@ -4491,7 +4777,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="969:3-969:74" varName="reName" variableExp="//@elements.17/@outPattern/@elements.16/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="969:12-969:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/337"/> </type> <bindings location="969:26-969:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="969:34-969:40" stringSymbol="name"/> @@ -4507,7 +4793,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="970:3-970:84" varName="reIdentity" variableExp="//@elements.17/@outPattern/@elements.16/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="970:16-970:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/338"/> </type> <bindings location="970:30-970:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="970:38-970:48" stringSymbol="identity"/> @@ -4515,14 +4801,14 @@ <bindings location="970:49-970:83" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="970:58-970:83" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="970:58-970:68"> - <referredVariable href="temp#/59"/> + <referredVariable href="new-model#/339"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="971:3-971:67" varName="reId" variableExp="//@elements.17/@outPattern/@elements.16/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="971:10-971:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/340"/> </type> <bindings location="971:24-971:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="971:32-971:36" stringSymbol="id"/> @@ -4530,14 +4816,14 @@ <bindings location="971:37-971:66" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="971:46-971:66" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="971:46-971:56"> - <referredVariable href="temp#/60"/> + <referredVariable href="new-model#/341"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="972:3-972:67" varName="reDef" variableExp="//@elements.17/@outPattern/@elements.16/@bindings.3/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="972:11-972:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/342"/> </type> <bindings location="972:25-972:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="972:33-972:50" stringSymbol="definitionlevel"/> @@ -4548,7 +4834,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="973:3-976:4" varName="reContainment" variableExp="//@elements.17/@outPattern/@elements.16/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="973:19-973:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/343"/> </type> <bindings location="974:4-974:30" propertyName="name"> <value xsi:type="ocl:StringExp" location="974:12-974:30" stringSymbol="containmentstyle"/> @@ -4561,7 +4847,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="977:3-977:54" varName="source" variableExp="//@elements.17/@outPattern/@elements.16/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="977:12-977:23" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/344"/> </type> <bindings location="977:25-977:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="977:33-977:41" stringSymbol="source"/> @@ -4572,7 +4858,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="978:3-978:71" varName="role" variableExp="//@elements.17/@outPattern/@elements.16/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="978:10-978:21" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/345"/> </type> <bindings location="978:23-978:37" propertyName="name"> <value xsi:type="ocl:StringExp" location="978:31-978:37" stringSymbol="role"/> @@ -4586,7 +4872,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="979:3-982:4" varName="roleText" variableExp="//@elements.17/@outPattern/@elements.24/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="979:14-979:22" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/346"/> </type> <bindings location="980:4-980:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="980:10-980:17" stringSymbol="#text"/> @@ -4602,8 +4888,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="987:3-995:4" varName="DiagtreeExp"> + <commentsBefore>---------------------------------------</commentsBefore> + <commentsBefore>-- Role Expression : completeDiagram --</commentsBefore> + <commentsBefore>---------------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="987:17-987:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/347"/> </type> <bindings location="988:4-988:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="988:12-988:28" stringSymbol="treeExpression"/> @@ -4614,7 +4903,7 @@ <bindings location="990:4-990:61" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="990:14-990:61" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="990:14-990:24"> - <referredVariable href="temp#/61"/> + <referredVariable href="new-model#/348"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="990:37-990:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="990:37-990:38" referredVariable="//@elements.17/@inPattern/@elements.0"/> @@ -4637,7 +4926,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="996:3-996:76" varName="reCDXsiType" variableExp="//@elements.17/@outPattern/@elements.26/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="996:17-996:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/349"/> </type> <bindings location="996:31-996:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="996:39-996:49" stringSymbol="xsi:type"/> @@ -4648,7 +4937,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="997:3-997:76" varName="reCDName" variableExp="//@elements.17/@outPattern/@elements.26/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="997:14-997:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/350"/> </type> <bindings location="997:28-997:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="997:36-997:42" stringSymbol="name"/> @@ -4664,7 +4953,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="998:3-998:88" varName="DiagreIdentity" variableExp="//@elements.17/@outPattern/@elements.26/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="998:20-998:33" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/351"/> </type> <bindings location="998:34-998:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="998:42-998:52" stringSymbol="identity"/> @@ -4672,14 +4961,14 @@ <bindings location="998:53-998:87" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="998:62-998:87" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="998:62-998:72"> - <referredVariable href="temp#/62"/> + <referredVariable href="new-model#/352"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="999:3-999:71" varName="DiagreId" variableExp="//@elements.17/@outPattern/@elements.26/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="999:14-999:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/353"/> </type> <bindings location="999:28-999:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="999:36-999:40" stringSymbol="id"/> @@ -4687,14 +4976,15 @@ <bindings location="999:41-999:70" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="999:50-999:70" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="999:50-999:60"> - <referredVariable href="temp#/63"/> + <referredVariable href="new-model#/354"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1001:3-1001:104" varName="DiagreDef" variableExp="//@elements.17/@outPattern/@elements.26/@bindings.3/@value/@elements.4"> + <commentsBefore>--------------------------------------------------------------------------------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1001:15-1001:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/355"/> </type> <bindings location="1001:29-1001:54" propertyName="name"> <value xsi:type="ocl:StringExp" location="1001:37-1001:54" stringSymbol="definitionlevel"/> @@ -4713,7 +5003,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1002:3-1002:86" varName="DiagreContainment" variableExp="//@elements.17/@outPattern/@elements.26/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1002:23-1002:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/356"/> </type> <bindings location="1002:37-1002:63" propertyName="name"> <value xsi:type="ocl:StringExp" location="1002:45-1002:63" stringSymbol="containmentstyle"/> @@ -4724,7 +5014,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1003:3-1003:81" varName="Diagsource" variableExp="//@elements.17/@outPattern/@elements.26/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1003:16-1003:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/357"/> </type> <bindings location="1003:29-1003:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="1003:37-1003:45" stringSymbol="source"/> @@ -4738,7 +5028,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1004:3-1007:4" varName="sourceText" variableExp="//@elements.17/@outPattern/@elements.33/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1004:16-1004:24" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/358"/> </type> <bindings location="1005:4-1005:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="1005:10-1005:17" stringSymbol="#text"/> @@ -4747,7 +5037,7 @@ <value xsi:type="ocl:NavigationOrAttributeCallExp" location="1006:13-1006:51" name="value"> <source xsi:type="ocl:OperationCallExp" location="1006:13-1006:45" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1006:13-1006:23"> - <referredVariable href="temp#/64"/> + <referredVariable href="new-model#/359"/> </source> <arguments xsi:type="ocl:VariableExp" location="1006:36-1006:37" referredVariable="//@elements.17/@inPattern/@elements.0"/> <arguments xsi:type="ocl:StringExp" location="1006:38-1006:44" stringSymbol="reId"/> @@ -4757,7 +5047,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1008:3-1012:4" varName="Diagrole" variableExp="//@elements.17/@outPattern/@elements.26/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="1008:14-1008:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/360"/> </type> <bindings location="1009:4-1009:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="1009:12-1009:18" stringSymbol="role"/> @@ -4771,7 +5061,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1013:3-1016:4" varName="DiagroleText" variableExp="//@elements.17/@outPattern/@elements.35/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1013:18-1013:26" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/361"/> </type> <bindings location="1014:4-1014:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="1014:10-1014:17" stringSymbol="#text"/> @@ -4790,7 +5080,7 @@ <inPattern location="896:2-899:4"> <elements xsi:type="atl:SimpleInPatternElement" location="897:3-897:21" varName="e" variableExp="//@elements.17/@inPattern/@filter/@source/@source //@elements.17/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.17/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.17/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.17/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.17/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.17/@outPattern/@elements.14/@bindings.2/@value/@source/@source //@elements.17/@outPattern/@elements.15/@bindings.2/@value/@source/@source //@elements.17/@outPattern/@elements.16/@bindings.2/@value/@arguments.0/@source //@elements.17/@outPattern/@elements.18/@bindings.1/@value/@arguments.0/@source //@elements.17/@outPattern/@elements.22/@bindings.1/@value/@source //@elements.17/@outPattern/@elements.25/@bindings.1/@value/@source/@source/@source //@elements.17/@outPattern/@elements.26/@bindings.2/@value/@arguments.0/@source //@elements.17/@outPattern/@elements.28/@bindings.1/@value/@arguments.0/@source //@elements.17/@outPattern/@elements.31/@bindings.1/@value/@source/@source/@source/@source //@elements.17/@outPattern/@elements.34/@bindings.1/@value/@source/@arguments.0 //@elements.17/@outPattern/@elements.36/@bindings.1/@value/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="897:5-897:21" name="Relationship"> - <model href="temp#/1"/> + <model href="new-model#/317"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="898:4-898:32" operationName="oclIsUndefined"> @@ -4801,10 +5091,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="1021:1-1176:2" name="RelationshipHasSuper"> + <commentsBefore>-- Rule 'Relationship'.</commentsBefore> + <commentsBefore>-- This rule generates the Relationships which are subtypes of some classes</commentsBefore> + <commentsAfter>-- Rule 'Role'.</commentsAfter> + <commentsAfter>-- This rule generates the Roles of a Relationship</commentsAfter> <outPattern location="1026:2-1175:58"> <elements xsi:type="atl:SimpleOutPatternElement" location="1030:3-1038:4" varName="r"> + <commentsBefore>------------------</commentsBefore> + <commentsBefore>-- Relationship --</commentsBefore> + <commentsBefore>------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1030:7-1030:18" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/363"/> </type> <bindings location="1031:4-1031:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="1031:10-1031:24" stringSymbol="relationship"/> @@ -4828,7 +5125,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1039:3-1039:49" varName="name" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1039:8-1039:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/364"/> </type> <bindings location="1039:22-1039:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="1039:28-1039:34" stringSymbol="name"/> @@ -4841,7 +5138,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1040:3-1040:63" varName="identity" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1040:13-1040:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/365"/> </type> <bindings location="1040:28-1040:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1040:34-1040:44" stringSymbol="identity"/> @@ -4854,7 +5151,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1041:3-1041:51" varName="id" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1041:7-1041:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/366"/> </type> <bindings location="1041:22-1041:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="1041:28-1041:32" stringSymbol="id"/> @@ -4867,7 +5164,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1042:3-1042:66" varName="namespace" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1042:14-1042:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/367"/> </type> <bindings location="1042:29-1042:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="1042:35-1042:46" stringSymbol="namespace"/> @@ -4880,7 +5177,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1043:3-1043:77" varName="isLoaded" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1043:13-1043:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/368"/> </type> <bindings location="1043:28-1043:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1043:34-1043:44" stringSymbol="isLoaded"/> @@ -4895,7 +5192,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1044:3-1044:64" varName="isAbstract" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1044:15-1044:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/369"/> </type> <bindings location="1044:30-1044:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="1044:36-1044:48" stringSymbol="isAbstract"/> @@ -4905,8 +5202,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1049:3-1056:4" varName="mdfmetadata" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1049:16-1049:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/370"/> </type> <bindings location="1050:4-1050:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="1050:10-1050:23" stringSymbol="mdfmetadata"/> @@ -4927,7 +5227,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1057:3-1057:69" varName="xsitype" variableExp="//@elements.18/@outPattern/@elements.7/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1057:11-1057:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/371"/> </type> <bindings location="1057:26-1057:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="1057:32-1057:42" stringSymbol="xsi:type"/> @@ -4938,7 +5238,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1058:3-1058:72" varName="accessmodifier" variableExp="//@elements.18/@outPattern/@elements.7/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1058:18-1058:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/372"/> </type> <bindings location="1058:33-1058:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="1058:39-1058:55" stringSymbol="accessmodifier"/> @@ -4949,7 +5249,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1059:3-1059:59" varName="localize" variableExp="//@elements.18/@outPattern/@elements.7/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1059:12-1059:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/373"/> </type> <bindings location="1059:27-1059:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1059:33-1059:43" stringSymbol="localize"/> @@ -4960,7 +5260,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1060:3-1060:56" varName="category" variableExp="//@elements.18/@outPattern/@elements.7/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1060:12-1060:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/374"/> </type> <bindings location="1060:27-1060:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1060:33-1060:43" stringSymbol="category"/> @@ -4971,7 +5271,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1061:3-1061:62" varName="description" variableExp="//@elements.18/@outPattern/@elements.7/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1061:15-1061:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/375"/> </type> <bindings location="1061:30-1061:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="1061:36-1061:49" stringSymbol="description"/> @@ -4982,7 +5282,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1062:3-1062:60" varName="doccomment" variableExp="//@elements.18/@outPattern/@elements.7/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1062:14-1062:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/376"/> </type> <bindings location="1062:29-1062:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="1062:35-1062:47" stringSymbol="doccomment"/> @@ -4992,8 +5292,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1067:3-1071:4" varName="roles" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> + <commentsBefore>-----------</commentsBefore> + <commentsBefore>-- Roles --</commentsBefore> + <commentsBefore>-----------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1067:9-1067:20" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/377"/> </type> <bindings location="1068:4-1068:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="1068:10-1068:17" stringSymbol="roles"/> @@ -5010,8 +5313,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1076:3-1080:4" varName="valueProperties" variableExp="//@elements.18/@outPattern/@elements.0/@bindings.2/@value/@elements.8"> + <commentsBefore>----------------</commentsBefore> + <commentsBefore>-- Properties --</commentsBefore> + <commentsBefore>----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1076:20-1076:31" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/378"/> </type> <bindings location="1077:4-1077:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="1077:10-1077:27" stringSymbol="valueProperties"/> @@ -5028,8 +5334,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1085:3-1093:4" varName="treeExp"> + <commentsBefore>--------------------</commentsBefore> + <commentsBefore>-- RoleExpression --</commentsBefore> + <commentsBefore>--------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1085:13-1085:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/379"/> </type> <bindings location="1086:4-1086:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="1086:12-1086:28" stringSymbol="treeExpression"/> @@ -5040,7 +5349,7 @@ <bindings location="1088:4-1088:57" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="1088:14-1088:57" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1088:14-1088:24"> - <referredVariable href="temp#/65"/> + <referredVariable href="new-model#/380"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="1088:37-1088:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="1088:37-1088:38" referredVariable="//@elements.18/@inPattern/@elements.0"/> @@ -5063,7 +5372,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1094:3-1094:74" varName="reXsiType" variableExp="//@elements.18/@outPattern/@elements.16/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1094:15-1094:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/381"/> </type> <bindings location="1094:29-1094:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="1094:37-1094:47" stringSymbol="xsi:type"/> @@ -5074,7 +5383,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1095:3-1095:74" varName="reName" variableExp="//@elements.18/@outPattern/@elements.16/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1095:12-1095:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/382"/> </type> <bindings location="1095:26-1095:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="1095:34-1095:40" stringSymbol="name"/> @@ -5090,7 +5399,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1096:3-1096:84" varName="reIdentity" variableExp="//@elements.18/@outPattern/@elements.16/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1096:16-1096:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/383"/> </type> <bindings location="1096:30-1096:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="1096:38-1096:48" stringSymbol="identity"/> @@ -5098,14 +5407,14 @@ <bindings location="1096:49-1096:83" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1096:58-1096:83" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1096:58-1096:68"> - <referredVariable href="temp#/66"/> + <referredVariable href="new-model#/384"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1097:3-1097:67" varName="reId" variableExp="//@elements.18/@outPattern/@elements.16/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1097:10-1097:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/385"/> </type> <bindings location="1097:24-1097:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="1097:32-1097:36" stringSymbol="id"/> @@ -5113,14 +5422,14 @@ <bindings location="1097:37-1097:66" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1097:46-1097:66" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="1097:46-1097:56"> - <referredVariable href="temp#/67"/> + <referredVariable href="new-model#/386"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1098:3-1098:67" varName="reDef" variableExp="//@elements.18/@outPattern/@elements.16/@bindings.3/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1098:11-1098:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/387"/> </type> <bindings location="1098:25-1098:50" propertyName="name"> <value xsi:type="ocl:StringExp" location="1098:33-1098:50" stringSymbol="definitionlevel"/> @@ -5131,7 +5440,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1099:3-1102:4" varName="reContainment" variableExp="//@elements.18/@outPattern/@elements.16/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1099:19-1099:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/388"/> </type> <bindings location="1100:4-1100:30" propertyName="name"> <value xsi:type="ocl:StringExp" location="1100:12-1100:30" stringSymbol="containmentstyle"/> @@ -5144,7 +5453,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1103:3-1103:54" varName="source" variableExp="//@elements.18/@outPattern/@elements.16/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1103:12-1103:23" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/389"/> </type> <bindings location="1103:25-1103:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="1103:33-1103:41" stringSymbol="source"/> @@ -5155,7 +5464,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1104:3-1104:71" varName="role" variableExp="//@elements.18/@outPattern/@elements.16/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="1104:10-1104:21" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/390"/> </type> <bindings location="1104:23-1104:37" propertyName="name"> <value xsi:type="ocl:StringExp" location="1104:31-1104:37" stringSymbol="role"/> @@ -5169,7 +5478,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1105:4-1105:73" varName="roleText" variableExp="//@elements.18/@outPattern/@elements.24/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1105:15-1105:23" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/391"/> </type> <bindings location="1105:24-1105:37" propertyName="name"> <value xsi:type="ocl:StringExp" location="1105:30-1105:37" stringSymbol="#text"/> @@ -5185,8 +5494,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1110:3-1118:4" varName="DiagtreeExp"> + <commentsBefore>---------------------------------------</commentsBefore> + <commentsBefore>-- Role Expression : completeDiagram --</commentsBefore> + <commentsBefore>---------------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1110:17-1110:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/392"/> </type> <bindings location="1111:4-1111:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="1111:12-1111:28" stringSymbol="treeExpression"/> @@ -5197,7 +5509,7 @@ <bindings location="1113:4-1113:61" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="1113:14-1113:61" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1113:14-1113:24"> - <referredVariable href="temp#/68"/> + <referredVariable href="new-model#/393"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="1113:37-1113:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="1113:37-1113:38" referredVariable="//@elements.18/@inPattern/@elements.0"/> @@ -5220,7 +5532,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1119:3-1119:76" varName="reCDXsiType" variableExp="//@elements.18/@outPattern/@elements.26/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1119:17-1119:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/394"/> </type> <bindings location="1119:31-1119:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="1119:39-1119:49" stringSymbol="xsi:type"/> @@ -5231,7 +5543,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1120:3-1120:76" varName="reCDName" variableExp="//@elements.18/@outPattern/@elements.26/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1120:14-1120:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/395"/> </type> <bindings location="1120:28-1120:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="1120:36-1120:42" stringSymbol="name"/> @@ -5247,7 +5559,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1121:3-1121:88" varName="DiagreIdentity" variableExp="//@elements.18/@outPattern/@elements.26/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1121:20-1121:33" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/396"/> </type> <bindings location="1121:34-1121:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="1121:42-1121:52" stringSymbol="identity"/> @@ -5255,14 +5567,14 @@ <bindings location="1121:53-1121:87" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1121:62-1121:87" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1121:62-1121:72"> - <referredVariable href="temp#/69"/> + <referredVariable href="new-model#/397"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1122:3-1122:71" varName="DiagreId" variableExp="//@elements.18/@outPattern/@elements.26/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1122:14-1122:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/398"/> </type> <bindings location="1122:28-1122:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="1122:36-1122:40" stringSymbol="id"/> @@ -5270,14 +5582,15 @@ <bindings location="1122:41-1122:70" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1122:50-1122:70" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="1122:50-1122:60"> - <referredVariable href="temp#/70"/> + <referredVariable href="new-model#/399"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1124:3-1124:103" varName="DiagreDef" variableExp="//@elements.18/@outPattern/@elements.26/@bindings.3/@value/@elements.4"> + <commentsBefore>--------------------------------------------------------------------------------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1124:15-1124:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/400"/> </type> <bindings location="1124:29-1124:54" propertyName="name"> <value xsi:type="ocl:StringExp" location="1124:37-1124:54" stringSymbol="definitionlevel"/> @@ -5296,7 +5609,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1125:3-1125:86" varName="DiagreContainment" variableExp="//@elements.18/@outPattern/@elements.26/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1125:23-1125:36" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/401"/> </type> <bindings location="1125:37-1125:63" propertyName="name"> <value xsi:type="ocl:StringExp" location="1125:45-1125:63" stringSymbol="containmentstyle"/> @@ -5307,7 +5620,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1126:3-1126:81" varName="Diagsource" variableExp="//@elements.18/@outPattern/@elements.26/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1126:16-1126:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/402"/> </type> <bindings location="1126:29-1126:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="1126:37-1126:45" stringSymbol="source"/> @@ -5321,7 +5634,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1127:3-1127:87" varName="sourceText" variableExp="//@elements.18/@outPattern/@elements.33/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1127:16-1127:24" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/403"/> </type> <bindings location="1127:25-1127:38" propertyName="name"> <value xsi:type="ocl:StringExp" location="1127:31-1127:38" stringSymbol="#text"/> @@ -5330,7 +5643,7 @@ <value xsi:type="ocl:NavigationOrAttributeCallExp" location="1127:48-1127:86" name="value"> <source xsi:type="ocl:OperationCallExp" location="1127:48-1127:80" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1127:48-1127:58"> - <referredVariable href="temp#/71"/> + <referredVariable href="new-model#/404"/> </source> <arguments xsi:type="ocl:VariableExp" location="1127:71-1127:72" referredVariable="//@elements.18/@inPattern/@elements.0"/> <arguments xsi:type="ocl:StringExp" location="1127:73-1127:79" stringSymbol="reId"/> @@ -5340,7 +5653,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1128:3-1128:79" varName="Diagrole" variableExp="//@elements.18/@outPattern/@elements.26/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="1128:14-1128:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/405"/> </type> <bindings location="1128:27-1128:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="1128:35-1128:41" stringSymbol="role"/> @@ -5354,7 +5667,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1129:3-1129:76" varName="DiagroleText" variableExp="//@elements.18/@outPattern/@elements.35/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1129:18-1129:26" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/406"/> </type> <bindings location="1129:27-1129:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="1129:33-1129:40" stringSymbol="#text"/> @@ -5370,8 +5683,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1134:3-1142:4" varName="treeHerite"> + <commentsBefore>---------------------------</commentsBefore> + <commentsBefore>-- inheritanceExpression --</commentsBefore> + <commentsBefore>---------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1134:16-1134:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/407"/> </type> <bindings location="1135:4-1135:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="1135:12-1135:28" stringSymbol="treeExpression"/> @@ -5382,7 +5698,7 @@ <bindings location="1137:4-1137:57" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="1137:14-1137:57" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1137:14-1137:24"> - <referredVariable href="temp#/72"/> + <referredVariable href="new-model#/408"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="1137:37-1137:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="1137:37-1137:38" referredVariable="//@elements.18/@inPattern/@elements.0"/> @@ -5405,7 +5721,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1143:3-1143:85" varName="treeHXsiType" variableExp="//@elements.18/@outPattern/@elements.37/@bindings.3/@value/@elements.0 //@elements.18/@outPattern/@elements.48/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1143:18-1143:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/409"/> </type> <bindings location="1143:33-1143:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="1143:41-1143:51" stringSymbol="xsi:type"/> @@ -5416,7 +5732,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1144:3-1144:81" varName="treeHName" variableExp="//@elements.18/@outPattern/@elements.37/@bindings.3/@value/@elements.1 //@elements.18/@outPattern/@elements.48/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1144:15-1144:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/410"/> </type> <bindings location="1144:29-1144:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1144:37-1144:43" stringSymbol="name"/> @@ -5439,7 +5755,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1145:3-1145:87" varName="treeHIdentity" variableExp="//@elements.18/@outPattern/@elements.37/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1145:19-1145:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/411"/> </type> <bindings location="1145:33-1145:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="1145:41-1145:51" stringSymbol="identity"/> @@ -5447,14 +5763,14 @@ <bindings location="1145:52-1145:86" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1145:61-1145:86" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1145:61-1145:71"> - <referredVariable href="temp#/73"/> + <referredVariable href="new-model#/412"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1146:3-1146:70" varName="treeHId" variableExp="//@elements.18/@outPattern/@elements.37/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1146:13-1146:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/413"/> </type> <bindings location="1146:27-1146:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="1146:35-1146:39" stringSymbol="id"/> @@ -5462,14 +5778,14 @@ <bindings location="1146:40-1146:69" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1146:49-1146:69" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="1146:49-1146:59"> - <referredVariable href="temp#/74"/> + <referredVariable href="new-model#/414"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1147:3-1147:70" varName="treeHDef" variableExp="//@elements.18/@outPattern/@elements.37/@bindings.3/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1147:14-1147:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/415"/> </type> <bindings location="1147:28-1147:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="1147:36-1147:53" stringSymbol="definitionlevel"/> @@ -5480,7 +5796,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1148:3-1148:59" varName="treeHsource" variableExp="//@elements.18/@outPattern/@elements.37/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1148:17-1148:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/416"/> </type> <bindings location="1148:30-1148:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="1148:38-1148:46" stringSymbol="source"/> @@ -5491,7 +5807,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1149:3-1149:81" varName="superELT" variableExp="//@elements.18/@outPattern/@elements.37/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1149:14-1149:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/417"/> </type> <bindings location="1149:27-1149:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="1149:35-1149:46" stringSymbol="superType"/> @@ -5505,7 +5821,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1150:3-1150:68" varName="superText" variableExp="//@elements.18/@outPattern/@elements.44/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1150:15-1150:23" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/418"/> </type> <bindings location="1150:24-1150:37" propertyName="name"> <value xsi:type="ocl:StringExp" location="1150:30-1150:37" stringSymbol="#text"/> @@ -5520,7 +5836,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1151:3-1151:72" varName="sub" variableExp="//@elements.18/@outPattern/@elements.37/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="1151:9-1151:20" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/419"/> </type> <bindings location="1151:22-1151:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="1151:30-1151:39" stringSymbol="subType"/> @@ -5534,7 +5850,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1152:3-1152:55" varName="subText" variableExp="//@elements.18/@outPattern/@elements.46/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1152:13-1152:21" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/420"/> </type> <bindings location="1152:23-1152:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="1152:29-1152:36" stringSymbol="#text"/> @@ -5546,8 +5862,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1157:3-1165:4" varName="DiagtreeExp"> + <commentsBefore>----------------------------------</commentsBefore> + <commentsBefore>-- Inheritance Complete Diagram --</commentsBefore> + <commentsBefore>----------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1157:17-1157:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/421"/> </type> <bindings location="1158:4-1158:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="1158:12-1158:28" stringSymbol="treeExpression"/> @@ -5558,7 +5877,7 @@ <bindings location="1160:4-1160:61" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="1160:14-1160:61" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1160:14-1160:24"> - <referredVariable href="temp#/75"/> + <referredVariable href="new-model#/422"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="1160:37-1160:50" name="domainModel"> <source xsi:type="ocl:VariableExp" location="1160:37-1160:38" referredVariable="//@elements.18/@inPattern/@elements.0"/> @@ -5581,7 +5900,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1166:3-1166:90" varName="treeHCDIdentity" variableExp="//@elements.18/@outPattern/@elements.48/@bindings.3/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1166:21-1166:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/423"/> </type> <bindings location="1166:35-1166:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="1166:43-1166:53" stringSymbol="identity"/> @@ -5589,14 +5908,14 @@ <bindings location="1166:55-1166:89" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1166:64-1166:89" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1166:64-1166:74"> - <referredVariable href="temp#/76"/> + <referredVariable href="new-model#/424"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1167:3-1167:72" varName="treeHCDid" variableExp="//@elements.18/@outPattern/@elements.48/@bindings.3/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1167:15-1167:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/425"/> </type> <bindings location="1167:29-1167:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="1167:37-1167:41" stringSymbol="id"/> @@ -5604,14 +5923,15 @@ <bindings location="1167:42-1167:71" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1167:51-1167:71" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="1167:51-1167:61"> - <referredVariable href="temp#/77"/> + <referredVariable href="new-model#/426"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1169:3-1169:85" varName="treeHCDDef" variableExp="//@elements.18/@outPattern/@elements.48/@bindings.3/@value/@elements.4"> + <commentsBefore>--------------------------------------------------------------------------------------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1169:16-1169:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/427"/> </type> <bindings location="1169:30-1169:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="1169:38-1169:55" stringSymbol="definitionlevel"/> @@ -5624,7 +5944,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1170:3-1170:83" varName="sourceHCD" variableExp="//@elements.18/@outPattern/@elements.48/@bindings.3/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1170:15-1170:26" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/428"/> </type> <bindings location="1170:28-1170:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1170:36-1170:44" stringSymbol="source"/> @@ -5638,7 +5958,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1171:4-1171:95" varName="sourceHCDText" variableExp="//@elements.18/@outPattern/@elements.52/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1171:20-1171:28" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/429"/> </type> <bindings location="1171:30-1171:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1171:36-1171:43" stringSymbol="#text"/> @@ -5647,7 +5967,7 @@ <value xsi:type="ocl:NavigationOrAttributeCallExp" location="1171:53-1171:94" name="value"> <source xsi:type="ocl:OperationCallExp" location="1171:53-1171:88" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1171:53-1171:63"> - <referredVariable href="temp#/78"/> + <referredVariable href="new-model#/430"/> </source> <arguments xsi:type="ocl:VariableExp" location="1171:76-1171:77" referredVariable="//@elements.18/@inPattern/@elements.0"/> <arguments xsi:type="ocl:StringExp" location="1171:78-1171:87" stringSymbol="treeHId"/> @@ -5657,7 +5977,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1172:3-1172:82" varName="superCD" variableExp="//@elements.18/@outPattern/@elements.48/@bindings.3/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1172:13-1172:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/431"/> </type> <bindings location="1172:26-1172:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="1172:34-1172:45" stringSymbol="superType"/> @@ -5671,7 +5991,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1173:4-1173:71" varName="superTextCD" variableExp="//@elements.18/@outPattern/@elements.54/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1173:18-1173:26" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/432"/> </type> <bindings location="1173:27-1173:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="1173:33-1173:40" stringSymbol="#text"/> @@ -5686,7 +6006,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1174:3-1174:76" varName="subCD" variableExp="//@elements.18/@outPattern/@elements.48/@bindings.3/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="1174:11-1174:22" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/433"/> </type> <bindings location="1174:24-1174:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="1174:32-1174:41" stringSymbol="subType"/> @@ -5700,7 +6020,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1175:4-1175:58" varName="subTextCD" variableExp="//@elements.18/@outPattern/@elements.56/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1175:16-1175:24" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/434"/> </type> <bindings location="1175:26-1175:39" propertyName="name"> <value xsi:type="ocl:StringExp" location="1175:32-1175:39" stringSymbol="#text"/> @@ -5715,7 +6035,7 @@ <inPattern location="1022:2-1025:4"> <elements xsi:type="atl:SimpleInPatternElement" location="1023:3-1023:21" varName="e" variableExp="//@elements.18/@inPattern/@filter/@source/@source/@source //@elements.18/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.18/@outPattern/@elements.14/@bindings.2/@value/@source/@source //@elements.18/@outPattern/@elements.15/@bindings.2/@value/@source/@source //@elements.18/@outPattern/@elements.16/@bindings.2/@value/@arguments.0/@source //@elements.18/@outPattern/@elements.18/@bindings.1/@value/@arguments.0/@source //@elements.18/@outPattern/@elements.22/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.25/@bindings.1/@value/@source/@source/@source //@elements.18/@outPattern/@elements.26/@bindings.2/@value/@arguments.0/@source //@elements.18/@outPattern/@elements.28/@bindings.1/@value/@arguments.0/@source //@elements.18/@outPattern/@elements.31/@bindings.1/@value/@source/@source/@source/@source //@elements.18/@outPattern/@elements.34/@bindings.1/@value/@source/@arguments.0 //@elements.18/@outPattern/@elements.36/@bindings.1/@value/@source/@source/@source //@elements.18/@outPattern/@elements.37/@bindings.2/@value/@arguments.0/@source //@elements.18/@outPattern/@elements.39/@bindings.1/@value/@source/@source/@source //@elements.18/@outPattern/@elements.39/@bindings.1/@value/@arguments.0/@source/@source //@elements.18/@outPattern/@elements.45/@bindings.1/@value/@source/@source //@elements.18/@outPattern/@elements.47/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.48/@bindings.2/@value/@arguments.0/@source //@elements.18/@outPattern/@elements.51/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.53/@bindings.1/@value/@source/@arguments.0 //@elements.18/@outPattern/@elements.55/@bindings.1/@value/@source/@source //@elements.18/@outPattern/@elements.57/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="1023:5-1023:21" name="Relationship"> - <model href="temp#/1"/> + <model href="new-model#/362"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="1024:4-1024:36" operationName="not"> @@ -5728,10 +6048,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="1180:1-1249:2" name="Role"> + <commentsBefore>-- Rule 'Role'.</commentsBefore> + <commentsBefore>-- This rule generates the Roles of a Relationship</commentsBefore> + <commentsAfter>-- Rule 'SimpleProperty'.</commentsAfter> + <commentsAfter>-- This rule generates the Properties of simples types</commentsAfter> <outPattern location="1183:2-1248:64"> <elements xsi:type="atl:SimpleOutPatternElement" location="1187:3-1195:4" varName="r"> + <commentsBefore>----------</commentsBefore> + <commentsBefore>-- Role --</commentsBefore> + <commentsBefore>----------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1187:7-1187:18" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/436"/> </type> <bindings location="1188:4-1188:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="1188:10-1188:16" stringSymbol="role"/> @@ -5757,7 +6084,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1196:3-1196:49" varName="name" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1196:8-1196:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/437"/> </type> <bindings location="1196:22-1196:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="1196:28-1196:34" stringSymbol="name"/> @@ -5770,7 +6097,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1197:3-1197:63" varName="identity" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1197:13-1197:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/438"/> </type> <bindings location="1197:28-1197:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1197:34-1197:44" stringSymbol="identity"/> @@ -5783,7 +6110,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1198:3-1198:51" varName="id" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1198:7-1198:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/439"/> </type> <bindings location="1198:22-1198:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="1198:28-1198:32" stringSymbol="id"/> @@ -5796,7 +6123,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1199:3-1199:59" varName="min" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1199:8-1199:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/440"/> </type> <bindings location="1199:23-1199:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="1199:29-1199:34" stringSymbol="min"/> @@ -5811,7 +6138,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1200:3-1200:59" varName="max" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1200:8-1200:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/441"/> </type> <bindings location="1200:23-1200:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="1200:29-1200:34" stringSymbol="max"/> @@ -5826,7 +6153,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1201:3-1201:90" varName="isUnbounded" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1201:17-1201:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/442"/> </type> <bindings location="1201:31-1201:52" propertyName="name"> <value xsi:type="ocl:StringExp" location="1201:39-1201:52" stringSymbol="isUnbounded"/> @@ -5841,7 +6168,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1202:3-1202:60" varName="accepts" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1202:12-1202:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/443"/> </type> <bindings location="1202:27-1202:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="1202:33-1202:42" stringSymbol="accepts"/> @@ -5853,8 +6180,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1207:3-1215:4" varName="mdfmetadata" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.7"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1207:16-1207:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/444"/> </type> <bindings location="1208:4-1208:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="1208:10-1208:23" stringSymbol="mdfmetadata"/> @@ -5877,7 +6207,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1216:3-1216:68" varName="xsitype" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1216:11-1216:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/445"/> </type> <bindings location="1216:26-1216:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="1216:32-1216:42" stringSymbol="xsi:type"/> @@ -5888,7 +6218,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1217:3-1217:72" varName="accessmodifier" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1217:18-1217:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/446"/> </type> <bindings location="1217:33-1217:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="1217:39-1217:55" stringSymbol="accessmodifier"/> @@ -5899,7 +6229,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1218:3-1218:58" varName="category" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1218:12-1218:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/447"/> </type> <bindings location="1218:27-1218:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="1218:35-1218:45" stringSymbol="category"/> @@ -5910,7 +6240,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1219:3-1219:64" varName="description" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1219:15-1219:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/448"/> </type> <bindings location="1219:30-1219:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="1219:38-1219:51" stringSymbol="description"/> @@ -5921,7 +6251,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1220:3-1220:62" varName="doccomment" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1220:14-1220:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/449"/> </type> <bindings location="1220:29-1220:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="1220:37-1220:49" stringSymbol="doccomment"/> @@ -5932,7 +6262,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1221:3-1221:59" varName="localize" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1221:12-1221:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/450"/> </type> <bindings location="1221:27-1221:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1221:33-1221:43" stringSymbol="localize"/> @@ -5943,7 +6273,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1222:3-1222:79" varName="isordered" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1222:13-1222:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/451"/> </type> <bindings location="1222:28-1222:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="1222:34-1222:45" stringSymbol="isordered"/> @@ -5958,7 +6288,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1223:3-1223:99" varName="isnavigable" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.2/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="1223:17-1223:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/452"/> </type> <bindings location="1223:32-1223:57" propertyName="name"> <value xsi:type="ocl:StringExp" location="1223:40-1223:57" stringSymbol="isnavigablefrom"/> @@ -5972,8 +6302,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1228:3-1228:64" varName="source" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.8"> + <commentsBefore>------------</commentsBefore> + <commentsBefore>-- Source --</commentsBefore> + <commentsBefore>------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1228:12-1228:23" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/453"/> </type> <bindings location="1228:24-1228:38" propertyName="name"> <value xsi:type="ocl:StringExp" location="1228:30-1228:38" stringSymbol="source"/> @@ -5987,7 +6320,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1229:4-1229:57" varName="ts" variableExp="//@elements.19/@outPattern/@elements.17/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1229:9-1229:17" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/454"/> </type> <bindings location="1229:18-1229:31" propertyName="name"> <value xsi:type="ocl:StringExp" location="1229:24-1229:31" stringSymbol="#text"/> @@ -6001,8 +6334,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1234:3-1234:60" varName="type" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.9"> + <commentsBefore>----------</commentsBefore> + <commentsBefore>-- Type --</commentsBefore> + <commentsBefore>----------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1234:10-1234:21" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/455"/> </type> <bindings location="1234:22-1234:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="1234:28-1234:34" stringSymbol="type"/> @@ -6016,7 +6352,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1235:4-1235:55" varName="tt" variableExp="//@elements.19/@outPattern/@elements.19/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1235:9-1235:17" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/456"/> </type> <bindings location="1235:18-1235:31" propertyName="name"> <value xsi:type="ocl:StringExp" location="1235:24-1235:31" stringSymbol="#text"/> @@ -6030,8 +6366,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1240:3-1244:4" varName="genProp" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@elements.10"> + <commentsBefore>-----------------------</commentsBefore> + <commentsBefore>-- GeneratedProperty --</commentsBefore> + <commentsBefore>-----------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1240:13-1240:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/457"/> </type> <bindings location="1241:4-1241:31" propertyName="name"> <value xsi:type="ocl:StringExp" location="1241:12-1241:31" stringSymbol="generatedProperty"/> @@ -6049,7 +6388,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1245:3-1245:58" varName="genName" variableExp="//@elements.19/@outPattern/@elements.21/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1245:13-1245:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/458"/> </type> <bindings location="1245:27-1245:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="1245:35-1245:41" stringSymbol="name"/> @@ -6062,7 +6401,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1246:3-1246:85" varName="genIdentity" variableExp="//@elements.19/@outPattern/@elements.21/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1246:17-1246:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/459"/> </type> <bindings location="1246:31-1246:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="1246:39-1246:49" stringSymbol="identity"/> @@ -6070,14 +6409,14 @@ <bindings location="1246:50-1246:84" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1246:59-1246:84" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1246:59-1246:69"> - <referredVariable href="temp#/79"/> + <referredVariable href="new-model#/460"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1247:3-1247:84" varName="genRefType" variableExp="//@elements.19/@outPattern/@elements.21/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1247:16-1247:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/461"/> </type> <bindings location="1247:28-1247:51" propertyName="name"> <value xsi:type="ocl:StringExp" location="1247:36-1247:51" stringSymbol="referenceType"/> @@ -6091,7 +6430,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1248:3-1248:64" varName="refText" variableExp="//@elements.19/@outPattern/@elements.24/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1248:13-1248:21" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/462"/> </type> <bindings location="1248:23-1248:38" propertyName="name"> <value xsi:type="ocl:StringExp" location="1248:31-1248:38" stringSymbol="#text"/> @@ -6108,16 +6447,23 @@ <inPattern location="1181:2-1182:15"> <elements xsi:type="atl:SimpleInPatternElement" location="1182:3-1182:15" varName="e" variableExp="//@elements.19/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.19/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.19/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.19/@outPattern/@elements.4/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.6/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.7/@bindings.1/@value/@source //@elements.19/@outPattern/@elements.15/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.16/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.18/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.20/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.22/@bindings.1/@value/@source //@elements.19/@outPattern/@elements.25/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="1182:7-1182:15" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/435"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="1253:1-1346:2" name="SimpleProperty"> + <commentsBefore>-- Rule 'SimpleProperty'.</commentsBefore> + <commentsBefore>-- This rule generates the Properties of simples types</commentsBefore> + <commentsAfter>-- Rule 'EnumerationProperty'.</commentsAfter> + <commentsAfter>-- This rule generates the Properties which type is an Enumeration</commentsAfter> <outPattern location="1256:2-1345:61"> <elements xsi:type="atl:SimpleOutPatternElement" location="1260:3-1264:4" varName="v"> + <commentsBefore>--------------</commentsBefore> + <commentsBefore>-- Property --</commentsBefore> + <commentsBefore>--------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1260:7-1260:18" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/465"/> </type> <bindings location="1261:4-1261:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="1261:10-1261:20" stringSymbol="property"/> @@ -6137,7 +6483,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1265:3-1265:51" varName="name" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1265:10-1265:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/466"/> </type> <bindings location="1265:24-1265:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="1265:30-1265:36" stringSymbol="name"/> @@ -6150,7 +6496,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1266:3-1266:63" varName="identity" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1266:14-1266:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/467"/> </type> <bindings location="1266:28-1266:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1266:34-1266:44" stringSymbol="identity"/> @@ -6163,7 +6509,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1267:3-1267:51" varName="id" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1267:8-1267:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/468"/> </type> <bindings location="1267:22-1267:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="1267:28-1267:32" stringSymbol="id"/> @@ -6175,8 +6521,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1271:3-1281:4" varName="mdfmetadata" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1271:16-1271:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/469"/> </type> <bindings location="1272:4-1272:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="1272:10-1272:23" stringSymbol="mdfmetadata"/> @@ -6205,7 +6554,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1282:3-1283:4" varName="xsitype" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1282:11-1282:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/470"/> </type> <bindings location="1282:26-1282:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="1282:32-1282:42" stringSymbol="xsi:type"/> @@ -6216,7 +6565,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1284:3-1284:72" varName="accessmodifier" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1284:18-1284:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/471"/> </type> <bindings location="1284:33-1284:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="1284:39-1284:55" stringSymbol="accessmodifier"/> @@ -6227,7 +6576,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1285:3-1285:56" varName="category" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1285:12-1285:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/472"/> </type> <bindings location="1285:27-1285:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1285:33-1285:43" stringSymbol="category"/> @@ -6238,7 +6587,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1286:3-1286:62" varName="description" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1286:15-1286:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/473"/> </type> <bindings location="1286:30-1286:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="1286:36-1286:49" stringSymbol="description"/> @@ -6249,7 +6598,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1287:3-1287:60" varName="doccomment" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1287:14-1287:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/474"/> </type> <bindings location="1287:29-1287:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="1287:35-1287:47" stringSymbol="doccomment"/> @@ -6260,7 +6609,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1288:3-1288:59" varName="localize" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1288:12-1288:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/475"/> </type> <bindings location="1288:27-1288:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1288:33-1288:43" stringSymbol="localize"/> @@ -6271,7 +6620,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1289:3-1289:70" varName="xpathexpression" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1289:19-1289:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/476"/> </type> <bindings location="1289:34-1289:57" propertyName="name"> <value xsi:type="ocl:StringExp" location="1289:40-1289:57" stringSymbol="xpathexpression"/> @@ -6282,7 +6631,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1290:3-1290:84" varName="reversexpathexpression" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="1290:26-1290:39" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/477"/> </type> <bindings location="1290:41-1290:71" propertyName="name"> <value xsi:type="ocl:StringExp" location="1290:47-1290:71" stringSymbol="reversexpathexpression"/> @@ -6293,7 +6642,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1291:3-1291:74" varName="realattributename" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.8"> <type xsi:type="ocl:OclModelElement" location="1291:21-1291:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/478"/> </type> <bindings location="1291:36-1291:61" propertyName="name"> <value xsi:type="ocl:StringExp" location="1291:42-1291:61" stringSymbol="realattributename"/> @@ -6304,7 +6653,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1292:3-1292:76" varName="proxyattributename" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.9"> <type xsi:type="ocl:OclModelElement" location="1292:22-1292:35" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/479"/> </type> <bindings location="1292:37-1292:63" propertyName="name"> <value xsi:type="ocl:StringExp" location="1292:43-1292:63" stringSymbol="proxyattributename"/> @@ -6315,7 +6664,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1293:3-1293:69" varName="customstorage" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.10"> <type xsi:type="ocl:OclModelElement" location="1293:17-1293:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/480"/> </type> <bindings location="1293:32-1293:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="1293:38-1293:53" stringSymbol="customstorage"/> @@ -6326,7 +6675,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1294:3-1294:63" varName="allownulls" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.11"> <type xsi:type="ocl:OclModelElement" location="1294:14-1294:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/481"/> </type> <bindings location="1294:29-1294:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="1294:35-1294:47" stringSymbol="allownulls"/> @@ -6337,7 +6686,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1295:3-1295:75" varName="readwritestate" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.12"> <type xsi:type="ocl:OclModelElement" location="1295:18-1295:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/482"/> </type> <bindings location="1295:33-1295:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="1295:39-1295:55" stringSymbol="readwritestate"/> @@ -6348,7 +6697,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1296:3-1296:46" varName="tag" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.13"> <type xsi:type="ocl:OclModelElement" location="1296:7-1296:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/483"/> </type> <bindings location="1296:22-1296:33" propertyName="name"> <value xsi:type="ocl:StringExp" location="1296:28-1296:33" stringSymbol="tag"/> @@ -6358,8 +6707,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1301:3-1305:4" varName="propertyInfo" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> + <commentsBefore>------------------</commentsBefore> + <commentsBefore>-- PropertyInfo --</commentsBefore> + <commentsBefore>------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1301:17-1301:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/484"/> </type> <bindings location="1302:4-1302:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="1302:10-1302:24" stringSymbol="propertyInfo"/> @@ -6380,7 +6732,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1306:3-1306:80" varName="xsitypePI" variableExp="//@elements.20/@outPattern/@elements.19/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1306:13-1306:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/485"/> </type> <bindings location="1306:28-1306:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1306:34-1306:44" stringSymbol="xsi:type"/> @@ -6398,7 +6750,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1307:3-1307:51" varName="namePI" variableExp="//@elements.20/@outPattern/@elements.19/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1307:12-1307:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/486"/> </type> <bindings location="1307:26-1307:38" propertyName="name"> <value xsi:type="ocl:StringExp" location="1307:32-1307:38" stringSymbol="name"/> @@ -6409,7 +6761,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1308:3-1308:80" varName="identityPI" variableExp="//@elements.20/@outPattern/@elements.19/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1308:16-1308:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/487"/> </type> <bindings location="1308:30-1308:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="1308:36-1308:46" stringSymbol="identity"/> @@ -6417,14 +6769,14 @@ <bindings location="1308:47-1308:79" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1308:54-1308:79" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1308:54-1308:64"> - <referredVariable href="temp#/80"/> + <referredVariable href="new-model#/488"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1309:3-1313:4" varName="default" variableExp="//@elements.20/@outPattern/@elements.19/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1309:13-1309:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/489"/> </type> <bindings location="1310:4-1310:19" propertyName="name"> <value xsi:type="ocl:StringExp" location="1310:10-1310:19" stringSymbol="default"/> @@ -6446,7 +6798,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1314:3-1319:13" varName="max" variableExp="//@elements.20/@outPattern/@elements.19/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1314:9-1314:22" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/490"/> </type> <bindings location="1315:4-1315:15" propertyName="name"> <value xsi:type="ocl:StringExp" location="1315:10-1315:15" stringSymbol="max"/> @@ -6468,7 +6820,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1320:3-1324:13" varName="min" variableExp="//@elements.20/@outPattern/@elements.19/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1320:9-1320:22" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/491"/> </type> <bindings location="1320:23-1320:34" propertyName="name"> <value xsi:type="ocl:StringExp" location="1320:29-1320:34" stringSymbol="min"/> @@ -6489,8 +6841,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1329:3-1337:4" varName="ValuetreeExp"> + <commentsBefore>-----------------------------</commentsBefore> + <commentsBefore>-- ValuePropertyExpression --</commentsBefore> + <commentsBefore>-----------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1329:18-1329:29" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/492"/> </type> <bindings location="1330:4-1330:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="1330:12-1330:28" stringSymbol="treeExpression"/> @@ -6511,7 +6866,7 @@ <bindings location="1336:4-1336:67" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="1336:14-1336:67" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1336:14-1336:24"> - <referredVariable href="temp#/81"/> + <referredVariable href="new-model#/493"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="1336:37-1336:56" name="domainModel"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="1336:37-1336:44" name="owner"> @@ -6524,7 +6879,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1339:3-1339:83" varName="reXsiType" variableExp="//@elements.20/@outPattern/@elements.26/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1339:15-1339:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/494"/> </type> <bindings location="1339:29-1339:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="1339:37-1339:47" stringSymbol="xsi:type"/> @@ -6535,7 +6890,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1340:3-1340:57" varName="reName" variableExp="//@elements.20/@outPattern/@elements.26/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1340:12-1340:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/495"/> </type> <bindings location="1340:26-1340:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="1340:34-1340:40" stringSymbol="name"/> @@ -6548,7 +6903,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1341:3-1341:89" varName="ValuereIdentity" variableExp="//@elements.20/@outPattern/@elements.26/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1341:21-1341:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/496"/> </type> <bindings location="1341:35-1341:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="1341:43-1341:53" stringSymbol="identity"/> @@ -6556,14 +6911,14 @@ <bindings location="1341:54-1341:88" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1341:63-1341:88" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1341:63-1341:73"> - <referredVariable href="temp#/82"/> + <referredVariable href="new-model#/497"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1342:3-1342:72" varName="ValuereId" variableExp="//@elements.20/@outPattern/@elements.26/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1342:15-1342:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/498"/> </type> <bindings location="1342:29-1342:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="1342:37-1342:41" stringSymbol="id"/> @@ -6571,14 +6926,14 @@ <bindings location="1342:42-1342:71" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1342:51-1342:71" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="1342:51-1342:61"> - <referredVariable href="temp#/83"/> + <referredVariable href="new-model#/499"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1343:3-1343:59" varName="Valuesource" variableExp="//@elements.20/@outPattern/@elements.26/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1343:17-1343:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/500"/> </type> <bindings location="1343:30-1343:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="1343:38-1343:46" stringSymbol="source"/> @@ -6589,7 +6944,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1344:3-1344:83" varName="property" variableExp="//@elements.20/@outPattern/@elements.26/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1344:14-1344:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/501"/> </type> <bindings location="1344:27-1344:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="1344:35-1344:45" stringSymbol="property"/> @@ -6603,7 +6958,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1345:3-1345:61" varName="propertyText" variableExp="//@elements.20/@outPattern/@elements.32/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1345:18-1345:26" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/502"/> </type> <bindings location="1345:27-1345:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="1345:33-1345:40" stringSymbol="#text"/> @@ -6618,7 +6973,7 @@ <inPattern location="1254:2-1255:61"> <elements xsi:type="atl:SimpleInPatternElement" location="1255:3-1255:24" varName="e" variableExp="//@elements.20/@inPattern/@filter/@source/@source //@elements.20/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.20/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.20/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.20/@outPattern/@elements.20/@bindings.1/@value/@source/@source/@source //@elements.20/@outPattern/@elements.23/@bindings.1/@value/@condition/@source/@source/@source //@elements.20/@outPattern/@elements.24/@bindings.1/@value/@condition/@source/@source/@source //@elements.20/@outPattern/@elements.25/@bindings.1/@value/@condition/@source/@source/@source //@elements.20/@outPattern/@elements.26/@bindings.3/@value/@arguments.0/@source/@source //@elements.20/@outPattern/@elements.28/@bindings.1/@value/@source //@elements.20/@outPattern/@elements.33/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="1255:7-1255:24" name="ValueProperty"> - <model href="temp#/1"/> + <model href="new-model#/463"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="1255:26-1255:60" operationName="oclIsTypeOf"> @@ -6626,16 +6981,23 @@ <source xsi:type="ocl:VariableExp" location="1255:26-1255:27" referredVariable="//@elements.20/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="1255:45-1255:59" name="SimpleType"> - <model href="temp#/1"/> + <model href="new-model#/464"/> </arguments> </filter> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="1350:1-1429:2" name="EnumerationProperty"> + <commentsBefore>-- Rule 'EnumerationProperty'.</commentsBefore> + <commentsBefore>-- This rule generates the Properties which type is an Enumeration</commentsBefore> + <commentsAfter>-- Rule 'Enumeration'.</commentsAfter> + <commentsAfter>-- This rule generates an Enumeration</commentsAfter> <outPattern location="1353:2-1428:61"> <elements xsi:type="atl:SimpleOutPatternElement" location="1357:3-1361:4" varName="v"> + <commentsBefore>--------------</commentsBefore> + <commentsBefore>-- Property --</commentsBefore> + <commentsBefore>--------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1357:7-1357:18" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/505"/> </type> <bindings location="1358:4-1358:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="1358:10-1358:20" stringSymbol="property"/> @@ -6655,7 +7017,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1362:3-1362:51" varName="name" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1362:10-1362:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/506"/> </type> <bindings location="1362:24-1362:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="1362:30-1362:36" stringSymbol="name"/> @@ -6668,7 +7030,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1363:3-1363:63" varName="identity" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1363:14-1363:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/507"/> </type> <bindings location="1363:28-1363:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1363:34-1363:44" stringSymbol="identity"/> @@ -6681,7 +7043,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1364:3-1364:51" varName="id" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1364:8-1364:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/508"/> </type> <bindings location="1364:22-1364:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="1364:28-1364:32" stringSymbol="id"/> @@ -6693,8 +7055,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1368:3-1378:4" varName="mdfmetadata" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> + <commentsBefore>-----------------</commentsBefore> + <commentsBefore>-- MdfMetaData --</commentsBefore> + <commentsBefore>-----------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1368:16-1368:27" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/509"/> </type> <bindings location="1369:4-1369:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="1369:10-1369:23" stringSymbol="mdfmetadata"/> @@ -6723,7 +7088,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1379:3-1379:72" varName="xsitype" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1379:11-1379:24" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/510"/> </type> <bindings location="1379:26-1379:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="1379:32-1379:42" stringSymbol="xsi:type"/> @@ -6734,7 +7099,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1380:3-1380:72" varName="accessmodifier" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1380:18-1380:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/511"/> </type> <bindings location="1380:33-1380:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="1380:39-1380:55" stringSymbol="accessmodifier"/> @@ -6745,7 +7110,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1381:3-1381:56" varName="category" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1381:12-1381:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/512"/> </type> <bindings location="1381:27-1381:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1381:33-1381:43" stringSymbol="category"/> @@ -6756,7 +7121,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1382:3-1382:62" varName="description" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1382:15-1382:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/513"/> </type> <bindings location="1382:30-1382:49" propertyName="name"> <value xsi:type="ocl:StringExp" location="1382:36-1382:49" stringSymbol="description"/> @@ -6767,7 +7132,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1383:3-1383:60" varName="doccomment" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1383:14-1383:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/514"/> </type> <bindings location="1383:29-1383:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="1383:35-1383:47" stringSymbol="doccomment"/> @@ -6778,7 +7143,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1384:3-1384:59" varName="localize" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1384:12-1384:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/515"/> </type> <bindings location="1384:27-1384:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1384:33-1384:43" stringSymbol="localize"/> @@ -6789,7 +7154,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1385:3-1385:70" varName="xpathexpression" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="1385:19-1385:32" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/516"/> </type> <bindings location="1385:34-1385:57" propertyName="name"> <value xsi:type="ocl:StringExp" location="1385:40-1385:57" stringSymbol="xpathexpression"/> @@ -6800,7 +7165,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1386:3-1386:84" varName="reversexpathexpression" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="1386:26-1386:39" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/517"/> </type> <bindings location="1386:41-1386:71" propertyName="name"> <value xsi:type="ocl:StringExp" location="1386:47-1386:71" stringSymbol="reversexpathexpression"/> @@ -6811,7 +7176,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1387:3-1387:74" varName="realattributename" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.8"> <type xsi:type="ocl:OclModelElement" location="1387:21-1387:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/518"/> </type> <bindings location="1387:36-1387:61" propertyName="name"> <value xsi:type="ocl:StringExp" location="1387:42-1387:61" stringSymbol="realattributename"/> @@ -6822,7 +7187,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1388:3-1388:76" varName="proxyattributename" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.9"> <type xsi:type="ocl:OclModelElement" location="1388:22-1388:35" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/519"/> </type> <bindings location="1388:37-1388:63" propertyName="name"> <value xsi:type="ocl:StringExp" location="1388:43-1388:63" stringSymbol="proxyattributename"/> @@ -6833,7 +7198,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1389:3-1389:69" varName="customstorage" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.10"> <type xsi:type="ocl:OclModelElement" location="1389:17-1389:30" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/520"/> </type> <bindings location="1389:32-1389:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="1389:38-1389:53" stringSymbol="customstorage"/> @@ -6844,7 +7209,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1390:3-1390:63" varName="allownulls" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.11"> <type xsi:type="ocl:OclModelElement" location="1390:14-1390:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/521"/> </type> <bindings location="1390:29-1390:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="1390:35-1390:47" stringSymbol="allownulls"/> @@ -6855,7 +7220,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1391:3-1391:75" varName="readwritestate" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.12"> <type xsi:type="ocl:OclModelElement" location="1391:18-1391:31" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/522"/> </type> <bindings location="1391:33-1391:55" propertyName="name"> <value xsi:type="ocl:StringExp" location="1391:39-1391:55" stringSymbol="readwritestate"/> @@ -6866,7 +7231,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1392:3-1392:46" varName="tag" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.2/@value/@elements.13"> <type xsi:type="ocl:OclModelElement" location="1392:7-1392:20" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/523"/> </type> <bindings location="1392:22-1392:33" propertyName="name"> <value xsi:type="ocl:StringExp" location="1392:28-1392:33" stringSymbol="tag"/> @@ -6876,8 +7241,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1397:3-1401:4" varName="propertyInfo" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> + <commentsBefore>------------------</commentsBefore> + <commentsBefore>-- PropertyInfo --</commentsBefore> + <commentsBefore>------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1397:17-1397:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/524"/> </type> <bindings location="1398:4-1398:24" propertyName="name"> <value xsi:type="ocl:StringExp" location="1398:10-1398:24" stringSymbol="propertyInfo"/> @@ -6897,7 +7265,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1402:3-1402:78" varName="xsitypePI" variableExp="//@elements.21/@outPattern/@elements.19/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1402:13-1402:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/525"/> </type> <bindings location="1402:28-1402:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1402:34-1402:44" stringSymbol="xsi:type"/> @@ -6908,7 +7276,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1403:3-1403:60" varName="namePI" variableExp="//@elements.21/@outPattern/@elements.19/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1403:12-1403:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/526"/> </type> <bindings location="1403:26-1403:38" propertyName="name"> <value xsi:type="ocl:StringExp" location="1403:32-1403:38" stringSymbol="name"/> @@ -6923,7 +7291,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1404:3-1404:80" varName="identityPI" variableExp="//@elements.21/@outPattern/@elements.19/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1404:16-1404:29" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/527"/> </type> <bindings location="1404:30-1404:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="1404:36-1404:46" stringSymbol="identity"/> @@ -6931,14 +7299,14 @@ <bindings location="1404:47-1404:79" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1404:54-1404:79" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1404:54-1404:64"> - <referredVariable href="temp#/84"/> + <referredVariable href="new-model#/528"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1405:3-1405:67" varName="default" variableExp="//@elements.21/@outPattern/@elements.19/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1405:13-1405:26" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/529"/> </type> <bindings location="1405:27-1405:42" propertyName="name"> <value xsi:type="ocl:StringExp" location="1405:33-1405:42" stringSymbol="default"/> @@ -6956,7 +7324,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1406:3-1406:75" varName="enumeration" variableExp="//@elements.21/@outPattern/@elements.19/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1406:17-1406:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/530"/> </type> <bindings location="1406:29-1406:48" propertyName="name"> <value xsi:type="ocl:StringExp" location="1406:35-1406:48" stringSymbol="enumeration"/> @@ -6967,7 +7335,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1407:3-1407:69" varName="enumerationText" variableExp="//@elements.21/@outPattern/@elements.24/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="1407:21-1407:29" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/531"/> </type> <bindings location="1407:30-1407:43" propertyName="name"> <value xsi:type="ocl:StringExp" location="1407:36-1407:43" stringSymbol="#text"/> @@ -6981,8 +7349,11 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1412:3-1420:4" varName="ValuetreeExp"> + <commentsBefore>-----------------------------</commentsBefore> + <commentsBefore>-- ValuePropertyExpression --</commentsBefore> + <commentsBefore>-----------------------------</commentsBefore> <type xsi:type="ocl:OclModelElement" location="1412:18-1412:29" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/532"/> </type> <bindings location="1413:4-1413:28" propertyName="name"> <value xsi:type="ocl:StringExp" location="1413:12-1413:28" stringSymbol="treeExpression"/> @@ -7003,7 +7374,7 @@ <bindings location="1419:4-1419:67" propertyName="parent"> <value xsi:type="ocl:OperationCallExp" location="1419:14-1419:67" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="1419:14-1419:24"> - <referredVariable href="temp#/85"/> + <referredVariable href="new-model#/533"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="1419:37-1419:56" name="domainModel"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="1419:37-1419:44" name="owner"> @@ -7016,7 +7387,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1422:3-1422:83" varName="reXsiType" variableExp="//@elements.21/@outPattern/@elements.26/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1422:15-1422:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/534"/> </type> <bindings location="1422:29-1422:47" propertyName="name"> <value xsi:type="ocl:StringExp" location="1422:37-1422:47" stringSymbol="xsi:type"/> @@ -7027,7 +7398,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1423:3-1423:57" varName="reName" variableExp="//@elements.21/@outPattern/@elements.26/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1423:12-1423:25" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/535"/> </type> <bindings location="1423:26-1423:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="1423:34-1423:40" stringSymbol="name"/> @@ -7040,7 +7411,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1424:3-1424:89" varName="ValuereIdentity" variableExp="//@elements.21/@outPattern/@elements.26/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1424:21-1424:34" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/536"/> </type> <bindings location="1424:35-1424:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="1424:43-1424:53" stringSymbol="identity"/> @@ -7048,14 +7419,14 @@ <bindings location="1424:54-1424:88" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1424:63-1424:88" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="1424:63-1424:73"> - <referredVariable href="temp#/86"/> + <referredVariable href="new-model#/537"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1425:3-1425:72" varName="ValuereId" variableExp="//@elements.21/@outPattern/@elements.26/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1425:15-1425:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/538"/> </type> <bindings location="1425:29-1425:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="1425:37-1425:41" stringSymbol="id"/> @@ -7063,14 +7434,14 @@ <bindings location="1425:42-1425:71" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="1425:51-1425:71" operationName="makeId2"> <source xsi:type="ocl:VariableExp" location="1425:51-1425:61"> - <referredVariable href="temp#/87"/> + <referredVariable href="new-model#/539"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1426:3-1426:59" varName="Valuesource" variableExp="//@elements.21/@outPattern/@elements.26/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1426:17-1426:28" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/540"/> </type> <bindings location="1426:30-1426:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="1426:38-1426:46" stringSymbol="source"/> @@ -7081,7 +7452,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1427:3-1427:83" varName="property" variableExp="//@elements.21/@outPattern/@elements.26/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="1427:14-1427:25" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/541"/> </type> <bindings location="1427:27-1427:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="1427:35-1427:45" stringSymbol="property"/> @@ -7095,7 +7466,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1428:3-1428:61" varName="propertyText" variableExp="//@elements.21/@outPattern/@elements.32/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="1428:18-1428:26" name="Text"> - <model href="temp#/0"/> + <model href="new-model#/542"/> </type> <bindings location="1428:27-1428:40" propertyName="name"> <value xsi:type="ocl:StringExp" location="1428:33-1428:40" stringSymbol="#text"/> @@ -7110,7 +7481,7 @@ <inPattern location="1351:2-1352:65"> <elements xsi:type="atl:SimpleInPatternElement" location="1352:3-1352:24" varName="e" variableExp="//@elements.21/@inPattern/@filter/@source/@source/@source //@elements.21/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.21/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.21/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.21/@outPattern/@elements.21/@bindings.1/@value/@source/@source //@elements.21/@outPattern/@elements.23/@bindings.1/@value/@source/@source/@source //@elements.21/@outPattern/@elements.25/@bindings.1/@value/@source/@source //@elements.21/@outPattern/@elements.26/@bindings.3/@value/@arguments.0/@source/@source //@elements.21/@outPattern/@elements.28/@bindings.1/@value/@source //@elements.21/@outPattern/@elements.33/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="1352:7-1352:24" name="ValueProperty"> - <model href="temp#/1"/> + <model href="new-model#/503"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="1352:26-1352:64" operationName="not"> @@ -7119,17 +7490,21 @@ <source xsi:type="ocl:VariableExp" location="1352:30-1352:31" referredVariable="//@elements.21/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="1352:49-1352:63" name="SimpleType"> - <model href="temp#/1"/> + <model href="new-model#/504"/> </arguments> </source> </filter> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="1434:1-1448:2" name="Enumeration"> + <commentsBefore>-- Rule 'Enumeration'.</commentsBefore> + <commentsBefore>-- This rule generates an Enumeration</commentsBefore> + <commentsAfter>-- Rule 'EnumerationLiteral'.</commentsAfter> + <commentsAfter>-- This rule generates an single element of an Enumeration</commentsAfter> <outPattern location="1437:2-1447:75"> <elements xsi:type="atl:SimpleOutPatternElement" location="1438:3-1442:4" varName="v"> <type xsi:type="ocl:OclModelElement" location="1438:7-1438:18" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/544"/> </type> <bindings location="1439:4-1439:23" propertyName="name"> <value xsi:type="ocl:StringExp" location="1439:10-1439:23" stringSymbol="enumeration"/> @@ -7149,7 +7524,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1443:3-1443:51" varName="name" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1443:10-1443:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/545"/> </type> <bindings location="1443:24-1443:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="1443:30-1443:36" stringSymbol="name"/> @@ -7162,7 +7537,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1444:3-1444:63" varName="identity" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1444:14-1444:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/546"/> </type> <bindings location="1444:28-1444:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1444:34-1444:44" stringSymbol="identity"/> @@ -7175,7 +7550,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1445:3-1445:66" varName="namespace" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1445:15-1445:28" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/547"/> </type> <bindings location="1445:29-1445:46" propertyName="name"> <value xsi:type="ocl:StringExp" location="1445:35-1445:46" stringSymbol="namespace"/> @@ -7188,7 +7563,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1446:3-1446:51" varName="id" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="1446:8-1446:21" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/548"/> </type> <bindings location="1446:22-1446:32" propertyName="name"> <value xsi:type="ocl:StringExp" location="1446:28-1446:32" stringSymbol="id"/> @@ -7201,7 +7576,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1447:3-1447:75" varName="literals" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="1447:13-1447:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/549"/> </type> <bindings location="1447:25-1447:41" propertyName="name"> <value xsi:type="ocl:StringExp" location="1447:31-1447:41" stringSymbol="literals"/> @@ -7219,16 +7594,18 @@ <inPattern location="1435:2-1436:22"> <elements xsi:type="atl:SimpleInPatternElement" location="1436:3-1436:22" varName="e" variableExp="//@elements.22/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.22/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.22/@outPattern/@elements.3/@bindings.1/@value/@source //@elements.22/@outPattern/@elements.4/@bindings.1/@value/@source //@elements.22/@outPattern/@elements.5/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="1436:7-1436:22" name="Enumeration"> - <model href="temp#/1"/> + <model href="new-model#/543"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="1452:1-1464:2" name="EnumerationLiteral"> + <commentsBefore>-- Rule 'EnumerationLiteral'.</commentsBefore> + <commentsBefore>-- This rule generates an single element of an Enumeration</commentsBefore> <outPattern location="1455:2-1463:65"> <elements xsi:type="atl:SimpleOutPatternElement" location="1456:4-1460:4" varName="v"> <type xsi:type="ocl:OclModelElement" location="1456:8-1456:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/551"/> </type> <bindings location="1457:4-1457:30" propertyName="name"> <value xsi:type="ocl:StringExp" location="1457:10-1457:30" stringSymbol="enumerationLiteral"/> @@ -7246,7 +7623,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1461:3-1461:51" varName="name" variableExp="//@elements.23/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="1461:10-1461:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/552"/> </type> <bindings location="1461:24-1461:36" propertyName="name"> <value xsi:type="ocl:StringExp" location="1461:30-1461:36" stringSymbol="name"/> @@ -7259,7 +7636,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1462:3-1462:63" varName="identity" variableExp="//@elements.23/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="1462:14-1462:27" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/553"/> </type> <bindings location="1462:28-1462:44" propertyName="name"> <value xsi:type="ocl:StringExp" location="1462:34-1462:44" stringSymbol="identity"/> @@ -7272,7 +7649,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="1463:3-1463:65" varName="value" variableExp="//@elements.23/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="1463:10-1463:23" name="Attribute"> - <model href="temp#/0"/> + <model href="new-model#/554"/> </type> <bindings location="1463:25-1463:38" propertyName="name"> <value xsi:type="ocl:StringExp" location="1463:31-1463:38" stringSymbol="value"/> @@ -7289,7 +7666,7 @@ <inPattern location="1453:2-1454:29"> <elements xsi:type="atl:SimpleInPatternElement" location="1454:3-1454:29" varName="e" variableExp="//@elements.23/@outPattern/@elements.1/@bindings.1/@value/@source //@elements.23/@outPattern/@elements.2/@bindings.1/@value/@source //@elements.23/@outPattern/@elements.3/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="1454:7-1454:29" name="EnumerationLiteral"> - <model href="temp#/1"/> + <model href="new-model#/550"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/EMF2DSL/KM32DSL/KM32DSL.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/EMF2DSL/KM32DSL/KM32DSL.atl.xmi index 572fcdb5..5c7788dc 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/EMF2DSL/KM32DSL/KM32DSL.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/MetamodelBridge/EMF2DSL/KM32DSL/KM32DSL.atl.xmi @@ -1,12 +1,19 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="4:1-374:2" name="KM32DSL"> + <commentsBefore>-- Ecore to DSL</commentsBefore> + <commentsBefore>-- first transformation : KM3 to DSL</commentsBefore> <inModels location="5:23-5:31" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="5:8-5:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="13:1-13:33"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- Those helper store integer values used to assign ID or to difference similar names</commentsBefore> + <commentsBefore>-- RETURN: Integer</commentsBefore> <definition location="13:8-13:32"> <feature xsi:type="ocl:Attribute" location="13:13-13:32" name="curId"> <initExpression xsi:type="ocl:IntegerExp" location="13:31-13:32" integerSymbol="0"/> @@ -15,6 +22,9 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="14:1-14:33"> + <commentsAfter>-- This helper increments diff1 value</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Integer</commentsAfter> <definition location="14:8-14:32"> <feature xsi:type="ocl:Attribute" location="14:13-14:32" name="diff1"> <initExpression xsi:type="ocl:IntegerExp" location="14:31-14:32" integerSymbol="0"/> @@ -23,19 +33,22 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="19:1-20:59"> + <commentsBefore>-- This helper increments diff1 value</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Integer</commentsBefore> <definition location="19:8-20:58"> <feature xsi:type="ocl:Operation" location="19:13-20:58" name="incDiff1"> <returnType xsi:type="ocl:IntegerType" location="19:26-19:33"/> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="20:1-20:58" name="diff1"> <source xsi:type="ocl:OperationCallExp" location="20:1-20:52" operationName="refSetValue"> <source xsi:type="ocl:VariableExp" location="20:1-20:11"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/2"/> </source> <arguments xsi:type="ocl:StringExp" location="20:24-20:31" stringSymbol="diff1"/> <arguments xsi:type="ocl:OperatorCallExp" location="20:33-20:51" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="20:33-20:49" name="diff1"> <source xsi:type="ocl:VariableExp" location="20:33-20:43"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/3"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="20:50-20:51" integerSymbol="1"/> @@ -46,6 +59,9 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="22:1-22:33"> + <commentsAfter>-- This helper increments diff1 value</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Integer</commentsAfter> <definition location="22:8-22:32"> <feature xsi:type="ocl:Attribute" location="22:13-22:32" name="diff2"> <initExpression xsi:type="ocl:IntegerExp" location="22:31-22:32" integerSymbol="0"/> @@ -54,19 +70,25 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="27:1-28:59"> + <commentsBefore>-- This helper increments diff1 value</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Integer</commentsBefore> + <commentsAfter>-- This helper stores the namespace</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="27:8-28:58"> <feature xsi:type="ocl:Operation" location="27:13-28:58" name="incDiff2"> <returnType xsi:type="ocl:IntegerType" location="27:26-27:33"/> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="28:1-28:58" name="diff2"> <source xsi:type="ocl:OperationCallExp" location="28:1-28:52" operationName="refSetValue"> <source xsi:type="ocl:VariableExp" location="28:1-28:11"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/4"/> </source> <arguments xsi:type="ocl:StringExp" location="28:24-28:31" stringSymbol="diff2"/> <arguments xsi:type="ocl:OperatorCallExp" location="28:33-28:51" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="28:33-28:49" name="diff2"> <source xsi:type="ocl:VariableExp" location="28:33-28:43"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/5"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="28:50-28:51" integerSymbol="1"/> @@ -77,6 +99,12 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="33:1-33:49"> + <commentsBefore>-- This helper stores the namespace</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper sets the namespace</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="33:8-33:48"> <feature xsi:type="ocl:Attribute" location="33:13-33:48" name="Namespace"> <initExpression xsi:type="ocl:StringExp" location="33:34-33:48" stringSymbol=".DomainModel"/> @@ -85,24 +113,33 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="38:1-39:80"> + <commentsBefore>-- This helper sets the namespace</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper computes the value to be assigned to the ID field of a</commentsAfter> + <commentsAfter>-- generated Task. </commentsAfter> + <commentsAfter>-- It increments the value stored by the "curId" helper and returns its</commentsAfter> + <commentsAfter>-- new value as a String.</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="38:8-39:79"> <feature xsi:type="ocl:Operation" location="38:33-39:79" name="setNamespace"> <returnType xsi:type="ocl:StringType" location="38:50-38:56"/> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="39:2-39:79" name="Namespace"> <source xsi:type="ocl:OperationCallExp" location="39:2-39:69" operationName="refSetValue"> <source xsi:type="ocl:VariableExp" location="39:2-39:12"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/7"/> </source> <arguments xsi:type="ocl:StringExp" location="39:25-39:36" stringSymbol="Namespace"/> <arguments xsi:type="ocl:OperatorCallExp" location="39:38-39:68" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="39:38-39:47" name="name"> <source xsi:type="ocl:VariableExp" location="39:38-39:42"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/8"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="39:48-39:68" name="Namespace"> <source xsi:type="ocl:VariableExp" location="39:48-39:58"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/9"/> </source> </arguments> </arguments> @@ -111,12 +148,22 @@ </feature> <context_ location="38:8-38:27"> <context_ xsi:type="ocl:OclModelElement" location="38:16-38:27" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="47:1-56:8"> + <commentsBefore>-- This helper computes the value to be assigned to the ID field of a</commentsBefore> + <commentsBefore>-- generated Task. </commentsBefore> + <commentsBefore>-- It increments the value stored by the "curId" helper and returns its</commentsBefore> + <commentsBefore>-- new value as a String.</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper get a list of references which need to be turned</commentsAfter> + <commentsAfter>-- into relationship</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(KM3!Reference)</commentsAfter> <definition location="47:8-56:7"> <feature xsi:type="ocl:Operation" location="47:13-56:7" name="makeIdentity"> <returnType xsi:type="ocl:StringType" location="47:30-47:36"/> @@ -126,13 +173,13 @@ <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="48:20-48:79" name="curId"> <source xsi:type="ocl:OperationCallExp" location="48:20-48:73" operationName="refSetValue"> <source xsi:type="ocl:VariableExp" location="48:20-48:30"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/10"/> </source> <arguments xsi:type="ocl:StringExp" location="48:43-48:50" stringSymbol="curId"/> <arguments xsi:type="ocl:OperatorCallExp" location="48:52-48:72" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="48:52-48:68" name="curId"> <source xsi:type="ocl:VariableExp" location="48:52-48:62"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/11"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="48:71-48:72" integerSymbol="1"/> @@ -190,12 +237,19 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="62:1-85:3"> + <commentsBefore>-- This helper get a list of references which need to be turned</commentsBefore> + <commentsBefore>-- into relationship</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(KM3!Reference)</commentsBefore> + <commentsAfter>-- This helper get the list of all references</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(KM3!Reference)</commentsAfter> <definition location="62:8-85:2"> <feature xsi:type="ocl:Attribute" location="62:13-85:2" name="list"> <initExpression xsi:type="ocl:IterateExp" location="63:1-85:2"> <source xsi:type="ocl:OperationCallExp" location="63:1-63:15" operationName="getRefs"> <source xsi:type="ocl:VariableExp" location="63:1-63:5"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/13"/> </source> </source> <body xsi:type="ocl:IfExp" location="64:2-84:8"> @@ -224,11 +278,14 @@ </condition> <elseExpression xsi:type="ocl:IfExp" location="70:6-82:8"> <thenExpression xsi:type="ocl:IfExp" location="73:4-78:9"> + <commentsBefore>-- EMBEDDING </commentsBefore> <thenExpression xsi:type="ocl:OperationCallExp" location="75:9-75:22" operationName="append"> + <commentsAfter>-- e.opposite is the first role</commentsAfter> <source xsi:type="ocl:VariableExp" location="75:9-75:12" referredVariable="//@elements.8/@definition/@feature/@initExpression/@result"/> <arguments xsi:type="ocl:VariableExp" location="75:20-75:21" referredVariable="//@elements.8/@definition/@feature/@initExpression/@iterators.0"/> </thenExpression> <condition xsi:type="ocl:NavigationOrAttributeCallExp" location="73:7-73:20" name="isContainer"> + <commentsAfter>-- e is the first role</commentsAfter> <source xsi:type="ocl:VariableExp" location="73:7-73:8" referredVariable="//@elements.8/@definition/@feature/@initExpression/@iterators.0"/> </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="77:9-77:31" operationName="append"> @@ -242,7 +299,10 @@ <source xsi:type="ocl:VariableExp" location="70:9-70:10" referredVariable="//@elements.8/@definition/@feature/@initExpression/@iterators.0"/> </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="81:4-81:17" operationName="append"> - <source xsi:type="ocl:VariableExp" location="81:4-81:7" referredVariable="//@elements.8/@definition/@feature/@initExpression/@result"/> + <commentsBefore>-- REFERENCE</commentsBefore> + <source xsi:type="ocl:VariableExp" location="81:4-81:7" referredVariable="//@elements.8/@definition/@feature/@initExpression/@result"> + <commentsBefore>-- REFERENCE</commentsBefore> + </source> <arguments xsi:type="ocl:VariableExp" location="81:15-81:16" referredVariable="//@elements.8/@definition/@feature/@initExpression/@iterators.0"/> </elseExpression> </elseExpression> @@ -252,7 +312,7 @@ <result location="63:28-63:70" varName="seq" variableExp="//@elements.8/@definition/@feature/@initExpression/@body/@thenExpression/@source //@elements.8/@definition/@feature/@initExpression/@body/@elseExpression/@condition/@source/@source //@elements.8/@definition/@feature/@initExpression/@body/@elseExpression/@condition/@arguments.0/@source //@elements.8/@definition/@feature/@initExpression/@body/@elseExpression/@thenExpression //@elements.8/@definition/@feature/@initExpression/@body/@elseExpression/@elseExpression/@thenExpression/@thenExpression/@source //@elements.8/@definition/@feature/@initExpression/@body/@elseExpression/@elseExpression/@thenExpression/@elseExpression/@source //@elements.8/@definition/@feature/@initExpression/@body/@elseExpression/@elseExpression/@elseExpression/@source"> <type xsi:type="ocl:SequenceType" location="63:34-63:57"> <elementType xsi:type="ocl:OclModelElement" location="63:43-63:56" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="63:60-63:70"/> @@ -260,24 +320,30 @@ </initExpression> <type xsi:type="ocl:SequenceType" location="62:18-62:41"> <elementType xsi:type="ocl:OclModelElement" location="62:27-62:40" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="90:1-94:5"> + <commentsBefore>-- This helper get the list of all references</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(KM3!Reference)</commentsBefore> + <commentsAfter>-- This helper get the list of the references owned by a class</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(KM3!Reference)</commentsAfter> <definition location="90:8-94:4"> <feature xsi:type="ocl:Operation" location="90:13-94:4" name="getRefs"> <returnType xsi:type="ocl:SequenceType" location="90:25-90:48"> <elementType xsi:type="ocl:OclModelElement" location="90:34-90:47" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </elementType> </returnType> <body xsi:type="ocl:IterateExp" location="91:2-94:4"> <source xsi:type="ocl:OperationCallExp" location="91:2-91:19" operationName="getClasses"> <source xsi:type="ocl:VariableExp" location="91:2-91:6"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/16"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="93:4-93:27" operationName="union"> @@ -290,7 +356,7 @@ <result location="92:16-92:59" varName="acc" variableExp="//@elements.9/@definition/@feature/@body/@body/@source"> <type xsi:type="ocl:SequenceType" location="92:22-92:45"> <elementType xsi:type="ocl:OclModelElement" location="92:31-92:44" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="92:48-92:59"/> @@ -300,24 +366,30 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="99:1-102:18"> + <commentsBefore>-- This helper get the list of the references owned by a class</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(KM3!Reference)</commentsBefore> + <commentsAfter>-- This helper get the list of all classes</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(KM3!Class)</commentsAfter> <definition location="99:8-102:17"> <feature xsi:type="ocl:Operation" location="99:31-102:17" name="getRefs"> <returnType xsi:type="ocl:SequenceType" location="99:43-99:66"> <elementType xsi:type="ocl:OclModelElement" location="99:52-99:65" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </elementType> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="100:2-102:17" operationName="asSequence"> <source xsi:type="ocl:IteratorExp" location="100:2-101:45" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="100:2-100:25" name="structuralFeatures"> <source xsi:type="ocl:VariableExp" location="100:2-100:6"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/20"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="101:16-101:44" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="101:16-101:17" referredVariable="//@elements.10/@definition/@feature/@body/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="101:30-101:43" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </arguments> </body> <iterators location="101:12-101:13" varName="e" variableExp="//@elements.10/@definition/@feature/@body/@source/@body/@source"/> @@ -326,17 +398,23 @@ </feature> <context_ location="99:8-99:25"> <context_ xsi:type="ocl:OclModelElement" location="99:16-99:25" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="107:1-113:19"> + <commentsBefore>-- This helper get the list of all classes</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(KM3!Class)</commentsBefore> + <commentsAfter>-- This helper get the list of all enumerations</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(KM3!Enumeration)</commentsAfter> <definition location="107:8-113:18"> <feature xsi:type="ocl:Operation" location="107:13-113:18" name="getClasses"> <returnType xsi:type="ocl:SequenceType" location="107:28-107:47"> <elementType xsi:type="ocl:OclModelElement" location="107:37-107:46" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/22"/> </elementType> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="108:2-113:18" operationName="asSequence"> @@ -347,7 +425,7 @@ <source xsi:type="ocl:IteratorExp" location="108:2-109:41" name="select"> <source xsi:type="ocl:OperationCallExp" location="108:2-108:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="108:2-108:13" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/23"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="109:16-109:40" operationName="<>"> @@ -364,7 +442,7 @@ <body xsi:type="ocl:OperationCallExp" location="112:17-112:41" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="112:17-112:18" referredVariable="//@elements.11/@definition/@feature/@body/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="112:31-112:40" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </arguments> </body> <iterators location="112:13-112:14" varName="e" variableExp="//@elements.11/@definition/@feature/@body/@source/@body/@source"/> @@ -374,24 +452,30 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="118:1-119:73"> + <commentsBefore>-- This helper get the list of all enumerations</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(KM3!Enumeration)</commentsBefore> + <commentsAfter>-- This helper get the list of all Datatypes</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(KM3!DataType)</commentsAfter> <definition location="118:8-119:72"> <feature xsi:type="ocl:Operation" location="118:33-119:72" name="getEnumerations"> <returnType xsi:type="ocl:SequenceType" location="118:53-118:78"> <elementType xsi:type="ocl:OclModelElement" location="118:62-118:77" name="Enumeration"> - <model href="temp#/1"/> + <model href="new-model#/26"/> </elementType> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="119:3-119:72" operationName="asSequence"> <source xsi:type="ocl:IteratorExp" location="119:3-119:58" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="119:3-119:16" name="contents"> <source xsi:type="ocl:VariableExp" location="119:3-119:7"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/27"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="119:27-119:57" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="119:27-119:28" referredVariable="//@elements.12/@definition/@feature/@body/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="119:41-119:56" name="Enumeration"> - <model href="temp#/1"/> + <model href="new-model#/28"/> </arguments> </body> <iterators location="119:25-119:26" varName="e" variableExp="//@elements.12/@definition/@feature/@body/@source/@body/@source"/> @@ -400,35 +484,47 @@ </feature> <context_ location="118:8-118:27"> <context_ xsi:type="ocl:OclModelElement" location="118:16-118:27" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/25"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="124:1-125:45"> + <commentsBefore>-- This helper get the list of all Datatypes</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(KM3!DataType)</commentsBefore> + <commentsAfter>-- This helper checks the Unbounded constraint</commentsAfter> + <commentsAfter>-- CONTEXT: KM3!Reference</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="124:8-125:44"> <feature xsi:type="ocl:Operation" location="124:33-125:44" name="getTypes"> <returnType xsi:type="ocl:SequenceType" location="124:46-124:68"> <elementType xsi:type="ocl:OclModelElement" location="124:55-124:67" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/30"/> </elementType> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="125:3-125:44" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="125:3-125:30" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="125:3-125:15" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/31"/> </source> </source> </body> </feature> <context_ location="124:8-124:27"> <context_ xsi:type="ocl:OclModelElement" location="124:16-124:27" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/29"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="130:1-131:35"> + <commentsBefore>-- This helper checks the Unbounded constraint</commentsBefore> + <commentsBefore>-- CONTEXT: KM3!Reference</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper get the type of the relation of the input role</commentsAfter> + <commentsAfter>-- CONTEXT: KM3!Reference</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="130:8-131:34"> <feature xsi:type="ocl:Operation" location="130:35-131:34" name="isUnbounded"> <returnType xsi:type="ocl:BooleanType" location="130:51-130:58"/> @@ -436,7 +532,7 @@ <source xsi:type="ocl:OperatorCallExp" location="131:1-131:13" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="131:1-131:11" name="lower"> <source xsi:type="ocl:VariableExp" location="131:1-131:5"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/33"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="131:12-131:13" integerSymbol="0"/> @@ -444,7 +540,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="131:18-131:34" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="131:18-131:28" name="upper"> <source xsi:type="ocl:VariableExp" location="131:18-131:22"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/34"/> </source> </source> <arguments xsi:type="ocl:OperatorCallExp" location="131:30-131:33" operationName="-"> @@ -456,26 +552,33 @@ </feature> <context_ location="130:8-130:29"> <context_ xsi:type="ocl:OclModelElement" location="130:16-130:29" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/32"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="136:1-139:18"> + <commentsBefore>-- This helper get the type of the relation of the input role</commentsBefore> + <commentsBefore>-- CONTEXT: KM3!Reference</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper checks if the Relationship name we are going to create</commentsAfter> + <commentsAfter>-- is ever used</commentsAfter> + <commentsAfter>-- CONTEXT: KM3!Reference</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="136:8-139:17"> <feature xsi:type="ocl:Operation" location="136:35-139:17" name="isEmbedding"> <returnType xsi:type="ocl:BooleanType" location="136:51-136:58"/> <body xsi:type="ocl:OperatorCallExp" location="137:1-139:17" operationName="or"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:1-137:17" name="isContainer"> <source xsi:type="ocl:VariableExp" location="137:1-137:5"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/36"/> </source> </source> <arguments xsi:type="ocl:IfExp" location="138:1-139:17"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="138:44-138:69" name="isContainer"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="138:44-138:57" name="opposite"> <source xsi:type="ocl:VariableExp" location="138:44-138:48"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/38"/> </source> </source> </thenExpression> @@ -483,7 +586,7 @@ <source xsi:type="ocl:OperationCallExp" location="138:8-138:38" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="138:8-138:21" name="opposite"> <source xsi:type="ocl:VariableExp" location="138:8-138:12"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/37"/> </source> </source> </source> @@ -494,19 +597,27 @@ </feature> <context_ location="136:8-136:29"> <context_ xsi:type="ocl:OclModelElement" location="136:16-136:29" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/35"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="145:1-148:60"> + <commentsBefore>-- This helper checks if the Relationship name we are going to create</commentsBefore> + <commentsBefore>-- is ever used</commentsBefore> + <commentsBefore>-- CONTEXT: KM3!Reference</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper checks if the Relationship name we are going to create</commentsAfter> + <commentsAfter>-- is ever used</commentsAfter> + <commentsAfter>-- CONTEXT: KM3!Reference</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="145:8-148:59"> <feature xsi:type="ocl:Operation" location="145:35-148:59" name="notExists"> <returnType xsi:type="ocl:BooleanType" location="145:49-145:56"/> <body xsi:type="ocl:IterateExp" location="146:1-148:59"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="146:1-146:16" name="list"> <source xsi:type="ocl:VariableExp" location="146:1-146:11"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/40"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="147:34-148:58" operationName="and"> @@ -517,7 +628,7 @@ <source xsi:type="ocl:OperatorCallExp" location="148:6-148:24" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="148:6-148:16" name="owner"> <source xsi:type="ocl:VariableExp" location="148:6-148:10"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/41"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="148:17-148:24" name="owner"> @@ -527,7 +638,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="148:29-148:45" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="148:29-148:38" name="type"> <source xsi:type="ocl:VariableExp" location="148:29-148:33"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/42"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="148:39-148:45" name="type"> @@ -537,7 +648,7 @@ </source> <arguments xsi:type="ocl:OperatorCallExp" location="148:50-148:57" operationName="<>"> <source xsi:type="ocl:VariableExp" location="148:50-148:54"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/43"/> </source> <arguments xsi:type="ocl:VariableExp" location="148:56-148:57" referredVariable="//@elements.16/@definition/@feature/@body/@iterators.0"/> </arguments> @@ -553,19 +664,28 @@ </feature> <context_ location="145:8-145:29"> <context_ xsi:type="ocl:OclModelElement" location="145:16-145:29" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/39"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="154:1-157:54"> + <commentsBefore>-- This helper checks if the Relationship name we are going to create</commentsBefore> + <commentsBefore>-- is ever used</commentsBefore> + <commentsBefore>-- CONTEXT: KM3!Reference</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- Rule 'DomainModel'.</commentsAfter> + <commentsAfter>-- This rule generates the DomainModel</commentsAfter> <definition location="154:8-157:53"> <feature xsi:type="ocl:Operation" location="154:35-157:53" name="everUsed"> <returnType xsi:type="ocl:BooleanType" location="154:48-154:55"/> <body xsi:type="ocl:IterateExp" location="155:1-157:53"> <source xsi:type="ocl:OperationCallExp" location="155:1-155:29" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="155:1-155:14" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/45"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="156:35-157:52" operationName="or"> @@ -575,7 +695,7 @@ <source xsi:type="ocl:OperatorCallExp" location="157:2-157:18" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="157:2-157:11" name="name"> <source xsi:type="ocl:VariableExp" location="157:2-157:6"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/46"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="157:12-157:18" name="name"> @@ -585,7 +705,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="157:23-157:39" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="157:23-157:32" name="type"> <source xsi:type="ocl:VariableExp" location="157:23-157:27"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/47"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="157:33-157:39" name="type"> @@ -595,7 +715,7 @@ </source> <arguments xsi:type="ocl:OperatorCallExp" location="157:44-157:51" operationName="<>"> <source xsi:type="ocl:VariableExp" location="157:44-157:48"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/48"/> </source> <arguments xsi:type="ocl:VariableExp" location="157:50-157:51" referredVariable="//@elements.17/@definition/@feature/@body/@iterators.0"/> </arguments> @@ -610,21 +730,29 @@ </feature> <context_ location="154:8-154:29"> <context_ xsi:type="ocl:OclModelElement" location="154:16-154:29" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/44"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="165:1-184:2" name="DomainModel"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- Rule 'DomainModel'.</commentsBefore> + <commentsBefore>-- This rule generates the DomainModel</commentsBefore> + <commentsAfter>-- Rule 'Class'.</commentsAfter> + <commentsAfter>-- This rule generates a DSL!Class and link it to his supertypes,</commentsAfter> + <commentsAfter>-- and properties, and generates an identity</commentsAfter> <outPattern location="170:2-183:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="171:3-183:4" varName="d"> <type xsi:type="ocl:OclModelElement" location="171:7-171:22" name="DomainModel"> - <model href="temp#/0"/> + <model href="new-model#/50"/> </type> <bindings location="172:4-172:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="172:14-172:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="172:14-172:24"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/51"/> </source> </value> </bindings> @@ -645,19 +773,19 @@ <value xsi:type="ocl:SequenceExp" location="177:5-181:6"> <elements xsi:type="ocl:OperationCallExp" location="178:6-178:29" operationName="getClasses"> <source xsi:type="ocl:VariableExp" location="178:6-178:16"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/52"/> </source> </elements> <elements xsi:type="ocl:IteratorExp" location="179:6-180:49" name="select"> <source xsi:type="ocl:OperationCallExp" location="179:6-179:26" operationName="getRefs"> <source xsi:type="ocl:VariableExp" location="179:6-179:16"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/53"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="180:20-180:48" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="180:20-180:35" name="list"> <source xsi:type="ocl:VariableExp" location="180:20-180:30"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/54"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="180:46-180:47" referredVariable="//@elements.18/@outPattern/@elements.0/@bindings.4/@value/@elements.1/@iterators.0"/> @@ -681,7 +809,7 @@ <inPattern location="166:2-169:4"> <elements xsi:type="atl:SimpleInPatternElement" location="167:3-167:18" varName="e" variableExp="//@elements.18/@inPattern/@filter/@source/@source //@elements.18/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.18/@outPattern/@elements.0/@bindings.5/@value/@elements.0/@source //@elements.18/@outPattern/@elements.0/@bindings.5/@value/@elements.1/@source"> <type xsi:type="ocl:OclModelElement" location="167:7-167:18" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/49"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="168:4-168:30" operationName="<>"> @@ -693,15 +821,21 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="189:1-202:2" name="Class"> + <commentsBefore>-- Rule 'Class'.</commentsBefore> + <commentsBefore>-- This rule generates a DSL!Class and link it to his supertypes,</commentsBefore> + <commentsBefore>-- and properties, and generates an identity</commentsBefore> + <commentsAfter>-- Rule 'Relationship'.</commentsAfter> + <commentsAfter>-- This rule generates a DSL!Relationship and his roles,</commentsAfter> + <commentsAfter>-- getting them in the list previously created</commentsAfter> <outPattern location="192:2-201:5"> <elements xsi:type="atl:SimpleOutPatternElement" location="193:3-201:5" varName="c"> <type xsi:type="ocl:OclModelElement" location="193:7-193:16" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/56"/> </type> <bindings location="194:4-194:37" propertyName="namespace"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="194:17-194:37" name="Namespace"> <source xsi:type="ocl:VariableExp" location="194:17-194:27"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/57"/> </source> </value> </bindings> @@ -717,7 +851,7 @@ <body xsi:type="ocl:OperationCallExp" location="196:40-196:64" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="196:40-196:41" referredVariable="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="196:54-196:63" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/58"/> </arguments> </body> <iterators location="196:38-196:39" varName="a" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@source/@body/@source"/> @@ -727,7 +861,7 @@ <bindings location="197:4-197:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="197:14-197:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="197:14-197:24"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/59"/> </source> </value> </bindings> @@ -749,7 +883,7 @@ <body xsi:type="ocl:OperationCallExp" location="200:50-200:78" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="200:50-200:51" referredVariable="//@elements.19/@outPattern/@elements.0/@bindings.6/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="200:64-200:77" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/60"/> </arguments> </body> <iterators location="200:48-200:49" varName="a" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.6/@value/@body/@source"/> @@ -760,16 +894,22 @@ <inPattern location="190:2-191:16"> <elements xsi:type="atl:SimpleInPatternElement" location="191:3-191:16" varName="e" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@source //@elements.19/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.5/@value/@source //@elements.19/@outPattern/@elements.0/@bindings.6/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="191:7-191:16" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/55"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="207:1-262:2" name="Relationship"> + <commentsBefore>-- Rule 'Relationship'.</commentsBefore> + <commentsBefore>-- This rule generates a DSL!Relationship and his roles,</commentsBefore> + <commentsBefore>-- getting them in the list previously created</commentsBefore> + <commentsAfter>-- Rule 'RelationshipFromSingle'.</commentsAfter> + <commentsAfter>-- This rule generates a DSL!Relationship and his roles,</commentsAfter> + <commentsAfter>-- if the reference of the list has no opposite</commentsAfter> <outPattern location="212:3-261:5"> <elements xsi:type="atl:SimpleOutPatternElement" location="213:3-233:5" varName="r" variableExp="//@elements.20/@outPattern/@elements.1/@bindings.3/@value //@elements.20/@outPattern/@elements.2/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="213:6-213:22" name="Relationship"> - <model href="temp#/0"/> + <model href="new-model#/63"/> </type> <bindings location="214:4-224:11" propertyName="name"> <value xsi:type="ocl:LetExp" location="215:4-224:11"> @@ -815,7 +955,7 @@ <arguments xsi:type="ocl:OperationCallExp" location="223:16-223:48" operationName="toString"> <source xsi:type="ocl:OperationCallExp" location="223:16-223:37" operationName="incDiff1"> <source xsi:type="ocl:VariableExp" location="223:16-223:26"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/64"/> </source> </source> </arguments> @@ -827,14 +967,14 @@ <bindings location="226:4-226:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="226:14-226:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="226:14-226:24"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/65"/> </source> </value> </bindings> <bindings location="227:4-227:37" propertyName="namespace"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="227:17-227:37" name="Namespace"> <source xsi:type="ocl:VariableExp" location="227:17-227:27"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/66"/> </source> </value> </bindings> @@ -850,6 +990,7 @@ </value> </bindings> <bindings location="231:4-231:21" propertyName="isAbstract"> + <commentsBefore>--default values</commentsBefore> <value xsi:type="ocl:BooleanExp" location="231:16-231:21"/> </bindings> <bindings location="232:4-232:20" propertyName="isLoaded"> @@ -858,12 +999,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="235:3-247:5" varName="s" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="235:7-235:15" name="Role"> - <model href="temp#/0"/> + <model href="new-model#/67"/> </type> <bindings location="236:4-236:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="236:14-236:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="236:14-236:24"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/68"/> </source> </value> </bindings> @@ -926,12 +1067,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="249:3-261:5" varName="t" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="249:7-249:15" name="Role"> - <model href="temp#/0"/> + <model href="new-model#/69"/> </type> <bindings location="250:4-250:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="250:14-250:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="250:14-250:24"> - <referredVariable href="temp#/38"/> + <referredVariable href="new-model#/70"/> </source> </value> </bindings> @@ -1012,14 +1153,14 @@ <inPattern location="208:2-211:3"> <elements xsi:type="atl:SimpleInPatternElement" location="209:3-209:20" varName="e" variableExp="//@elements.20/@inPattern/@filter/@source/@arguments.0 //@elements.20/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@variable/@initExpression/@condition/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@in_/@variable/@initExpression/@source/@source/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@in_/@variable/@initExpression/@arguments.0/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@in_/@in_/@condition/@source //@elements.20/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.20/@outPattern/@elements.1/@bindings.2/@value/@source //@elements.20/@outPattern/@elements.1/@bindings.4/@value/@source //@elements.20/@outPattern/@elements.1/@bindings.5/@value/@source //@elements.20/@outPattern/@elements.1/@bindings.6/@value/@source //@elements.20/@outPattern/@elements.1/@bindings.7/@value/@condition/@source/@source //@elements.20/@outPattern/@elements.1/@bindings.7/@value/@elseExpression/@source //@elements.20/@outPattern/@elements.1/@bindings.8/@value/@source //@elements.20/@outPattern/@elements.1/@bindings.9/@value/@source //@elements.20/@outPattern/@elements.2/@bindings.2/@value/@source/@source //@elements.20/@outPattern/@elements.2/@bindings.4/@value/@source/@source //@elements.20/@outPattern/@elements.2/@bindings.5/@value/@source/@source //@elements.20/@outPattern/@elements.2/@bindings.6/@value/@source/@source //@elements.20/@outPattern/@elements.2/@bindings.7/@value/@condition/@source/@source/@source //@elements.20/@outPattern/@elements.2/@bindings.7/@value/@elseExpression/@source/@source //@elements.20/@outPattern/@elements.2/@bindings.8/@value/@source/@source //@elements.20/@outPattern/@elements.2/@bindings.9/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="209:7-209:20" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/61"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="210:3-210:67" operationName="and"> <source xsi:type="ocl:CollectionOperationCallExp" location="210:3-210:31" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="210:3-210:18" name="list"> <source xsi:type="ocl:VariableExp" location="210:3-210:13"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/62"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="210:29-210:30" referredVariable="//@elements.20/@inPattern/@elements.0"/> @@ -1035,10 +1176,15 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="267:1-325:2" name="RelationshipFromSingle"> + <commentsBefore>-- Rule 'RelationshipFromSingle'.</commentsBefore> + <commentsBefore>-- This rule generates a DSL!Relationship and his roles,</commentsBefore> + <commentsBefore>-- if the reference of the list has no opposite</commentsBefore> + <commentsAfter>-- Rule 'ValueProperty'.</commentsAfter> + <commentsAfter>-- This rule generates a property</commentsAfter> <outPattern location="273:2-324:5"> <elements xsi:type="atl:SimpleOutPatternElement" location="274:3-294:5" varName="r" variableExp="//@elements.21/@outPattern/@elements.1/@bindings.3/@value //@elements.21/@outPattern/@elements.2/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="274:6-274:22" name="Relationship"> - <model href="temp#/0"/> + <model href="new-model#/73"/> </type> <bindings location="275:4-285:11" propertyName="name"> <value xsi:type="ocl:LetExp" location="276:4-285:11"> @@ -1084,7 +1230,7 @@ <arguments xsi:type="ocl:OperationCallExp" location="284:16-284:48" operationName="toString"> <source xsi:type="ocl:OperationCallExp" location="284:16-284:37" operationName="incDiff1"> <source xsi:type="ocl:VariableExp" location="284:16-284:26"> - <referredVariable href="temp#/40"/> + <referredVariable href="new-model#/74"/> </source> </source> </arguments> @@ -1096,14 +1242,14 @@ <bindings location="287:4-287:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="287:14-287:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="287:14-287:24"> - <referredVariable href="temp#/41"/> + <referredVariable href="new-model#/75"/> </source> </value> </bindings> <bindings location="288:4-288:37" propertyName="namespace"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="288:17-288:37" name="Namespace"> <source xsi:type="ocl:VariableExp" location="288:17-288:27"> - <referredVariable href="temp#/42"/> + <referredVariable href="new-model#/76"/> </source> </value> </bindings> @@ -1119,6 +1265,7 @@ </value> </bindings> <bindings location="292:4-292:21" propertyName="isAbstract"> + <commentsBefore>--default values</commentsBefore> <value xsi:type="ocl:BooleanExp" location="292:16-292:21"/> </bindings> <bindings location="293:4-293:20" propertyName="isLoaded"> @@ -1127,12 +1274,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="296:3-308:5" varName="s" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="296:7-296:15" name="Role"> - <model href="temp#/0"/> + <model href="new-model#/77"/> </type> <bindings location="297:4-297:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="297:14-297:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="297:14-297:24"> - <referredVariable href="temp#/43"/> + <referredVariable href="new-model#/78"/> </source> </value> </bindings> @@ -1195,12 +1342,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="310:3-324:5" varName="t" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.3/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="310:7-310:15" name="Role"> - <model href="temp#/0"/> + <model href="new-model#/79"/> </type> <bindings location="311:4-311:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="311:14-311:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="311:14-311:24"> - <referredVariable href="temp#/44"/> + <referredVariable href="new-model#/80"/> </source> </value> </bindings> @@ -1217,7 +1364,7 @@ <arguments xsi:type="ocl:OperationCallExp" location="314:11-314:43" operationName="toString"> <source xsi:type="ocl:OperationCallExp" location="314:11-314:32" operationName="incDiff2"> <source xsi:type="ocl:VariableExp" location="314:11-314:21"> - <referredVariable href="temp#/45"/> + <referredVariable href="new-model#/81"/> </source> </source> </arguments> @@ -1265,14 +1412,14 @@ <inPattern location="268:2-272:3"> <elements xsi:type="atl:SimpleInPatternElement" location="269:3-269:20" varName="e" variableExp="//@elements.21/@inPattern/@filter/@source/@arguments.0 //@elements.21/@inPattern/@filter/@arguments.0/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.0/@value/@variable/@initExpression/@condition/@source //@elements.21/@outPattern/@elements.0/@bindings.0/@value/@in_/@variable/@initExpression/@source/@source/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.0/@value/@in_/@variable/@initExpression/@arguments.0/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.0/@value/@in_/@in_/@condition/@source //@elements.21/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.21/@outPattern/@elements.1/@bindings.2/@value/@source //@elements.21/@outPattern/@elements.1/@bindings.4/@value/@source //@elements.21/@outPattern/@elements.1/@bindings.5/@value/@source //@elements.21/@outPattern/@elements.1/@bindings.6/@value/@source //@elements.21/@outPattern/@elements.1/@bindings.7/@value/@condition/@source/@source //@elements.21/@outPattern/@elements.1/@bindings.7/@value/@elseExpression/@source //@elements.21/@outPattern/@elements.1/@bindings.8/@value/@source //@elements.21/@outPattern/@elements.1/@bindings.9/@value/@source //@elements.21/@outPattern/@elements.2/@bindings.2/@value/@source/@condition/@source //@elements.21/@outPattern/@elements.2/@bindings.2/@value/@source/@thenExpression/@source/@source //@elements.21/@outPattern/@elements.2/@bindings.2/@value/@source/@elseExpression/@source //@elements.21/@outPattern/@elements.2/@bindings.4/@value/@source //@elements.21/@outPattern/@elements.2/@bindings.5/@value/@source"> <type xsi:type="ocl:OclModelElement" location="269:7-269:20" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/71"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="271:3-271:63" operationName="and"> <source xsi:type="ocl:CollectionOperationCallExp" location="271:3-271:31" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="271:3-271:18" name="list"> <source xsi:type="ocl:VariableExp" location="271:3-271:13"> - <referredVariable href="temp#/39"/> + <referredVariable href="new-model#/72"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="271:29-271:30" referredVariable="//@elements.21/@inPattern/@elements.0"/> @@ -1286,15 +1433,19 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="329:1-338:2" name="ValueProperty"> + <commentsBefore>-- Rule 'ValueProperty'.</commentsBefore> + <commentsBefore>-- This rule generates a property</commentsBefore> + <commentsAfter>-- Rule 'Enumeration'.</commentsAfter> + <commentsAfter>-- This rule generates an Enumeration</commentsAfter> <outPattern location="332:2-337:5"> <elements xsi:type="atl:SimpleOutPatternElement" location="333:3-337:5" varName="p"> <type xsi:type="ocl:OclModelElement" location="333:7-333:24" name="ValueProperty"> - <model href="temp#/0"/> + <model href="new-model#/83"/> </type> <bindings location="334:4-334:39" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="334:14-334:39" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="334:14-334:24"> - <referredVariable href="temp#/46"/> + <referredVariable href="new-model#/84"/> </source> </value> </bindings> @@ -1313,16 +1464,20 @@ <inPattern location="330:2-331:20"> <elements xsi:type="atl:SimpleInPatternElement" location="331:3-331:20" varName="e" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.22/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="331:7-331:20" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/82"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="342:1-352:2" name="Enumeration"> + <commentsBefore>-- Rule 'Enumeration'.</commentsBefore> + <commentsBefore>-- This rule generates an Enumeration</commentsBefore> + <commentsAfter>-- Rule 'EnumerationLiteral'.</commentsAfter> + <commentsAfter>-- This rule generates an single element of an Enumeration</commentsAfter> <outPattern location="345:2-351:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="346:3-351:4" varName="r"> <type xsi:type="ocl:OclModelElement" location="346:7-346:22" name="Enumeration"> - <model href="temp#/0"/> + <model href="new-model#/86"/> </type> <bindings location="347:4-347:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="347:12-347:18" name="name"> @@ -1332,14 +1487,14 @@ <bindings location="348:4-348:37" propertyName="namespace"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="348:17-348:37" name="Namespace"> <source xsi:type="ocl:VariableExp" location="348:17-348:27"> - <referredVariable href="temp#/47"/> + <referredVariable href="new-model#/87"/> </source> </value> </bindings> <bindings location="349:4-349:41" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="349:16-349:41" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="349:16-349:26"> - <referredVariable href="temp#/48"/> + <referredVariable href="new-model#/88"/> </source> </value> </bindings> @@ -1351,7 +1506,7 @@ <body xsi:type="ocl:OperationCallExp" location="350:37-350:67" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="350:37-350:38" referredVariable="//@elements.23/@outPattern/@elements.0/@bindings.3/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="350:51-350:66" name="EnumLiteral"> - <model href="temp#/1"/> + <model href="new-model#/89"/> </arguments> </body> <iterators location="350:35-350:36" varName="a" variableExp="//@elements.23/@outPattern/@elements.0/@bindings.3/@value/@body/@source"/> @@ -1362,16 +1517,20 @@ <inPattern location="343:2-344:22"> <elements xsi:type="atl:SimpleInPatternElement" location="344:3-344:22" varName="e" variableExp="//@elements.23/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.23/@outPattern/@elements.0/@bindings.3/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="344:7-344:22" name="Enumeration"> - <model href="temp#/1"/> + <model href="new-model#/85"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="356:1-365:2" name="EnumerationLiteral"> + <commentsBefore>-- Rule 'EnumerationLiteral'.</commentsBefore> + <commentsBefore>-- This rule generates an single element of an Enumeration</commentsBefore> + <commentsAfter>-- Rule 'SimpleType'.</commentsAfter> + <commentsAfter>-- This rule generates the DSL!SimpleType corresponding to a KM3!Datatype</commentsAfter> <outPattern location="359:2-364:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="360:2-364:3" varName="r"> <type xsi:type="ocl:OclModelElement" location="360:6-360:28" name="EnumerationLiteral"> - <model href="temp#/0"/> + <model href="new-model#/91"/> </type> <bindings location="361:3-361:15" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="361:9-361:15" name="name"> @@ -1381,7 +1540,7 @@ <bindings location="362:3-362:40" propertyName="identity"> <value xsi:type="ocl:OperationCallExp" location="362:15-362:40" operationName="makeIdentity"> <source xsi:type="ocl:VariableExp" location="362:15-362:25"> - <referredVariable href="temp#/49"/> + <referredVariable href="new-model#/92"/> </source> </value> </bindings> @@ -1393,16 +1552,18 @@ <inPattern location="357:2-358:21"> <elements xsi:type="atl:SimpleInPatternElement" location="358:2-358:21" varName="e" variableExp="//@elements.24/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="358:6-358:21" name="EnumLiteral"> - <model href="temp#/1"/> + <model href="new-model#/90"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="369:1-374:2" name="SimpleType"> + <commentsBefore>-- Rule 'SimpleType'.</commentsBefore> + <commentsBefore>-- This rule generates the DSL!SimpleType corresponding to a KM3!Datatype</commentsBefore> <outPattern location="372:2-373:80"> <elements xsi:type="atl:SimpleOutPatternElement" location="373:2-373:80" varName="t"> <type xsi:type="ocl:OclModelElement" location="373:6-373:20" name="SimpleType"> - <model href="temp#/0"/> + <model href="new-model#/94"/> </type> <bindings location="373:22-373:78" propertyName="name"> <value xsi:type="ocl:IfExp" location="373:28-373:78"> @@ -1423,7 +1584,7 @@ <inPattern location="370:2-371:18"> <elements xsi:type="atl:SimpleInPatternElement" location="371:2-371:18" varName="e" variableExp="//@elements.25/@outPattern/@elements.0/@bindings.0/@value/@condition/@source/@source //@elements.25/@outPattern/@elements.0/@bindings.0/@value/@elseExpression/@source"> <type xsi:type="ocl:OclModelElement" location="371:6-371:18" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/93"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/DSLModel2KM2/DSLModel2KM2.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/DSLModel2KM2/DSLModel2KM2.atl.xmi index f4a07be8..60a845e3 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/DSLModel2KM2/DSLModel2KM2.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/DSLModel2KM2/DSLModel2KM2.atl.xmi @@ -1,28 +1,39 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-263:2" name="DSLModel2KM2"> <inModels location="2:24-2:38" name="IN1"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <inModels location="2:40-2:49" name="IN2"> - <metamodel href="temp#/2"/> + <metamodel href="new-model#/2"/> </inModels> <outModels location="2:8-2:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="12:1-16:49"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper returns a boolean which indicates if the relationship corresponding to the role</commentsBefore> + <commentsBefore>-- has a max cardinality > 1</commentsBefore> + <commentsBefore>-- CONTEXT : DSLModel!Role</commentsBefore> + <commentsBefore>-- RETURN : Boolean</commentsBefore> + <commentsAfter>-- This helper takes a Sequence in parameter and test if a sequence element with the same name </commentsAfter> + <commentsAfter>-- as the context is already in the sequence. It is used by the helper getReferences()</commentsAfter> + <commentsAfter>-- CONTEXT : DSLModel!Role</commentsAfter> + <commentsAfter>-- RETURN : Boolean</commentsAfter> <definition location="12:8-16:48"> <feature xsi:type="ocl:Operation" location="12:35-16:48" name="isMultiple"> <returnType xsi:type="ocl:BooleanType" location="12:50-12:57"/> <body xsi:type="ocl:LetExp" location="13:2-16:48"> <variable location="13:6-15:37" varName="a" variableExp="//@elements.0/@definition/@feature/@body/@in_/@condition/@source/@source"> <type xsi:type="ocl:OclModelElement" location="13:10-13:18" name="Role"> - <model href="temp#/2"/> + <model href="new-model#/4"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="13:21-15:37" operationName="first"> <source xsi:type="ocl:IteratorExp" location="13:21-15:28" name="select"> <source xsi:type="ocl:OperationCallExp" location="13:21-13:44" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="13:21-13:29" name="Role"> - <model href="temp#/2"/> + <model href="new-model#/5"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="14:18-15:26" operationName="and"> @@ -35,7 +46,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="14:36-14:51" name="type"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="14:36-14:46" name="owner"> <source xsi:type="ocl:VariableExp" location="14:36-14:40"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/6"/> </source> </source> </arguments> @@ -46,7 +57,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="15:17-15:26" name="name"> <source xsi:type="ocl:VariableExp" location="15:17-15:21"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/7"/> </source> </arguments> </arguments> @@ -69,18 +80,26 @@ </feature> <context_ location="12:8-12:29"> <context_ xsi:type="ocl:OclModelElement" location="12:16-12:29" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="22:1-25:54"> + <commentsBefore>-- This helper takes a Sequence in parameter and test if a sequence element with the same name </commentsBefore> + <commentsBefore>-- as the context is already in the sequence. It is used by the helper getReferences()</commentsBefore> + <commentsBefore>-- CONTEXT : DSLModel!Role</commentsBefore> + <commentsBefore>-- RETURN : Boolean</commentsBefore> + <commentsAfter>-- This helper returns a sequence of DSLModel!Role without doublons which corresponds to the references</commentsAfter> + <commentsAfter>-- from the context</commentsAfter> + <commentsAfter>-- CONTEXT : DSLModel!ModelElement</commentsAfter> + <commentsAfter>-- RETURN : Sequence(DSLModel!Role)</commentsAfter> <definition location="22:8-25:53"> <feature xsi:type="ocl:Operation" location="22:35-25:53" name="hasSameName"> <parameters location="22:47-22:76" varName="seq" variableExp="//@elements.1/@definition/@feature/@body/@variable/@initExpression/@source/@source"> <type xsi:type="ocl:SequenceType" location="22:53-22:76"> <elementType xsi:type="ocl:OclModelElement" location="22:62-22:75" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/9"/> </elementType> </type> </parameters> @@ -88,7 +107,7 @@ <body xsi:type="ocl:LetExp" location="23:2-25:53"> <variable location="23:6-24:48" varName="a" variableExp="//@elements.1/@definition/@feature/@body/@in_/@condition/@source"> <type xsi:type="ocl:OclModelElement" location="23:10-23:23" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="24:3-24:48" operationName="first"> <source xsi:type="ocl:IteratorExp" location="24:3-24:39" name="select"> @@ -99,7 +118,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="24:29-24:38" name="name"> <source xsi:type="ocl:VariableExp" location="24:29-24:33"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/11"/> </source> </arguments> </body> @@ -118,23 +137,30 @@ </feature> <context_ location="22:8-22:29"> <context_ xsi:type="ocl:OclModelElement" location="22:16-22:29" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="31:1-36:11"> + <commentsBefore>-- This helper returns a sequence of DSLModel!Role without doublons which corresponds to the references</commentsBefore> + <commentsBefore>-- from the context</commentsBefore> + <commentsBefore>-- CONTEXT : DSLModel!ModelElement</commentsBefore> + <commentsBefore>-- RETURN : Sequence(DSLModel!Role)</commentsBefore> + <commentsAfter>-- This helper makes a Sequence of DSLModel!Role which are used to create properties</commentsAfter> + <commentsAfter>-- CONTEXT : ThisModule</commentsAfter> + <commentsAfter>-- RETURN : Sequence(DSLModel!Role)</commentsAfter> <definition location="31:8-36:10"> <feature xsi:type="ocl:Operation" location="31:44-36:10" name="getReferences"> <returnType xsi:type="ocl:SequenceType" location="31:62-31:85"> <elementType xsi:type="ocl:OclModelElement" location="31:71-31:84" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </elementType> </returnType> <body xsi:type="ocl:IterateExp" location="32:2-36:10"> <source xsi:type="ocl:OperationCallExp" location="32:2-32:20" operationName="getLastRole"> <source xsi:type="ocl:VariableExp" location="32:2-32:6"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/14"/> </source> </source> <body xsi:type="ocl:IfExp" location="33:3-36:8"> @@ -152,7 +178,7 @@ <result location="32:32-32:74" varName="acc" variableExp="//@elements.2/@definition/@feature/@body/@body/@condition/@arguments.0 //@elements.2/@definition/@feature/@body/@body/@thenExpression //@elements.2/@definition/@feature/@body/@body/@elseExpression/@source"> <type xsi:type="ocl:SequenceType" location="32:38-32:61"> <elementType xsi:type="ocl:OclModelElement" location="32:47-32:60" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="32:64-32:74"/> @@ -161,30 +187,37 @@ </feature> <context_ location="31:8-31:37"> <context_ xsi:type="ocl:OclModelElement" location="31:16-31:37" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="41:1-48:25"> + <commentsBefore>-- This helper makes a Sequence of DSLModel!Role which are used to create properties</commentsBefore> + <commentsBefore>-- CONTEXT : ThisModule</commentsBefore> + <commentsBefore>-- RETURN : Sequence(DSLModel!Role)</commentsBefore> + <commentsAfter>-- This helper creates a Sequence of DSLModel!Role. It collects all last roles from element links</commentsAfter> + <commentsAfter>-- A last role from an ElementLink corresponds to a reference for the context</commentsAfter> + <commentsAfter>-- CONTEXT : DSLModel!ModelElement</commentsAfter> + <commentsAfter>-- RETURN : Sequence(DSLModel!Role)</commentsAfter> <definition location="41:8-48:24"> <feature xsi:type="ocl:Operation" location="41:13-48:24" name="propertyRoles"> <returnType xsi:type="ocl:SequenceType" location="41:31-41:54"> <elementType xsi:type="ocl:OclModelElement" location="41:40-41:53" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/16"/> </elementType> </returnType> <body xsi:type="ocl:LetExp" location="42:2-48:24"> <variable location="42:6-48:9" varName="a" variableExp="//@elements.3/@definition/@feature/@body/@in_/@source"> <type xsi:type="ocl:SequenceType" location="42:10-42:33"> <elementType xsi:type="ocl:OclModelElement" location="42:19-42:32" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </elementType> </type> <initExpression xsi:type="ocl:IterateExp" location="43:2-48:9"> <source xsi:type="ocl:OperationCallExp" location="43:2-43:38" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="43:2-43:23" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </source> </source> <body xsi:type="ocl:IfExp" location="45:2-48:7"> @@ -208,7 +241,7 @@ <result location="44:2-44:40" varName="acc" variableExp="//@elements.3/@definition/@feature/@body/@variable/@initExpression/@body/@thenExpression/@source //@elements.3/@definition/@feature/@body/@variable/@initExpression/@body/@elseExpression"> <type xsi:type="ocl:SequenceType" location="44:6-44:29"> <elementType xsi:type="ocl:OclModelElement" location="44:15-44:28" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="44:30-44:40"/> @@ -223,17 +256,24 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="54:1-56:38"> + <commentsBefore>-- This helper creates a Sequence of DSLModel!Role. It collects all last roles from element links</commentsBefore> + <commentsBefore>-- A last role from an ElementLink corresponds to a reference for the context</commentsBefore> + <commentsBefore>-- CONTEXT : DSLModel!ModelElement</commentsBefore> + <commentsBefore>-- RETURN : Sequence(DSLModel!Role)</commentsBefore> + <commentsAfter>-- This helper test if a DSL Relationship is a ModelElement's ParentLink </commentsAfter> + <commentsAfter>-- CONTEXT : DSL!Relationship</commentsAfter> + <commentsAfter>-- RETURN : Boolean</commentsAfter> <definition location="54:8-56:37"> <feature xsi:type="ocl:Operation" location="54:43-56:37" name="getLastRole"> <returnType xsi:type="ocl:SequenceType" location="54:59-54:82"> <elementType xsi:type="ocl:OclModelElement" location="54:68-54:81" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </elementType> </returnType> <body xsi:type="ocl:IterateExp" location="55:2-56:37"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="55:2-55:21" name="referencelinks"> <source xsi:type="ocl:VariableExp" location="55:2-55:6"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/22"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="56:3-56:36" operationName="including"> @@ -248,7 +288,7 @@ <result location="55:33-55:73" varName="acc" variableExp="//@elements.4/@definition/@feature/@body/@body/@source"> <type xsi:type="ocl:SequenceType" location="55:37-55:60"> <elementType xsi:type="ocl:OclModelElement" location="55:46-55:59" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/23"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="55:63-55:73"/> @@ -257,12 +297,18 @@ </feature> <context_ location="54:8-54:37"> <context_ xsi:type="ocl:OclModelElement" location="54:16-54:37" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="61:1-73:11"> + <commentsBefore>-- This helper test if a DSL Relationship is a ModelElement's ParentLink </commentsBefore> + <commentsBefore>-- CONTEXT : DSL!Relationship</commentsBefore> + <commentsBefore>-- RETURN : Boolean</commentsBefore> + <commentsAfter>-- This helper returns the role corresponding to the embedding link</commentsAfter> + <commentsAfter>-- CONTEXT : DSLModel!EmbeddingLink</commentsAfter> + <commentsAfter>-- RETURN : DSL!Role</commentsAfter> <definition location="61:8-73:10"> <feature xsi:type="ocl:Operation" location="61:31-73:10" name="isParentLink"> <returnType xsi:type="ocl:BooleanType" location="61:48-61:55"/> @@ -270,7 +316,7 @@ <variable location="62:6-64:16" varName="s" variableExp="//@elements.5/@definition/@feature/@body/@in_/@source"> <type xsi:type="ocl:SequenceType" location="62:10-62:41"> <elementType xsi:type="ocl:OclModelElement" location="62:19-62:40" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/25"/> </elementType> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="62:44-64:16" operationName="asSequence"> @@ -278,13 +324,13 @@ <source xsi:type="ocl:IteratorExp" location="62:44-63:51" name="select"> <source xsi:type="ocl:OperationCallExp" location="62:44-62:80" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="62:44-62:65" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/26"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="63:14-63:50" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="63:14-63:15" referredVariable="//@elements.5/@definition/@feature/@body/@variable/@initExpression/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="63:28-63:49" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/27"/> </arguments> </body> <iterators location="63:10-63:11" varName="a" variableExp="//@elements.5/@definition/@feature/@body/@variable/@initExpression/@source/@source/@body/@source"/> @@ -320,7 +366,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="68:23-68:37" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="68:23-68:32" name="type"> <source xsi:type="ocl:VariableExp" location="68:23-68:27"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/30"/> </source> </source> </arguments> @@ -336,7 +382,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="67:27-67:43" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="67:27-67:38" name="source"> <source xsi:type="ocl:VariableExp" location="67:27-67:31"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/29"/> </source> </source> </arguments> @@ -350,7 +396,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="66:21-66:39" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="66:21-66:34" name="relation"> <source xsi:type="ocl:VariableExp" location="66:21-66:25"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/28"/> </source> </source> </arguments> @@ -367,27 +413,33 @@ </feature> <context_ location="61:8-61:24"> <context_ xsi:type="ocl:OclModelElement" location="61:16-61:24" name="Role"> - <model href="temp#/2"/> + <model href="new-model#/24"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="78:1-82:69"> + <commentsBefore>-- This helper returns the role corresponding to the embedding link</commentsBefore> + <commentsBefore>-- CONTEXT : DSLModel!EmbeddingLink</commentsBefore> + <commentsBefore>-- RETURN : DSL!Role</commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> <definition location="78:8-82:68"> <feature xsi:type="ocl:Operation" location="78:43-82:68" name="getRole"> <returnType xsi:type="ocl:OclModelElement" location="78:55-78:63" name="Role"> - <model href="temp#/2"/> + <model href="new-model#/32"/> </returnType> <body xsi:type="ocl:LetExp" location="79:2-82:68"> <variable location="79:6-81:46" varName="a" variableExp="//@elements.6/@definition/@feature/@body/@in_/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="79:10-79:26" name="Relationship"> - <model href="temp#/2"/> + <model href="new-model#/33"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="80:3-81:46" operationName="first"> <source xsi:type="ocl:IteratorExp" location="80:3-81:37" name="select"> <source xsi:type="ocl:OperationCallExp" location="80:3-80:34" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="80:3-80:19" name="Relationship"> - <model href="temp#/2"/> + <model href="new-model#/34"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="81:17-81:35" operationName="="> @@ -396,7 +448,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="81:26-81:35" name="name"> <source xsi:type="ocl:VariableExp" location="81:26-81:30"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/35"/> </source> </arguments> </body> @@ -418,7 +470,7 @@ <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="82:42-82:57" name="type"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="82:42-82:52" name="owner"> <source xsi:type="ocl:VariableExp" location="82:42-82:46"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/36"/> </source> </source> </arguments> @@ -430,16 +482,19 @@ </feature> <context_ location="78:8-78:38"> <context_ xsi:type="ocl:OclModelElement" location="78:16-78:38" name="EmbeddingLink"> - <model href="temp#/1"/> + <model href="new-model#/31"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="88:1-103:2" name="Model"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> <outPattern location="91:2-102:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="92:3-102:4" varName="km"> <type xsi:type="ocl:OclModelElement" location="92:8-92:17" name="Model"> - <model href="temp#/0"/> + <model href="new-model#/38"/> </type> <bindings location="93:4-93:33" propertyName="metamodel"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="93:17-93:33" name="domainModel"> @@ -455,7 +510,7 @@ <body xsi:type="ocl:OperationCallExp" location="96:32-96:68" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="96:32-96:33" referredVariable="//@elements.7/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="96:46-96:67" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/39"/> </arguments> </body> <iterators location="96:28-96:29" varName="e" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@body/@source"/> @@ -468,7 +523,7 @@ <source xsi:type="ocl:OperationCallExp" location="98:20-98:60" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="98:20-98:21" referredVariable="//@elements.7/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="98:34-98:59" name="ModelElementLink"> - <model href="temp#/1"/> + <model href="new-model#/40"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="99:8-99:34" operationName="not"> @@ -488,16 +543,17 @@ <inPattern location="89:2-90:24"> <elements xsi:type="atl:SimpleInPatternElement" location="90:3-90:24" varName="dslm" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@source/@source //@elements.7/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@source/@source"> <type xsi:type="ocl:OclModelElement" location="90:10-90:24" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/37"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="105:1-120:2" name="ModelElement"> + <commentsAfter>-- This ModelElement corresponds to the KM3!Class created from a DSL!Relationship</commentsAfter> <outPattern location="110:2-119:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="111:3-119:4" varName="kme"> <type xsi:type="ocl:OclModelElement" location="111:9-111:25" name="ModelElement"> - <model href="temp#/0"/> + <model href="new-model#/43"/> </type> <bindings location="112:4-112:19" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="112:12-112:19" name="type"> @@ -517,12 +573,20 @@ </source> </elements> <elements xsi:type="ocl:CollectionOperationCallExp" location="116:5-116:36" operationName="asSequence"> + <commentsBefore>-- Attributes</commentsBefore> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="116:5-116:22" name="embeddinglinks"> - <source xsi:type="ocl:VariableExp" location="116:5-116:7" referredVariable="//@elements.8/@inPattern/@elements.0"/> + <commentsBefore>-- Attributes</commentsBefore> + <source xsi:type="ocl:VariableExp" location="116:5-116:7" referredVariable="//@elements.8/@inPattern/@elements.0"> + <commentsBefore>-- Attributes</commentsBefore> + </source> </source> </elements> <elements xsi:type="ocl:OperationCallExp" location="117:5-117:23" operationName="getReferences"> - <source xsi:type="ocl:VariableExp" location="117:5-117:7" referredVariable="//@elements.8/@inPattern/@elements.0"/> + <commentsBefore>-- Compositions</commentsBefore> + <commentsAfter>-- References</commentsAfter> + <source xsi:type="ocl:VariableExp" location="117:5-117:7" referredVariable="//@elements.8/@inPattern/@elements.0"> + <commentsBefore>-- Compositions</commentsBefore> + </source> </elements> </value> </bindings> @@ -531,22 +595,23 @@ <inPattern location="106:2-109:4"> <elements xsi:type="atl:SimpleInPatternElement" location="107:3-107:29" varName="me" variableExp="//@elements.8/@inPattern/@filter/@source //@elements.8/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.8/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.8/@outPattern/@elements.0/@bindings.2/@value/@elements.0/@source/@source //@elements.8/@outPattern/@elements.0/@bindings.2/@value/@elements.1/@source/@source //@elements.8/@outPattern/@elements.0/@bindings.2/@value/@elements.2/@source"> <type xsi:type="ocl:OclModelElement" location="107:8-107:29" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/41"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="108:4-108:41" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="108:4-108:6" referredVariable="//@elements.8/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OclModelElement" location="108:19-108:40" name="ModelElement"> - <model href="temp#/1"/> + <model href="new-model#/42"/> </arguments> </filter> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="123:1-138:2" name="ModelElementLink"> + <commentsBefore>-- This ModelElement corresponds to the KM3!Class created from a DSL!Relationship</commentsBefore> <outPattern location="128:2-137:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="129:3-137:4" varName="kme"> <type xsi:type="ocl:OclModelElement" location="129:9-129:25" name="ModelElement"> - <model href="temp#/0"/> + <model href="new-model#/45"/> </type> <bindings location="130:4-130:20" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="130:12-130:20" name="type"> @@ -561,6 +626,8 @@ <bindings location="132:4-136:6" propertyName="properties"> <value xsi:type="ocl:SequenceExp" location="133:5-136:6"> <elements xsi:type="ocl:CollectionOperationCallExp" location="134:6-134:34" operationName="asSequence"> + <commentsAfter>--,</commentsAfter> + <commentsAfter>--					mel.links.debug('roles')</commentsAfter> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="134:6-134:20" name="properties"> <source xsi:type="ocl:VariableExp" location="134:6-134:9" referredVariable="//@elements.9/@inPattern/@elements.0"/> </source> @@ -572,7 +639,7 @@ <inPattern location="124:2-127:4"> <elements xsi:type="atl:SimpleInPatternElement" location="125:3-125:34" varName="mel" variableExp="//@elements.9/@inPattern/@filter/@source/@source/@source //@elements.9/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.2/@value/@elements.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="125:9-125:34" name="ModelElementLink"> - <model href="temp#/1"/> + <model href="new-model#/44"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="126:4-126:32" operationName="not"> @@ -588,7 +655,7 @@ <outPattern location="145:2-155:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="146:3-149:4" varName="kp"> <type xsi:type="ocl:OclModelElement" location="146:8-146:20" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/47"/> </type> <bindings location="147:4-147:28" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="147:12-147:28" name="name"> @@ -603,7 +670,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="150:3-152:4" varName="s" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="150:7-150:17" name="SetVal"> - <model href="temp#/0"/> + <model href="new-model#/48"/> </type> <bindings location="151:4-151:17" propertyName="contents"> <value xsi:type="ocl:VariableExp" location="151:16-151:17" referredVariable="//@elements.10/@outPattern/@elements.2"/> @@ -611,7 +678,7 @@ </elements> <elements xsi:type="atl:ForEachOutPatternElement" location="153:3-155:4" varName="e" variableExp="//@elements.10/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="153:16-153:35" name="ModelElementVal"> - <model href="temp#/0"/> + <model href="new-model#/49"/> </type> <bindings location="154:5-154:17" propertyName="element"> <value xsi:type="ocl:VariableExp" location="154:16-154:17" referredVariable="//@elements.10/@outPattern/@elements.2/@iterator"/> @@ -625,7 +692,7 @@ <inPattern location="141:2-144:4"> <elements xsi:type="atl:SimpleInPatternElement" location="142:3-142:29" varName="p" variableExp="//@elements.10/@inPattern/@filter/@source/@source/@source/@source //@elements.10/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.10/@outPattern/@elements.0/@bindings.0/@value/@source/@source //@elements.10/@outPattern/@elements.2/@collection/@source"> <type xsi:type="ocl:OclModelElement" location="142:7-142:29" name="EmbeddingLink"> - <model href="temp#/1"/> + <model href="new-model#/46"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="143:4-143:46" operationName="or"> @@ -652,7 +719,7 @@ <outPattern location="163:2-170:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="164:3-167:4" varName="kp"> <type xsi:type="ocl:OclModelElement" location="164:8-164:20" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/51"/> </type> <bindings location="165:4-165:28" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="165:12-165:28" name="name"> @@ -667,7 +734,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="168:3-170:4" varName="e" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="168:7-168:26" name="ModelElementVal"> - <model href="temp#/0"/> + <model href="new-model#/52"/> </type> <bindings location="169:5-169:26" propertyName="element"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="169:16-169:26" name="elements"> @@ -679,7 +746,7 @@ <inPattern location="159:2-162:4"> <elements xsi:type="atl:SimpleInPatternElement" location="160:3-160:29" varName="p" variableExp="//@elements.11/@inPattern/@filter/@source/@source/@source //@elements.11/@outPattern/@elements.0/@bindings.0/@value/@source/@source //@elements.11/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="160:7-160:29" name="EmbeddingLink"> - <model href="temp#/1"/> + <model href="new-model#/50"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="161:4-161:23" operationName="="> @@ -696,7 +763,7 @@ <outPattern location="184:2-194:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="185:3-188:4" varName="p"> <type xsi:type="ocl:OclModelElement" location="185:7-185:19" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/56"/> </type> <bindings location="186:4-186:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="186:12-186:18" name="name"> @@ -709,7 +776,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="189:3-191:4" varName="s" variableExp="//@elements.12/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="189:7-189:17" name="SetVal"> - <model href="temp#/0"/> + <model href="new-model#/57"/> </type> <bindings location="190:4-190:19" propertyName="contents"> <value xsi:type="ocl:VariableExp" location="190:16-190:19" referredVariable="//@elements.12/@outPattern/@elements.2"/> @@ -717,7 +784,7 @@ </elements> <elements xsi:type="atl:ForEachOutPatternElement" location="192:3-194:4" varName="rol" variableExp="//@elements.12/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="192:18-192:40" name="ModelElementRefVal"> - <model href="temp#/0"/> + <model href="new-model#/58"/> </type> <bindings location="193:5-193:28" propertyName="element"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="193:16-193:28" name="element"> @@ -731,7 +798,7 @@ <variables location="182:4-182:98" varName="allroles" variableExp="//@elements.12/@outPattern/@elements.2/@collection"> <type xsi:type="ocl:SequenceType" location="182:15-182:38"> <elementType xsi:type="ocl:OclModelElement" location="182:24-182:37" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/55"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="182:41-182:97" name="select"> @@ -756,7 +823,7 @@ <inPattern location="174:2-180:4"> <elements xsi:type="atl:SimpleInPatternElement" location="175:3-175:20" varName="r" variableExp="//@elements.12/@inPattern/@filter/@condition/@arguments.0 //@elements.12/@inPattern/@filter/@thenExpression/@source //@elements.12/@variables.0/@initExpression/@source/@source/@source/@source //@elements.12/@variables.0/@initExpression/@body/@arguments.0/@source //@elements.12/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="175:7-175:20" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/53"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="176:4-179:9"> @@ -766,7 +833,7 @@ <condition xsi:type="ocl:OperationCallExp" location="176:7-176:45" operationName="includes"> <source xsi:type="ocl:OperationCallExp" location="176:7-176:33" operationName="propertyRoles"> <source xsi:type="ocl:VariableExp" location="176:7-176:17"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/54"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="176:43-176:44" referredVariable="//@elements.12/@inPattern/@elements.0"/> @@ -776,10 +843,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="197:1-216:2" name="PropertyFromDSLModelRole"> + <commentsAfter>-- Rules to create Simple Properties ( Integer, Double, String, Boolean )</commentsAfter> <outPattern location="208:2-215:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="209:3-212:4" varName="p"> <type xsi:type="ocl:OclModelElement" location="209:7-209:19" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/62"/> </type> <bindings location="210:4-210:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="210:12-210:18" name="name"> @@ -792,7 +860,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="213:3-215:4" varName="rol" variableExp="//@elements.13/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="213:9-213:31" name="ModelElementRefVal"> - <model href="temp#/0"/> + <model href="new-model#/63"/> </type> <bindings location="214:4-214:27" propertyName="element"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="214:15-214:27" name="element"> @@ -803,7 +871,7 @@ </outPattern> <variables location="206:4-206:92" varName="role" variableExp="//@elements.13/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="206:11-206:24" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/61"/> </type> <initExpression xsi:type="ocl:OperationCallExp" location="206:27-206:91" operationName="first"> <source xsi:type="ocl:IteratorExp" location="206:27-206:83" name="select"> @@ -829,7 +897,7 @@ <inPattern location="198:2-204:4"> <elements xsi:type="atl:SimpleInPatternElement" location="199:3-199:20" varName="r" variableExp="//@elements.13/@inPattern/@filter/@condition/@arguments.0 //@elements.13/@inPattern/@filter/@thenExpression/@source/@source //@elements.13/@variables.0/@initExpression/@source/@source/@source/@source/@source //@elements.13/@variables.0/@initExpression/@source/@body/@arguments.0/@source //@elements.13/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="199:7-199:20" name="Role"> - <model href="temp#/1"/> + <model href="new-model#/59"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="200:4-203:9"> @@ -841,7 +909,7 @@ <condition xsi:type="ocl:OperationCallExp" location="200:7-200:45" operationName="includes"> <source xsi:type="ocl:OperationCallExp" location="200:7-200:33" operationName="propertyRoles"> <source xsi:type="ocl:VariableExp" location="200:7-200:17"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/60"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="200:43-200:44" referredVariable="//@elements.13/@inPattern/@elements.0"/> @@ -851,10 +919,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="220:1-233:2" name="StringProperty"> + <commentsBefore>-- Rules to create Simple Properties ( Integer, Double, String, Boolean )</commentsBefore> <outPattern location="225:2-232:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="226:3-229:4" varName="p"> <type xsi:type="ocl:OclModelElement" location="226:7-226:19" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/66"/> </type> <bindings location="227:4-227:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="227:12-227:18" name="name"> @@ -867,7 +936,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="230:3-232:4" varName="s" variableExp="//@elements.14/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="230:7-230:20" name="StringVal"> - <model href="temp#/0"/> + <model href="new-model#/67"/> </type> <bindings location="231:4-231:26" propertyName="value"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="231:13-231:26" name="value"> @@ -881,7 +950,7 @@ <inPattern location="221:2-224:4"> <elements xsi:type="atl:SimpleInPatternElement" location="222:3-222:24" varName="v" variableExp="//@elements.14/@inPattern/@filter/@source/@source //@elements.14/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.14/@outPattern/@elements.1/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="222:7-222:24" name="Property"> - <model href="temp#/1"/> + <model href="new-model#/64"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="223:4-223:45" operationName="oclIsTypeOf"> @@ -889,7 +958,7 @@ <source xsi:type="ocl:VariableExp" location="223:4-223:5" referredVariable="//@elements.14/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="223:24-223:44" name="StringValue"> - <model href="temp#/1"/> + <model href="new-model#/65"/> </arguments> </filter> </inPattern> @@ -898,7 +967,7 @@ <outPattern location="240:2-247:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="241:3-244:4" varName="p"> <type xsi:type="ocl:OclModelElement" location="241:7-241:19" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/70"/> </type> <bindings location="242:4-242:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="242:12-242:18" name="name"> @@ -911,7 +980,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="245:3-247:4" varName="s" variableExp="//@elements.15/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="245:7-245:21" name="IntegerVal"> - <model href="temp#/0"/> + <model href="new-model#/71"/> </type> <bindings location="246:4-246:26" propertyName="value"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="246:13-246:26" name="value"> @@ -925,7 +994,7 @@ <inPattern location="236:2-239:4"> <elements xsi:type="atl:SimpleInPatternElement" location="237:3-237:24" varName="v" variableExp="//@elements.15/@inPattern/@filter/@source/@source //@elements.15/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.15/@outPattern/@elements.1/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="237:7-237:24" name="Property"> - <model href="temp#/1"/> + <model href="new-model#/68"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="238:4-238:46" operationName="oclIsTypeOf"> @@ -933,7 +1002,7 @@ <source xsi:type="ocl:VariableExp" location="238:4-238:5" referredVariable="//@elements.15/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="238:24-238:45" name="IntegerValue"> - <model href="temp#/1"/> + <model href="new-model#/69"/> </arguments> </filter> </inPattern> @@ -942,7 +1011,7 @@ <outPattern location="255:2-262:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="256:3-259:4" varName="p"> <type xsi:type="ocl:OclModelElement" location="256:7-256:19" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/74"/> </type> <bindings location="257:4-257:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="257:12-257:18" name="name"> @@ -955,7 +1024,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="260:3-262:4" varName="s" variableExp="//@elements.16/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="260:7-260:21" name="BooleanVal"> - <model href="temp#/0"/> + <model href="new-model#/75"/> </type> <bindings location="261:4-261:26" propertyName="value"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="261:13-261:26" name="value"> @@ -969,7 +1038,7 @@ <inPattern location="251:2-254:4"> <elements xsi:type="atl:SimpleInPatternElement" location="252:3-252:24" varName="v" variableExp="//@elements.16/@inPattern/@filter/@source/@source //@elements.16/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.16/@outPattern/@elements.1/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="252:7-252:24" name="Property"> - <model href="temp#/1"/> + <model href="new-model#/72"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="253:4-253:46" operationName="oclIsTypeOf"> @@ -977,7 +1046,7 @@ <source xsi:type="ocl:VariableExp" location="253:4-253:5" referredVariable="//@elements.16/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="253:24-253:45" name="BooleanValue"> - <model href="temp#/1"/> + <model href="new-model#/73"/> </arguments> </filter> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/KM32ATL_KM22MM/KM32ATL_KM22MM.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/KM32ATL_KM22MM/KM32ATL_KM22MM.atl.xmi index 4569258c..b1466ceb 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/KM32ATL_KM22MM/KM32ATL_KM22MM.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/KM32ATL_KM22MM/KM32ATL_KM22MM.atl.xmi @@ -1,30 +1,46 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-239:2" name="KM32ATL_KM22MM"> <inModels location="2:23-2:31" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="11:1-11:93"> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper contains KM3!Metamodel</commentsBefore> + <commentsBefore>-- CONTEXT: ThisModule</commentsBefore> + <commentsBefore>-- RETURN: KM3!Metamodel</commentsBefore> + <commentsAfter>-- This helper contains the name of the KM3!Package that is not PrimitiveTypes package</commentsAfter> + <commentsAfter>-- CONTEXT: ThisModule</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="11:8-11:92"> <feature xsi:type="ocl:Attribute" location="11:13-11:92" name="metamodel"> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="11:41-11:92" operationName="first"> <source xsi:type="ocl:CollectionOperationCallExp" location="11:41-11:83" operationName="asSequence"> <source xsi:type="ocl:OperationCallExp" location="11:41-11:69" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="11:41-11:54" name="Metamodel"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </source> </source> </source> </initExpression> <type xsi:type="ocl:OclModelElement" location="11:25-11:38" name="Metamodel"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="16:1-17:85"> + <commentsBefore>-- This helper contains the name of the KM3!Package that is not PrimitiveTypes package</commentsBefore> + <commentsBefore>-- CONTEXT: ThisModule</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper returns a Set that contains all structural features of a KM3!Class </commentsAfter> + <commentsAfter>-- including those in its supertypes</commentsAfter> + <commentsAfter>-- CONTEXT: KM3!Class</commentsAfter> + <commentsAfter>-- RETURN: Set(KM3!StructuralFeature)</commentsAfter> <definition location="16:8-17:84"> <feature xsi:type="ocl:Attribute" location="16:13-17:84" name="km3PackageName"> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="17:2-17:84" name="name"> @@ -32,7 +48,7 @@ <source xsi:type="ocl:IteratorExp" location="17:2-17:70" name="select"> <source xsi:type="ocl:OperationCallExp" location="17:2-17:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="17:2-17:13" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="17:42-17:68" operationName="<>"> @@ -50,17 +66,24 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="23:1-25:69"> + <commentsBefore>-- This helper returns a Set that contains all structural features of a KM3!Class </commentsBefore> + <commentsBefore>-- including those in its supertypes</commentsBefore> + <commentsBefore>-- CONTEXT: KM3!Class</commentsBefore> + <commentsBefore>-- RETURN: Set(KM3!StructuralFeature)</commentsBefore> + <commentsAfter>-- This helper returns a Sequence of KM3!Reference without their opposite</commentsAfter> + <commentsAfter>-- CONTEXT: ThisModule</commentsAfter> + <commentsAfter>-- RETURN: Sequence(KM3!Reference)</commentsAfter> <definition location="23:8-25:68"> <feature xsi:type="ocl:Operation" location="23:31-25:68" name="allStructuralFeatures"> <returnType xsi:type="ocl:SetType" location="23:57-23:83"> <elementType xsi:type="ocl:OclModelElement" location="23:61-23:82" name="StructuralFeature"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </elementType> </returnType> <body xsi:type="ocl:IterateExp" location="24:2-25:68"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="24:2-24:17" name="supertypes"> <source xsi:type="ocl:VariableExp" location="24:2-24:6"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/7"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="25:29-25:66" operationName="union"> @@ -73,12 +96,12 @@ <result location="24:30-25:26" varName="acc" variableExp="//@elements.2/@definition/@feature/@body/@body/@source"> <type xsi:type="ocl:SetType" location="24:36-24:62"> <elementType xsi:type="ocl:OclModelElement" location="24:40-24:61" name="StructuralFeature"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </elementType> </type> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="25:3-25:26" name="structuralFeatures"> <source xsi:type="ocl:VariableExp" location="25:3-25:7"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/9"/> </source> </initExpression> </result> @@ -86,18 +109,24 @@ </feature> <context_ location="23:8-23:25"> <context_ xsi:type="ocl:OclModelElement" location="23:16-23:25" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="30:1-44:11"> + <commentsBefore>-- This helper returns a Sequence of KM3!Reference without their opposite</commentsBefore> + <commentsBefore>-- CONTEXT: ThisModule</commentsBefore> + <commentsBefore>-- RETURN: Sequence(KM3!Reference)</commentsBefore> + <commentsAfter>-- This helper returns the name of the corresponding helper in KM2Tools library</commentsAfter> + <commentsAfter>-- CONTEXT: KM3!Attribute</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="30:8-44:10"> <feature xsi:type="ocl:Attribute" location="30:13-44:10" name="usedReferences"> <initExpression xsi:type="ocl:IterateExp" location="31:2-44:10"> <source xsi:type="ocl:OperationCallExp" location="31:2-31:30" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="31:2-31:15" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </source> </source> <body xsi:type="ocl:IfExp" location="32:3-44:8"> @@ -164,7 +193,7 @@ <result location="31:42-31:84" varName="acc" variableExp="//@elements.3/@definition/@feature/@initExpression/@body/@condition/@source //@elements.3/@definition/@feature/@initExpression/@body/@thenExpression //@elements.3/@definition/@feature/@initExpression/@body/@elseExpression/@thenExpression //@elements.3/@definition/@feature/@initExpression/@body/@elseExpression/@elseExpression/@thenExpression/@source //@elements.3/@definition/@feature/@initExpression/@body/@elseExpression/@elseExpression/@elseExpression/@thenExpression/@source //@elements.3/@definition/@feature/@initExpression/@body/@elseExpression/@elseExpression/@elseExpression/@elseExpression"> <type xsi:type="ocl:SequenceType" location="31:48-31:71"> <elementType xsi:type="ocl:OclModelElement" location="31:57-31:70" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="31:74-31:84"/> @@ -172,13 +201,19 @@ </initExpression> <type xsi:type="ocl:SequenceType" location="30:30-30:53"> <elementType xsi:type="ocl:OclModelElement" location="30:39-30:52" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="49:1-59:8"> + <commentsBefore>-- This helper returns the name of the corresponding helper in KM2Tools library</commentsBefore> + <commentsBefore>-- CONTEXT: KM3!Attribute</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>------------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ---------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>------------------------------------------------------------------------------------------</commentsAfter> <definition location="49:8-59:7"> <feature xsi:type="ocl:Operation" location="49:35-59:7" name="getOperationName"> <returnType xsi:type="ocl:StringType" location="49:56-49:62"/> @@ -188,7 +223,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="50:5-50:19" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="50:5-50:14" name="type"> <source xsi:type="ocl:VariableExp" location="50:5-50:9"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/14"/> </source> </source> </source> @@ -200,7 +235,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="52:11-52:25" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="52:11-52:20" name="type"> <source xsi:type="ocl:VariableExp" location="52:11-52:15"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/15"/> </source> </source> </source> @@ -212,7 +247,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="54:13-54:27" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="54:13-54:22" name="type"> <source xsi:type="ocl:VariableExp" location="54:13-54:17"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/16"/> </source> </source> </source> @@ -225,23 +260,26 @@ </feature> <context_ location="49:8-49:29"> <context_ xsi:type="ocl:OclModelElement" location="49:16-49:29" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="64:1-99:2" name="Metamodel"> + <commentsBefore>------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ---------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>------------------------------------------------------------------------------------------</commentsBefore> <outPattern location="67:2-98:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="68:3-80:4" varName="t" variableExp="//@elements.5/@outPattern/@elements.5/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="68:7-68:17" name="Module"> - <model href="temp#/0"/> + <model href="new-model#/18"/> </type> <bindings location="69:4-69:46" propertyName="name"> <value xsi:type="ocl:OperatorCallExp" location="69:12-69:46" operationName="+"> <source xsi:type="ocl:StringExp" location="69:12-69:18" stringSymbol="KM22"/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="69:21-69:46" name="km3PackageName"> <source xsi:type="ocl:VariableExp" location="69:21-69:31"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/19"/> </source> </arguments> </value> @@ -258,7 +296,7 @@ <source xsi:type="ocl:IteratorExp" location="74:6-75:55" name="select"> <source xsi:type="ocl:OperationCallExp" location="74:6-74:30" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="74:6-74:15" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="75:20-75:54" operationName="<>"> @@ -285,7 +323,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="81:3-84:4" varName="sm" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="81:8-81:20" name="OclModel"> - <model href="temp#/0"/> + <model href="new-model#/21"/> </type> <bindings location="82:4-82:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="82:12-82:16" stringSymbol="IN"/> @@ -296,7 +334,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="85:3-88:4" varName="tm" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="85:8-85:20" name="OclModel"> - <model href="temp#/0"/> + <model href="new-model#/22"/> </type> <bindings location="86:4-86:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="86:12-86:17" stringSymbol="OUT"/> @@ -307,7 +345,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="89:3-91:4" varName="mm1" variableExp="//@elements.5/@outPattern/@elements.1/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="89:9-89:21" name="OclModel"> - <model href="temp#/0"/> + <model href="new-model#/23"/> </type> <bindings location="90:4-90:17" propertyName="name"> <value xsi:type="ocl:StringExp" location="90:12-90:17" stringSymbol="KM2"/> @@ -315,19 +353,19 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="92:3-94:4" varName="mm2" variableExp="//@elements.5/@outPattern/@elements.2/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="92:9-92:21" name="OclModel"> - <model href="temp#/0"/> + <model href="new-model#/24"/> </type> <bindings location="93:4-93:37" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="93:12-93:37" name="km3PackageName"> <source xsi:type="ocl:VariableExp" location="93:12-93:22"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/25"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="95:3-98:4" varName="lib" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.4/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="95:9-95:23" name="LibraryRef"> - <model href="temp#/0"/> + <model href="new-model#/26"/> </type> <bindings location="96:4-96:22" propertyName="name"> <value xsi:type="ocl:StringExp" location="96:12-96:22" stringSymbol="KM2Tools"/> @@ -340,7 +378,7 @@ <inPattern location="65:2-66:20"> <elements xsi:type="atl:SimpleInPatternElement" location="66:3-66:20" varName="m"> <type xsi:type="ocl:OclModelElement" location="66:7-66:20" name="Metamodel"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </type> </elements> </inPattern> @@ -349,7 +387,7 @@ <outPattern location="111:2-168:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="112:3-118:4" varName="atl"> <type xsi:type="ocl:OclModelElement" location="112:9-112:24" name="MatchedRule"> - <model href="temp#/0"/> + <model href="new-model#/33"/> </type> <bindings location="113:4-113:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="113:12-113:18" name="name"> @@ -370,8 +408,9 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="120:3-123:4" varName="inPat" variableExp="//@elements.6/@outPattern/@elements.0/@bindings.1/@value"> + <commentsBefore>-- InPattern</commentsBefore> <type xsi:type="ocl:OclModelElement" location="120:11-120:24" name="InPattern"> - <model href="temp#/0"/> + <model href="new-model#/34"/> </type> <bindings location="121:4-121:25" propertyName="elements"> <value xsi:type="ocl:VariableExp" location="121:16-121:25" referredVariable="//@elements.6/@outPattern/@elements.6"/> @@ -381,8 +420,9 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="125:3-129:4" varName="oc" variableExp="//@elements.6/@outPattern/@elements.1/@bindings.1/@value"> + <commentsBefore>-- Filter	</commentsBefore> <type xsi:type="ocl:OclModelElement" location="125:8-125:27" name="OperatorCallExp"> - <model href="temp#/0"/> + <model href="new-model#/35"/> </type> <bindings location="126:4-126:24" propertyName="operationName"> <value xsi:type="ocl:StringExp" location="126:21-126:24" stringSymbol="="/> @@ -398,7 +438,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="130:3-133:4" varName="noac" variableExp="//@elements.6/@outPattern/@elements.2/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="130:10-130:42" name="NavigationOrAttributeCallExp"> - <model href="temp#/0"/> + <model href="new-model#/36"/> </type> <bindings location="131:4-131:18" propertyName="name"> <value xsi:type="ocl:StringExp" location="131:12-131:18" stringSymbol="name"/> @@ -409,7 +449,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="134:3-137:4" varName="fv" variableExp="//@elements.6/@outPattern/@elements.3/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="134:8-134:23" name="VariableExp"> - <model href="temp#/0"/> + <model href="new-model#/37"/> </type> <bindings location="135:4-135:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="135:12-135:16" stringSymbol="me"/> @@ -420,7 +460,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="138:3-140:4" varName="s" variableExp="//@elements.6/@outPattern/@elements.2/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="138:7-138:20" name="StringExp"> - <model href="temp#/0"/> + <model href="new-model#/38"/> </type> <bindings location="139:4-139:26" propertyName="stringSymbol"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="139:20-139:26" name="name"> @@ -430,7 +470,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="142:3-146:4" varName="elementin" variableExp="//@elements.6/@outPattern/@elements.1/@bindings.0/@value //@elements.6/@outPattern/@elements.4/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="142:15-142:41" name="SimpleInPatternElement"> - <model href="temp#/0"/> + <model href="new-model#/39"/> </type> <bindings location="143:4-143:15" propertyName="id"> <value xsi:type="ocl:StringExp" location="143:10-143:15" stringSymbol="me0"/> @@ -444,7 +484,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="147:3-150:4" varName="intype" variableExp="//@elements.6/@outPattern/@elements.6/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="147:12-147:31" name="OclModelElement"> - <model href="temp#/0"/> + <model href="new-model#/40"/> </type> <bindings location="148:4-148:26" propertyName="name"> <value xsi:type="ocl:StringExp" location="148:12-148:26" stringSymbol="ModelElement"/> @@ -452,11 +492,11 @@ <bindings location="149:4-149:63" propertyName="model"> <value xsi:type="ocl:OperationCallExp" location="149:13-149:63" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="149:13-149:23"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/41"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="149:36-149:56" name="metamodel"> <source xsi:type="ocl:VariableExp" location="149:36-149:46"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/42"/> </source> </arguments> <arguments xsi:type="ocl:StringExp" location="149:57-149:62" stringSymbol="mm1"/> @@ -464,8 +504,9 @@ </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="153:3-155:4" varName="outPat" variableExp="//@elements.6/@outPattern/@elements.0/@bindings.2/@value"> + <commentsBefore>-- OutPattern</commentsBefore> <type xsi:type="ocl:OclModelElement" location="153:12-153:26" name="OutPattern"> - <model href="temp#/0"/> + <model href="new-model#/43"/> </type> <bindings location="154:4-154:26" propertyName="elements"> <value xsi:type="ocl:VariableExp" location="154:16-154:26" referredVariable="//@elements.6/@outPattern/@elements.9"/> @@ -473,7 +514,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="156:3-164:4" varName="elementout" variableExp="//@elements.6/@outPattern/@elements.8/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="156:16-156:43" name="SimpleOutPatternElement"> - <model href="temp#/0"/> + <model href="new-model#/44"/> </type> <bindings location="157:4-157:18" propertyName="varName"> <value xsi:type="ocl:StringExp" location="157:15-157:18" stringSymbol="c"/> @@ -488,7 +529,7 @@ <body xsi:type="ocl:CollectionOperationCallExp" location="161:26-161:64" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="161:26-161:51" name="usedReferences"> <source xsi:type="ocl:VariableExp" location="161:26-161:36"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/45"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="161:62-161:63" referredVariable="//@elements.6/@outPattern/@elements.9/@bindings.2/@value/@elements.0/@iterators.0"/> @@ -501,7 +542,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="165:3-168:4" varName="outtype" variableExp="//@elements.6/@outPattern/@elements.9/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="165:13-165:32" name="OclModelElement"> - <model href="temp#/0"/> + <model href="new-model#/46"/> </type> <bindings location="166:4-166:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="166:12-166:18" name="name"> @@ -511,11 +552,11 @@ <bindings location="167:4-167:63" propertyName="model"> <value xsi:type="ocl:OperationCallExp" location="167:13-167:63" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="167:13-167:23"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/47"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="167:36-167:56" name="metamodel"> <source xsi:type="ocl:VariableExp" location="167:36-167:46"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/48"/> </source> </arguments> <arguments xsi:type="ocl:StringExp" location="167:57-167:62" stringSymbol="mm2"/> @@ -526,7 +567,7 @@ <variables location="107:3-107:67" varName="allSfs" variableExp="//@elements.6/@variables.1/@initExpression/@source //@elements.6/@variables.2/@initExpression/@source"> <type xsi:type="ocl:SetType" location="107:12-107:38"> <elementType xsi:type="ocl:OclModelElement" location="107:16-107:37" name="StructuralFeature"> - <model href="temp#/1"/> + <model href="new-model#/28"/> </elementType> </type> <initExpression xsi:type="ocl:OperationCallExp" location="107:41-107:66" operationName="allStructuralFeatures"> @@ -536,7 +577,7 @@ <variables location="108:3-108:85" varName="allRefs" variableExp="//@elements.6/@outPattern/@elements.9/@bindings.2/@value/@elements.0/@source"> <type xsi:type="ocl:SetType" location="108:13-108:31"> <elementType xsi:type="ocl:OclModelElement" location="108:17-108:30" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/29"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="108:35-108:84" name="select"> @@ -544,7 +585,7 @@ <body xsi:type="ocl:OperationCallExp" location="108:54-108:82" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="108:54-108:55" referredVariable="//@elements.6/@variables.1/@initExpression/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="108:68-108:81" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/30"/> </arguments> </body> <iterators location="108:50-108:51" varName="e" variableExp="//@elements.6/@variables.1/@initExpression/@body/@source"/> @@ -553,7 +594,7 @@ <variables location="109:3-109:85" varName="allAttr" variableExp="//@elements.6/@outPattern/@elements.9/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:SetType" location="109:13-109:31"> <elementType xsi:type="ocl:OclModelElement" location="109:17-109:30" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/31"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="109:35-109:84" name="select"> @@ -561,7 +602,7 @@ <body xsi:type="ocl:OperationCallExp" location="109:54-109:82" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="109:54-109:55" referredVariable="//@elements.6/@variables.2/@initExpression/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="109:68-109:81" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/32"/> </arguments> </body> <iterators location="109:50-109:51" varName="e" variableExp="//@elements.6/@variables.2/@initExpression/@body/@source"/> @@ -570,7 +611,7 @@ <inPattern location="102:2-105:4"> <elements xsi:type="atl:SimpleInPatternElement" location="103:3-103:16" varName="c" variableExp="//@elements.6/@inPattern/@filter/@source/@source/@source //@elements.6/@variables.0/@initExpression/@source //@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.6/@outPattern/@elements.5/@bindings.0/@value/@source //@elements.6/@outPattern/@elements.10/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="103:7-103:16" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/27"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="104:4-104:38" operationName="<>"> @@ -587,7 +628,7 @@ <outPattern location="174:2-190:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="175:3-178:4" varName="b"> <type xsi:type="ocl:OclModelElement" location="175:7-175:18" name="Binding"> - <model href="temp#/0"/> + <model href="new-model#/50"/> </type> <bindings location="176:4-176:26" propertyName="propertyName"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="176:20-176:26" name="name"> @@ -600,7 +641,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="179:3-183:4" varName="oc" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="179:8-179:28" name="OperationCallExp"> - <model href="temp#/0"/> + <model href="new-model#/51"/> </type> <bindings location="180:4-180:41" propertyName="operationName"> <value xsi:type="ocl:OperationCallExp" location="180:21-180:41" operationName="getOperationName"> @@ -618,7 +659,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="184:3-187:4" varName="fv" variableExp="//@elements.7/@outPattern/@elements.1/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="184:8-184:23" name="VariableExp"> - <model href="temp#/0"/> + <model href="new-model#/52"/> </type> <bindings location="185:4-185:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="185:12-185:16" stringSymbol="me"/> @@ -626,7 +667,7 @@ <bindings location="186:4-186:67" propertyName="referredVariable"> <value xsi:type="ocl:OperationCallExp" location="186:24-186:67" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="186:24-186:34"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/53"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="186:47-186:54" name="owner"> <source xsi:type="ocl:VariableExp" location="186:47-186:48" referredVariable="//@elements.7/@inPattern/@elements.0"/> @@ -637,7 +678,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="188:3-190:4" varName="s" variableExp="//@elements.7/@outPattern/@elements.1/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="188:7-188:20" name="StringExp"> - <model href="temp#/0"/> + <model href="new-model#/54"/> </type> <bindings location="189:4-189:26" propertyName="stringSymbol"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="189:20-189:26" name="name"> @@ -649,7 +690,7 @@ <inPattern location="172:2-173:20"> <elements xsi:type="atl:SimpleInPatternElement" location="173:3-173:20" varName="a" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.2/@bindings.1/@value/@arguments.0/@source //@elements.7/@outPattern/@elements.3/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="173:7-173:20" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/49"/> </type> </elements> </inPattern> @@ -658,7 +699,7 @@ <outPattern location="198:2-214:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="199:3-202:4" varName="b"> <type xsi:type="ocl:OclModelElement" location="199:7-199:18" name="Binding"> - <model href="temp#/0"/> + <model href="new-model#/57"/> </type> <bindings location="200:4-200:26" propertyName="propertyName"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="200:20-200:26" name="name"> @@ -671,7 +712,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="203:3-207:4" varName="oc" variableExp="//@elements.8/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="203:8-203:28" name="OperationCallExp"> - <model href="temp#/0"/> + <model href="new-model#/58"/> </type> <bindings location="204:4-204:74" propertyName="operationName"> <value xsi:type="ocl:IfExp" location="204:21-204:74"> @@ -693,7 +734,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="208:3-211:4" varName="fv" variableExp="//@elements.8/@outPattern/@elements.1/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="208:8-208:23" name="VariableExp"> - <model href="temp#/0"/> + <model href="new-model#/59"/> </type> <bindings location="209:4-209:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="209:12-209:16" stringSymbol="me"/> @@ -701,7 +742,7 @@ <bindings location="210:4-210:67" propertyName="referredVariable"> <value xsi:type="ocl:OperationCallExp" location="210:24-210:67" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="210:24-210:34"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/60"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="210:47-210:54" name="owner"> <source xsi:type="ocl:VariableExp" location="210:47-210:48" referredVariable="//@elements.8/@inPattern/@elements.0"/> @@ -712,7 +753,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="212:3-214:4" varName="s" variableExp="//@elements.8/@outPattern/@elements.1/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="212:7-212:20" name="StringExp"> - <model href="temp#/0"/> + <model href="new-model#/61"/> </type> <bindings location="213:4-213:26" propertyName="stringSymbol"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="213:20-213:26" name="name"> @@ -724,14 +765,14 @@ <inPattern location="194:2-197:4"> <elements xsi:type="atl:SimpleInPatternElement" location="195:3-195:20" varName="r" variableExp="//@elements.8/@inPattern/@filter/@source/@arguments.0 //@elements.8/@inPattern/@filter/@arguments.0/@source/@source //@elements.8/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.8/@outPattern/@elements.1/@bindings.0/@value/@condition/@source //@elements.8/@outPattern/@elements.2/@bindings.1/@value/@arguments.0/@source //@elements.8/@outPattern/@elements.3/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="195:7-195:20" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/55"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="196:4-196:60" operationName="and"> <source xsi:type="ocl:CollectionOperationCallExp" location="196:4-196:42" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="196:4-196:29" name="usedReferences"> <source xsi:type="ocl:VariableExp" location="196:4-196:14"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/56"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="196:40-196:41" referredVariable="//@elements.8/@inPattern/@elements.0"/> @@ -752,7 +793,7 @@ <outPattern location="222:2-238:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="223:3-226:4" varName="b"> <type xsi:type="ocl:OclModelElement" location="223:7-223:18" name="Binding"> - <model href="temp#/0"/> + <model href="new-model#/64"/> </type> <bindings location="224:4-224:26" propertyName="propertyName"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="224:20-224:26" name="name"> @@ -765,7 +806,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="227:3-231:4" varName="oc" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="227:8-227:28" name="OperationCallExp"> - <model href="temp#/0"/> + <model href="new-model#/65"/> </type> <bindings location="228:4-228:26" propertyName="operationName"> <value xsi:type="ocl:StringExp" location="228:21-228:26" stringSymbol="get"/> @@ -781,7 +822,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="232:3-235:4" varName="fv" variableExp="//@elements.9/@outPattern/@elements.1/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="232:8-232:23" name="VariableExp"> - <model href="temp#/0"/> + <model href="new-model#/66"/> </type> <bindings location="233:4-233:16" propertyName="name"> <value xsi:type="ocl:StringExp" location="233:12-233:16" stringSymbol="me"/> @@ -789,7 +830,7 @@ <bindings location="234:4-234:67" propertyName="referredVariable"> <value xsi:type="ocl:OperationCallExp" location="234:24-234:67" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="234:24-234:34"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/67"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="234:47-234:54" name="owner"> <source xsi:type="ocl:VariableExp" location="234:47-234:48" referredVariable="//@elements.9/@inPattern/@elements.0"/> @@ -800,7 +841,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="236:3-238:4" varName="s" variableExp="//@elements.9/@outPattern/@elements.1/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="236:7-236:20" name="StringExp"> - <model href="temp#/0"/> + <model href="new-model#/68"/> </type> <bindings location="237:4-237:26" propertyName="stringSymbol"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="237:20-237:26" name="name"> @@ -812,14 +853,14 @@ <inPattern location="218:2-221:4"> <elements xsi:type="atl:SimpleInPatternElement" location="219:3-219:20" varName="r" variableExp="//@elements.9/@inPattern/@filter/@source/@arguments.0 //@elements.9/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.9/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.2/@bindings.1/@value/@arguments.0/@source //@elements.9/@outPattern/@elements.3/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="219:7-219:20" name="Reference"> - <model href="temp#/1"/> + <model href="new-model#/62"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="220:4-220:66" operationName="and"> <source xsi:type="ocl:CollectionOperationCallExp" location="220:4-220:42" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="220:4-220:29" name="usedReferences"> <source xsi:type="ocl:VariableExp" location="220:4-220:14"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/63"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="220:40-220:41" referredVariable="//@elements.9/@inPattern/@elements.0"/> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/XML2DSLModel/XML2DSLModel.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/XML2DSLModel/XML2DSLModel.atl.xmi index 5cd7f5db..3e428efb 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/XML2DSLModel/XML2DSLModel.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/DSLBridge/ModelBridge/XML2DSLModel/XML2DSLModel.atl.xmi @@ -1,15 +1,24 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-396:2" name="XML2DSLModel"> <inModels location="2:29-2:38" name="IN1"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <inModels location="2:40-2:49" name="IN2"> - <metamodel href="temp#/2"/> + <metamodel href="new-model#/2"/> </inModels> <outModels location="2:8-2:22" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="11:1-12:92"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper recovers the Domainmodel name</commentsBefore> + <commentsBefore>-- CONTEXT : thisModule</commentsBefore> + <commentsBefore>-- RETURN : String</commentsBefore> + <commentsAfter>-- This helper recover the namespace of the Domainmodel</commentsAfter> + <commentsAfter>-- CONTEXT : thisModule</commentsAfter> + <commentsAfter>-- RETURN : String</commentsAfter> <definition location="11:8-12:91"> <feature xsi:type="ocl:Operation" location="11:14-12:91" name="getDomainModelName"> <returnType xsi:type="ocl:StringType" location="11:37-11:43"/> @@ -18,13 +27,13 @@ <source xsi:type="ocl:IteratorExp" location="12:2-12:77" name="select"> <source xsi:type="ocl:OperationCallExp" location="12:2-12:32" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="12:2-12:17" name="DomainModel"> - <model href="temp#/2"/> + <model href="new-model#/3"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="12:46-12:76" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="12:46-12:47" referredVariable="//@elements.0/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="12:60-12:75" name="DomainModel"> - <model href="temp#/2"/> + <model href="new-model#/4"/> </arguments> </body> <iterators location="12:42-12:43" varName="e" variableExp="//@elements.0/@definition/@feature/@body/@source/@source/@body/@source"/> @@ -35,6 +44,12 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="17:1-17:140"> + <commentsBefore>-- This helper recover the namespace of the Domainmodel</commentsBefore> + <commentsBefore>-- CONTEXT : thisModule</commentsBefore> + <commentsBefore>-- RETURN : String</commentsBefore> + <commentsAfter>-- This helper subtitute the namespace to elements type</commentsAfter> + <commentsAfter>-- CONTEXT : thisModule</commentsAfter> + <commentsAfter>-- RETURN : String</commentsAfter> <definition location="17:8-17:139"> <feature xsi:type="ocl:Operation" location="17:14-17:139" name="getNamespace"> <returnType xsi:type="ocl:StringType" location="17:31-17:37"/> @@ -44,13 +59,13 @@ <source xsi:type="ocl:IteratorExp" location="17:41-17:116" name="select"> <source xsi:type="ocl:OperationCallExp" location="17:41-17:71" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="17:41-17:56" name="DomainModel"> - <model href="temp#/2"/> + <model href="new-model#/5"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="17:85-17:115" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="17:85-17:86" referredVariable="//@elements.1/@definition/@feature/@body/@source/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="17:99-17:114" name="DomainModel"> - <model href="temp#/2"/> + <model href="new-model#/6"/> </arguments> </body> <iterators location="17:81-17:82" varName="e" variableExp="//@elements.1/@definition/@feature/@body/@source/@source/@source/@body/@source"/> @@ -63,6 +78,12 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="22:1-22:116"> + <commentsBefore>-- This helper subtitute the namespace to elements type</commentsBefore> + <commentsBefore>-- CONTEXT : thisModule</commentsBefore> + <commentsBefore>-- RETURN : String</commentsBefore> + <commentsAfter>-- This helper gets the Attribute who has value name = name and return it to a Boolean</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="22:8-22:115"> <feature xsi:type="ocl:Operation" location="22:14-22:115" name="subNamespace"> <parameters location="22:27-22:40" varName="type" variableExp="//@elements.2/@definition/@feature/@body/@source //@elements.2/@definition/@feature/@body/@arguments.1/@source"> @@ -75,7 +96,7 @@ <source xsi:type="ocl:OperationCallExp" location="22:68-22:100" operationName="size"> <source xsi:type="ocl:OperationCallExp" location="22:68-22:93" operationName="getNamespace"> <source xsi:type="ocl:VariableExp" location="22:68-22:78"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/7"/> </source> </source> </source> @@ -89,6 +110,12 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="27:1-30:45"> + <commentsBefore>-- This helper gets the Attribute who has value name = name and return it to a Boolean</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper gets the Attribute who has value name = name</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: String</commentsAfter> <definition location="27:8-30:44"> <feature xsi:type="ocl:Operation" location="27:33-30:44" name="getAttrBool"> <parameters location="27:45-27:58" varName="name" variableExp="//@elements.3/@definition/@feature/@body/@variable/@initExpression/@source/@source/@body/@arguments.0/@arguments.0"> @@ -103,14 +130,14 @@ <source xsi:type="ocl:IteratorExp" location="29:5-29:78" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="29:5-29:18" name="children"> <source xsi:type="ocl:VariableExp" location="29:5-29:9"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/9"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="29:31-29:77" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="29:31-29:59" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="29:31-29:32" referredVariable="//@elements.3/@definition/@feature/@body/@variable/@initExpression/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="29:45-29:58" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="29:64-29:77" operationName="="> @@ -137,12 +164,18 @@ </feature> <context_ location="27:8-27:27"> <context_ xsi:type="ocl:OclModelElement" location="27:16-27:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="35:1-36:91"> + <commentsBefore>-- This helper gets the Attribute who has value name = name</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: String</commentsBefore> + <commentsAfter>-- This helper tests if the XML!Element has an attribute with the name in parameter</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="35:8-36:90"> <feature xsi:type="ocl:Operation" location="35:33-36:90" name="getAttrVal"> <parameters location="35:44-35:57" varName="name" variableExp="//@elements.4/@definition/@feature/@body/@source/@source/@body/@arguments.0/@arguments.0"> @@ -154,14 +187,14 @@ <source xsi:type="ocl:IteratorExp" location="36:2-36:75" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="36:2-36:15" name="children"> <source xsi:type="ocl:VariableExp" location="36:2-36:6"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/12"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="36:28-36:74" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="36:28-36:56" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="36:28-36:29" referredVariable="//@elements.4/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="36:42-36:55" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="36:61-36:74" operationName="="> @@ -178,12 +211,19 @@ </feature> <context_ location="35:8-35:27"> <context_ xsi:type="ocl:OclModelElement" location="35:16-35:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="41:1-46:8"> + <commentsBefore>-- This helper tests if the XML!Element has an attribute with the name in parameter</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper produce a Map of XML!Element corresponding to om:ModelElement </commentsAfter> + <commentsAfter>-- by identity to help making references</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Map(String, XML!Element)</commentsAfter> <definition location="41:8-46:7"> <feature xsi:type="ocl:Operation" location="41:33-46:7" name="hasAttr"> <parameters location="41:41-41:54" varName="name" variableExp="//@elements.5/@definition/@feature/@body/@variable/@initExpression/@source/@body/@arguments.0/@arguments.0 //@elements.5/@definition/@feature/@body/@in_/@thenExpression/@arguments.0"> @@ -193,20 +233,20 @@ <body xsi:type="ocl:LetExp" location="42:2-46:7"> <variable location="42:6-43:86" varName="a" variableExp="//@elements.5/@definition/@feature/@body/@in_/@condition/@source //@elements.5/@definition/@feature/@body/@in_/@thenExpression/@source/@source"> <type xsi:type="ocl:OclModelElement" location="42:10-42:23" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="43:2-43:86" operationName="first"> <source xsi:type="ocl:IteratorExp" location="43:2-43:77" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="43:2-43:15" name="children"> <source xsi:type="ocl:VariableExp" location="43:2-43:6"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/16"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="43:29-43:75" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="43:29-43:57" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="43:29-43:30" referredVariable="//@elements.5/@definition/@feature/@body/@variable/@initExpression/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="43:43-43:56" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="43:62-43:75" operationName="="> @@ -230,7 +270,7 @@ <condition xsi:type="ocl:OperationCallExp" location="44:9-44:37" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="44:9-44:10" referredVariable="//@elements.5/@definition/@feature/@body/@variable"/> <arguments xsi:type="ocl:OclModelElement" location="44:23-44:36" name="Attribute"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="45:30-45:35"/> @@ -239,18 +279,26 @@ </feature> <context_ location="41:8-41:27"> <context_ xsi:type="ocl:OclModelElement" location="41:16-41:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="52:1-59:7"> + <commentsBefore>-- This helper produce a Map of XML!Element corresponding to om:ModelElement </commentsBefore> + <commentsBefore>-- by identity to help making references</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Map(String, XML!Element)</commentsBefore> + <commentsAfter>-- This helper produce a Map of XML!Element corresponding to om:ElementLink</commentsAfter> + <commentsAfter>-- by identity to help making references</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: Map(String, XML!Element)</commentsAfter> <definition location="52:8-59:6"> <feature xsi:type="ocl:Attribute" location="52:13-59:6" name="ModelElementsById"> <initExpression xsi:type="ocl:IterateExp" location="53:5-59:6"> <source xsi:type="ocl:OperationCallExp" location="53:5-53:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="53:5-53:16" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/20"/> </source> </source> <body xsi:type="ocl:IfExp" location="54:9-58:14"> @@ -280,7 +328,7 @@ <result location="53:44-53:82" varName="acc" variableExp="//@elements.6/@definition/@feature/@initExpression/@body/@thenExpression/@source //@elements.6/@definition/@feature/@initExpression/@body/@elseExpression"> <type xsi:type="ocl:MapType" location="53:50-53:73"> <valueType xsi:type="ocl:OclModelElement" location="53:61-53:72" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </valueType> <keyType xsi:type="ocl:StringType" location="53:54-53:60"/> </type> @@ -289,7 +337,7 @@ </initExpression> <type xsi:type="ocl:MapType" location="52:33-52:57"> <valueType xsi:type="ocl:OclModelElement" location="52:45-52:56" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </valueType> <keyType xsi:type="ocl:StringType" location="52:37-52:43"/> </type> @@ -297,12 +345,19 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="65:1-72:7"> + <commentsBefore>-- This helper produce a Map of XML!Element corresponding to om:ElementLink</commentsBefore> + <commentsBefore>-- by identity to help making references</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: Map(String, XML!Element)</commentsBefore> + <commentsAfter>-- This helper recognize the XML!Element with a Type Attribute who terminate by Diagram</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="65:8-72:6"> <feature xsi:type="ocl:Attribute" location="65:13-72:6" name="ElementLinksById"> <initExpression xsi:type="ocl:IterateExp" location="66:5-72:6"> <source xsi:type="ocl:OperationCallExp" location="66:5-66:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="66:5-66:16" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/23"/> </source> </source> <body xsi:type="ocl:IfExp" location="67:9-71:14"> @@ -332,7 +387,7 @@ <result location="66:44-66:82" varName="acc" variableExp="//@elements.7/@definition/@feature/@initExpression/@body/@thenExpression/@source //@elements.7/@definition/@feature/@initExpression/@body/@elseExpression"> <type xsi:type="ocl:MapType" location="66:50-66:73"> <valueType xsi:type="ocl:OclModelElement" location="66:61-66:72" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/24"/> </valueType> <keyType xsi:type="ocl:StringType" location="66:54-66:60"/> </type> @@ -341,7 +396,7 @@ </initExpression> <type xsi:type="ocl:MapType" location="65:32-65:56"> <valueType xsi:type="ocl:OclModelElement" location="65:44-65:55" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/22"/> </valueType> <keyType xsi:type="ocl:StringType" location="65:36-65:42"/> </type> @@ -349,6 +404,13 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="77:1-80:50"> + <commentsBefore>-- This helper recognize the XML!Element with a Type Attribute who terminate by Diagram</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper return the XML!Element named om:ModelElemnt which is the Element whith a type </commentsAfter> + <commentsAfter>-- that terminate by Diagram</commentsAfter> + <commentsAfter>-- CONTEXT: thisModule</commentsAfter> + <commentsAfter>-- RETURN: XML!Element</commentsAfter> <definition location="77:8-80:49"> <feature xsi:type="ocl:Operation" location="77:33-80:49" name="isElementDiagram"> <returnType xsi:type="ocl:BooleanType" location="77:54-77:61"/> @@ -357,7 +419,7 @@ <type xsi:type="ocl:StringType" location="78:10-78:16"/> <initExpression xsi:type="ocl:OperationCallExp" location="78:19-78:42" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="78:19-78:23"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/26"/> </source> <arguments xsi:type="ocl:StringExp" location="78:35-78:41" stringSymbol="Type"/> </initExpression> @@ -391,30 +453,37 @@ </feature> <context_ location="77:8-77:27"> <context_ xsi:type="ocl:OclModelElement" location="77:16-77:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/25"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="86:1-88:47"> + <commentsBefore>-- This helper return the XML!Element named om:ModelElemnt which is the Element whith a type </commentsBefore> + <commentsBefore>-- that terminate by Diagram</commentsBefore> + <commentsBefore>-- CONTEXT: thisModule</commentsBefore> + <commentsBefore>-- RETURN: XML!Element</commentsBefore> + <commentsAfter>-- This helper recognize the XML!Element who are children of e</commentsAfter> + <commentsAfter>-- CONTEXT: XML!Element</commentsAfter> + <commentsAfter>-- RETURN: Boolean</commentsAfter> <definition location="86:8-88:46"> <feature xsi:type="ocl:Operation" location="86:14-88:46" name="elementToAvoid"> <returnType xsi:type="ocl:OclModelElement" location="86:33-86:44" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/27"/> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="87:3-88:46" operationName="first"> <source xsi:type="ocl:IteratorExp" location="87:3-88:37" name="select"> <source xsi:type="ocl:IteratorExp" location="87:3-87:101" name="select"> <source xsi:type="ocl:OperationCallExp" location="87:3-87:29" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="87:3-87:14" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/28"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="87:42-87:99" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="87:42-87:68" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="87:42-87:43" referredVariable="//@elements.9/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="87:56-87:67" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/29"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="87:73-87:99" operationName="="> @@ -436,11 +505,17 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="93:1-102:7"> + <commentsBefore>-- This helper recognize the XML!Element who are children of e</commentsBefore> + <commentsBefore>-- CONTEXT: XML!Element</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This Module test if an XML!Element has the same Id has an ElementLink</commentsAfter> + <commentsAfter>-- CONTEXT : XML!Element</commentsAfter> + <commentsAfter>-- RETURN : Boolean</commentsAfter> <definition location="93:8-102:6"> <feature xsi:type="ocl:Operation" location="93:33-102:6" name="isChildrenOf"> <parameters location="93:46-93:61" varName="e" variableExp="//@elements.10/@definition/@feature/@body/@variable/@initExpression/@thenExpression/@condition/@arguments.0 //@elements.10/@definition/@feature/@body/@variable/@initExpression/@thenExpression/@elseExpression/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="93:50-93:61" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/31"/> </type> </parameters> <returnType xsi:type="ocl:BooleanType" location="93:65-93:72"/> @@ -453,7 +528,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="96:12-96:27" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="96:12-96:23" name="parent"> <source xsi:type="ocl:VariableExp" location="96:12-96:16"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/34"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="96:26-96:27" referredVariable="//@elements.10/@definition/@feature/@parameters.0"/> @@ -461,7 +536,7 @@ <elseExpression xsi:type="ocl:OperationCallExp" location="98:11-98:38" operationName="isChildrenOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="98:11-98:22" name="parent"> <source xsi:type="ocl:VariableExp" location="98:11-98:15"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/35"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="98:36-98:37" referredVariable="//@elements.10/@definition/@feature/@parameters.0"/> @@ -470,11 +545,11 @@ <condition xsi:type="ocl:OperationCallExp" location="95:6-95:42" operationName="oclIsKindOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="95:6-95:17" name="parent"> <source xsi:type="ocl:VariableExp" location="95:6-95:10"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/32"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="95:30-95:41" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="100:9-100:14"/> @@ -485,12 +560,18 @@ </feature> <context_ location="93:8-93:27"> <context_ xsi:type="ocl:OclModelElement" location="93:16-93:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/30"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="107:1-111:21"> + <commentsBefore>-- This Module test if an XML!Element has the same Id has an ElementLink</commentsBefore> + <commentsBefore>-- CONTEXT : XML!Element</commentsBefore> + <commentsBefore>-- RETURN : Boolean</commentsBefore> + <commentsAfter>-- This helper collects in a Sequence all ElementLinks that have the same Id as the parameter</commentsAfter> + <commentsAfter>-- CONTEXT : thisModule</commentsAfter> + <commentsAfter>-- RETURN : Sequence(XML!Element)</commentsAfter> <definition location="107:8-111:20"> <feature xsi:type="ocl:Operation" location="107:34-111:20" name="isElementLink"> <returnType xsi:type="ocl:BooleanType" location="107:52-107:59"/> @@ -498,7 +579,7 @@ <variable location="108:6-110:73" varName="a" variableExp="//@elements.11/@definition/@feature/@body/@in_/@source/@source"> <type xsi:type="ocl:SequenceType" location="108:10-108:31"> <elementType xsi:type="ocl:OclModelElement" location="108:19-108:30" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/37"/> </elementType> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="109:4-110:73" operationName="asSequence"> @@ -506,7 +587,7 @@ <source xsi:type="ocl:IteratorExp" location="109:4-109:70" name="select"> <source xsi:type="ocl:OperationCallExp" location="109:4-109:30" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="109:4-109:15" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/38"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="109:43-109:68" operationName="="> @@ -524,7 +605,7 @@ </source> <arguments xsi:type="ocl:OperationCallExp" location="110:37-110:58" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="110:37-110:41"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/39"/> </source> <arguments xsi:type="ocl:StringExp" location="110:53-110:57" stringSymbol="Id"/> </arguments> @@ -542,12 +623,18 @@ </feature> <context_ location="107:8-107:27"> <context_ xsi:type="ocl:OclModelElement" location="107:16-107:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/36"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="116:1-124:4"> + <commentsBefore>-- This helper collects in a Sequence all ElementLinks that have the same Id as the parameter</commentsBefore> + <commentsBefore>-- CONTEXT : thisModule</commentsBefore> + <commentsBefore>-- RETURN : Sequence(XML!Element)</commentsBefore> + <commentsAfter>-- Those rules test the type of a property by matching it with the metamodel</commentsAfter> + <commentsAfter>-- CONTEXT : XML!Element</commentsAfter> + <commentsAfter>-- RETURN : Boolean</commentsAfter> <definition location="116:9-124:3"> <feature xsi:type="ocl:Operation" location="116:14-124:3" name="getElementLinks"> <parameters location="116:30-116:41" varName="id" variableExp="//@elements.12/@definition/@feature/@body/@body/@condition/@arguments.0"> @@ -555,7 +642,7 @@ </parameters> <returnType xsi:type="ocl:SequenceType" location="116:45-116:66"> <elementType xsi:type="ocl:OclModelElement" location="116:54-116:65" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/40"/> </elementType> </returnType> <body xsi:type="ocl:IterateExp" location="117:2-124:3"> @@ -563,14 +650,14 @@ <source xsi:type="ocl:IteratorExp" location="117:2-117:98" name="select"> <source xsi:type="ocl:OperationCallExp" location="117:2-117:28" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="117:2-117:13" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/41"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="117:41-117:97" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="117:41-117:67" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="117:41-117:42" referredVariable="//@elements.12/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="117:55-117:66" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/42"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="117:72-117:97" operationName="="> @@ -609,7 +696,7 @@ <result location="119:16-119:55" varName="acc" variableExp="//@elements.12/@definition/@feature/@body/@body/@thenExpression/@source //@elements.12/@definition/@feature/@body/@body/@elseExpression"> <type xsi:type="ocl:SequenceType" location="119:20-119:41"> <elementType xsi:type="ocl:OclModelElement" location="119:29-119:40" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/43"/> </elementType> </type> <initExpression xsi:type="ocl:SequenceExp" location="119:45-119:55"/> @@ -619,13 +706,16 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="129:1-133:72"> + <commentsBefore>-- Those rules test the type of a property by matching it with the metamodel</commentsBefore> + <commentsBefore>-- CONTEXT : XML!Element</commentsBefore> + <commentsBefore>-- RETURN : Boolean</commentsBefore> <definition location="129:8-133:71"> <feature xsi:type="ocl:Operation" location="129:34-133:71" name="isString"> <returnType xsi:type="ocl:BooleanType" location="129:47-129:54"/> <body xsi:type="ocl:LetExp" location="130:2-133:71"> <variable location="130:6-132:98" varName="a" variableExp="//@elements.13/@definition/@feature/@body/@in_/@condition/@source //@elements.13/@definition/@feature/@body/@in_/@elseExpression/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="130:10-130:27" name="ValueProperty"> - <model href="temp#/2"/> + <model href="new-model#/45"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="131:3-132:98" operationName="first"> <source xsi:type="ocl:IteratorExp" location="131:3-132:89" name="select"> @@ -634,7 +724,7 @@ <source xsi:type="ocl:IteratorExp" location="131:3-131:111" name="select"> <source xsi:type="ocl:OperationCallExp" location="131:3-131:32" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="131:3-131:17" name="Classifier"> - <model href="temp#/2"/> + <model href="new-model#/46"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="131:46-131:110" operationName="="> @@ -643,12 +733,12 @@ </source> <arguments xsi:type="ocl:OperationCallExp" location="131:55-131:110" operationName="subNamespace"> <source xsi:type="ocl:VariableExp" location="131:55-131:65"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/47"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="131:79-131:109" operationName="getAttrVal"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="131:79-131:90" name="parent"> <source xsi:type="ocl:VariableExp" location="131:79-131:83"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/48"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="131:102-131:108" stringSymbol="Type"/> @@ -669,7 +759,7 @@ </source> <arguments xsi:type="ocl:OperationCallExp" location="132:65-132:88" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="132:65-132:69"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/49"/> </source> <arguments xsi:type="ocl:StringExp" location="132:81-132:87" stringSymbol="Name"/> </arguments> @@ -696,7 +786,7 @@ </feature> <context_ location="129:8-129:27"> <context_ xsi:type="ocl:OclModelElement" location="129:16-129:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/44"/> </context_> </context_> </definition> @@ -708,7 +798,7 @@ <body xsi:type="ocl:LetExp" location="136:2-139:72"> <variable location="136:6-138:98" varName="a" variableExp="//@elements.14/@definition/@feature/@body/@in_/@condition/@source //@elements.14/@definition/@feature/@body/@in_/@elseExpression/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="136:10-136:27" name="ValueProperty"> - <model href="temp#/2"/> + <model href="new-model#/51"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="137:3-138:98" operationName="first"> <source xsi:type="ocl:IteratorExp" location="137:3-138:89" name="select"> @@ -717,7 +807,7 @@ <source xsi:type="ocl:IteratorExp" location="137:3-137:111" name="select"> <source xsi:type="ocl:OperationCallExp" location="137:3-137:32" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="137:3-137:17" name="Classifier"> - <model href="temp#/2"/> + <model href="new-model#/52"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="137:46-137:110" operationName="="> @@ -726,12 +816,12 @@ </source> <arguments xsi:type="ocl:OperationCallExp" location="137:55-137:110" operationName="subNamespace"> <source xsi:type="ocl:VariableExp" location="137:55-137:65"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/53"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="137:79-137:109" operationName="getAttrVal"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:79-137:90" name="parent"> <source xsi:type="ocl:VariableExp" location="137:79-137:83"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/54"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="137:102-137:108" stringSymbol="Type"/> @@ -752,7 +842,7 @@ </source> <arguments xsi:type="ocl:OperationCallExp" location="138:65-138:88" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="138:65-138:69"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/55"/> </source> <arguments xsi:type="ocl:StringExp" location="138:81-138:87" stringSymbol="Name"/> </arguments> @@ -779,19 +869,23 @@ </feature> <context_ location="135:8-135:27"> <context_ xsi:type="ocl:OclModelElement" location="135:16-135:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/50"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="141:1-145:73"> + <commentsAfter>-- This helper returns a Sequence that containing all the value from attribute ParentLink </commentsAfter> + <commentsAfter>-- from the context children </commentsAfter> + <commentsAfter>-- CONTEXT : XML!Element</commentsAfter> + <commentsAfter>-- RETURN : Sequence(String)</commentsAfter> <definition location="141:8-145:72"> <feature xsi:type="ocl:Operation" location="141:34-145:72" name="isInteger"> <returnType xsi:type="ocl:BooleanType" location="141:48-141:55"/> <body xsi:type="ocl:LetExp" location="142:2-145:72"> <variable location="142:6-144:98" varName="a" variableExp="//@elements.15/@definition/@feature/@body/@in_/@condition/@source //@elements.15/@definition/@feature/@body/@in_/@elseExpression/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="142:10-142:27" name="ValueProperty"> - <model href="temp#/2"/> + <model href="new-model#/57"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="143:3-144:98" operationName="first"> <source xsi:type="ocl:IteratorExp" location="143:3-144:89" name="select"> @@ -800,7 +894,7 @@ <source xsi:type="ocl:IteratorExp" location="143:3-143:111" name="select"> <source xsi:type="ocl:OperationCallExp" location="143:3-143:32" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="143:3-143:17" name="Classifier"> - <model href="temp#/2"/> + <model href="new-model#/58"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="143:46-143:110" operationName="="> @@ -809,12 +903,12 @@ </source> <arguments xsi:type="ocl:OperationCallExp" location="143:55-143:110" operationName="subNamespace"> <source xsi:type="ocl:VariableExp" location="143:55-143:65"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/59"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="143:79-143:109" operationName="getAttrVal"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="143:79-143:90" name="parent"> <source xsi:type="ocl:VariableExp" location="143:79-143:83"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/60"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="143:102-143:108" stringSymbol="Type"/> @@ -835,7 +929,7 @@ </source> <arguments xsi:type="ocl:OperationCallExp" location="144:65-144:88" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="144:65-144:69"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/61"/> </source> <arguments xsi:type="ocl:StringExp" location="144:81-144:87" stringSymbol="Name"/> </arguments> @@ -862,12 +956,20 @@ </feature> <context_ location="141:8-141:27"> <context_ xsi:type="ocl:OclModelElement" location="141:16-141:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/56"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="151:1-154:74"> + <commentsBefore>-- This helper returns a Sequence that containing all the value from attribute ParentLink </commentsBefore> + <commentsBefore>-- from the context children </commentsBefore> + <commentsBefore>-- CONTEXT : XML!Element</commentsBefore> + <commentsBefore>-- RETURN : Sequence(String)</commentsBefore> + <commentsAfter>-- This helper takes a String in parameter that corresponds to the value of an attribute ParentLink and returns</commentsAfter> + <commentsAfter>-- a Sequence of XML!Element that have this value</commentsAfter> + <commentsAfter>-- CONTEXT : XML!Element</commentsAfter> + <commentsAfter>-- RETURN : Sequence(XML!Element)</commentsAfter> <definition location="151:8-154:73"> <feature xsi:type="ocl:Operation" location="151:33-154:73" name="getParentLinks"> <returnType xsi:type="ocl:SequenceType" location="151:52-151:68"> @@ -878,13 +980,13 @@ <source xsi:type="ocl:IteratorExp" location="152:2-152:56" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="152:2-152:15" name="children"> <source xsi:type="ocl:VariableExp" location="152:2-152:6"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/63"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="152:28-152:54" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="152:28-152:29" referredVariable="//@elements.16/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="152:42-152:53" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/64"/> </arguments> </body> <iterators location="152:24-152:25" varName="m" variableExp="//@elements.16/@definition/@feature/@body/@source/@source/@body/@source"/> @@ -901,7 +1003,7 @@ <source xsi:type="ocl:VariableExp" location="154:2-154:5" referredVariable="//@elements.16/@definition/@feature/@body/@result"/> <arguments xsi:type="ocl:OperationCallExp" location="154:19-154:70" operationName="subNamespace"> <source xsi:type="ocl:VariableExp" location="154:19-154:29"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/65"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="154:43-154:69" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="154:43-154:44" referredVariable="//@elements.16/@definition/@feature/@body/@iterators.0"/> @@ -920,12 +1022,20 @@ </feature> <context_ location="151:8-151:27"> <context_ xsi:type="ocl:OclModelElement" location="151:16-151:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/62"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="160:1-162:88"> + <commentsBefore>-- This helper takes a String in parameter that corresponds to the value of an attribute ParentLink and returns</commentsBefore> + <commentsBefore>-- a Sequence of XML!Element that have this value</commentsBefore> + <commentsBefore>-- CONTEXT : XML!Element</commentsBefore> + <commentsBefore>-- RETURN : Sequence(XML!Element)</commentsBefore> + <commentsAfter>-- This helper creates a Sequence of Sequence of XML!Element by placing in a Sequence the XML!Element that have </commentsAfter> + <commentsAfter>-- the same attribute ParentLink</commentsAfter> + <commentsAfter>-- CONTEXT : XML!Element</commentsAfter> + <commentsAfter>-- RETURN : Sequence(Sequence(XML!Element))</commentsAfter> <definition location="160:8-162:87"> <feature xsi:type="ocl:Operation" location="160:33-162:87" name="SequenceFromParentLink"> <parameters location="160:56-160:67" varName="pl" variableExp="//@elements.17/@definition/@feature/@body/@source/@body/@arguments.0"> @@ -933,7 +1043,7 @@ </parameters> <returnType xsi:type="ocl:SequenceType" location="160:71-160:92"> <elementType xsi:type="ocl:OclModelElement" location="160:80-160:91" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/67"/> </elementType> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="161:2-162:87" operationName="asSequence"> @@ -941,14 +1051,14 @@ <source xsi:type="ocl:IteratorExp" location="161:2-161:88" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="161:2-161:15" name="children"> <source xsi:type="ocl:VariableExp" location="161:2-161:6"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/68"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="161:29-161:86" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="161:29-161:55" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="161:29-161:30" referredVariable="//@elements.17/@definition/@feature/@body/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="161:43-161:54" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/69"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="161:60-161:86" operationName="="> @@ -963,7 +1073,7 @@ <body xsi:type="ocl:OperatorCallExp" location="162:16-162:72" operationName="="> <source xsi:type="ocl:OperationCallExp" location="162:16-162:67" operationName="subNamespace"> <source xsi:type="ocl:VariableExp" location="162:16-162:26"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/70"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="162:40-162:66" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="162:40-162:41" referredVariable="//@elements.17/@definition/@feature/@body/@source/@iterators.0"/> @@ -978,12 +1088,19 @@ </feature> <context_ location="160:8-160:27"> <context_ xsi:type="ocl:OclModelElement" location="160:16-160:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/66"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="168:1-170:56"> + <commentsBefore>-- This helper creates a Sequence of Sequence of XML!Element by placing in a Sequence the XML!Element that have </commentsBefore> + <commentsBefore>-- the same attribute ParentLink</commentsBefore> + <commentsBefore>-- CONTEXT : XML!Element</commentsBefore> + <commentsBefore>-- RETURN : Sequence(Sequence(XML!Element))</commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> <definition location="168:8-170:55"> <feature xsi:type="ocl:Operation" location="168:33-170:55" name="SequenceOfSequence"> <parameters location="168:53-168:72" varName="allpl" variableExp="//@elements.18/@definition/@feature/@body/@source"> @@ -994,7 +1111,7 @@ <returnType xsi:type="ocl:SequenceType" location="168:77-168:108"> <elementType xsi:type="ocl:SequenceType" location="168:86-168:107"> <elementType xsi:type="ocl:OclModelElement" location="168:95-168:106" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/72"/> </elementType> </elementType> </returnType> @@ -1004,7 +1121,7 @@ <source xsi:type="ocl:VariableExp" location="170:3-170:6" referredVariable="//@elements.18/@definition/@feature/@body/@result"/> <arguments xsi:type="ocl:OperationCallExp" location="170:21-170:51" operationName="SequenceFromParentLink"> <source xsi:type="ocl:VariableExp" location="170:21-170:25"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/74"/> </source> <arguments xsi:type="ocl:VariableExp" location="170:49-170:50" referredVariable="//@elements.18/@definition/@feature/@body/@iterators.0"/> </arguments> @@ -1014,7 +1131,7 @@ <type xsi:type="ocl:SequenceType" location="169:25-169:56"> <elementType xsi:type="ocl:SequenceType" location="169:34-169:55"> <elementType xsi:type="ocl:OclModelElement" location="169:43-169:54" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/73"/> </elementType> </elementType> </type> @@ -1024,21 +1141,24 @@ </feature> <context_ location="168:8-168:27"> <context_ xsi:type="ocl:OclModelElement" location="168:16-168:27" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/71"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="176:1-196:2" name="Model"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> <outPattern location="179:2-195:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="180:3-195:4" varName="mm"> <type xsi:type="ocl:OclModelElement" location="180:8-180:22" name="Model"> - <model href="temp#/0"/> + <model href="new-model#/76"/> </type> <bindings location="181:4-181:50" propertyName="domainModel"> <value xsi:type="ocl:OperationCallExp" location="181:19-181:50" operationName="getDomainModelName"> <source xsi:type="ocl:VariableExp" location="181:19-181:29"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/77"/> </source> </value> </bindings> @@ -1052,7 +1172,7 @@ <source xsi:type="ocl:OperationCallExp" location="184:19-184:45" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="184:19-184:20" referredVariable="//@elements.19/@outPattern/@elements.0/@bindings.1/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="184:33-184:44" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/78"/> </arguments> </source> <arguments xsi:type="ocl:IfExp" location="186:7-192:12"> @@ -1062,7 +1182,7 @@ <source xsi:type="ocl:VariableExp" location="187:15-187:16" referredVariable="//@elements.19/@outPattern/@elements.0/@bindings.1/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OperationCallExp" location="187:19-187:46" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="187:19-187:29"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/79"/> </source> </arguments> </condition> @@ -1071,7 +1191,7 @@ <source xsi:type="ocl:VariableExp" location="189:17-189:18" referredVariable="//@elements.19/@outPattern/@elements.0/@bindings.1/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OperationCallExp" location="189:32-189:59" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="189:32-189:42"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/80"/> </source> </arguments> </source> @@ -1095,7 +1215,7 @@ <inPattern location="177:2-178:15"> <elements xsi:type="atl:SimpleInPatternElement" location="178:3-178:15" varName="e" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="178:7-178:15" name="Root"> - <model href="temp#/1"/> + <model href="new-model#/75"/> </type> </elements> </inPattern> @@ -1104,12 +1224,12 @@ <outPattern location="218:2-258:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="219:2-254:3" varName="me"> <type xsi:type="ocl:OclModelElement" location="219:7-219:28" name="ModelElement"> - <model href="temp#/0"/> + <model href="new-model#/85"/> </type> <bindings location="220:3-220:56" propertyName="type"> <value xsi:type="ocl:OperationCallExp" location="220:11-220:56" operationName="subNamespace"> <source xsi:type="ocl:VariableExp" location="220:11-220:21"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/86"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="220:35-220:55" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="220:35-220:36" referredVariable="//@elements.20/@inPattern/@elements.0"/> @@ -1132,7 +1252,7 @@ <source xsi:type="ocl:OperationCallExp" location="224:18-224:44" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="224:18-224:19" referredVariable="//@elements.20/@outPattern/@elements.0/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="224:32-224:43" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/87"/> </arguments> </source> <arguments xsi:type="ocl:IfExp" location="227:6-236:11"> @@ -1143,7 +1263,7 @@ <source xsi:type="ocl:VariableExp" location="229:15-229:16" referredVariable="//@elements.20/@outPattern/@elements.0/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OperationCallExp" location="229:30-229:57" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="229:30-229:40"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/88"/> </source> </arguments> </condition> @@ -1197,7 +1317,7 @@ <source xsi:type="ocl:OperationCallExp" location="242:18-242:44" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="242:18-242:19" referredVariable="//@elements.20/@outPattern/@elements.0/@bindings.4/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="242:32-242:43" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/89"/> </arguments> </source> <arguments xsi:type="ocl:IfExp" location="245:6-251:11"> @@ -1207,7 +1327,7 @@ <source xsi:type="ocl:VariableExp" location="246:16-246:17" referredVariable="//@elements.20/@outPattern/@elements.0/@bindings.4/@value/@iterators.0"/> <arguments xsi:type="ocl:OperationCallExp" location="246:31-246:58" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="246:31-246:41"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/90"/> </source> </arguments> </condition> @@ -1234,7 +1354,7 @@ </elements> <elements xsi:type="atl:ForEachOutPatternElement" location="255:2-258:3" varName="p" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.3/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="255:15-255:37" name="EmbeddingLink"> - <model href="temp#/0"/> + <model href="new-model#/91"/> </type> <bindings location="256:3-256:13" propertyName="name"> <value xsi:type="ocl:VariableExp" location="256:11-256:13" referredVariable="//@elements.20/@outPattern/@elements.1/@iterator"/> @@ -1260,7 +1380,7 @@ <type xsi:type="ocl:SequenceType" location="215:16-215:48"> <elementType xsi:type="ocl:SequenceType" location="215:26-215:47"> <elementType xsi:type="ocl:OclModelElement" location="215:35-215:46" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/84"/> </elementType> </elementType> </type> @@ -1272,7 +1392,7 @@ <inPattern location="199:2-211:4"> <elements xsi:type="atl:SimpleInPatternElement" location="200:2-200:17" varName="e" variableExp="//@elements.20/@inPattern/@filter/@condition/@source/@source //@elements.20/@inPattern/@filter/@thenExpression/@condition/@source //@elements.20/@inPattern/@filter/@thenExpression/@elseExpression/@condition/@source //@elements.20/@inPattern/@filter/@thenExpression/@elseExpression/@elseExpression/@source/@source //@elements.20/@variables.0/@initExpression/@source/@source //@elements.20/@variables.1/@initExpression/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.20/@outPattern/@elements.0/@bindings.2/@value/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.4/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="200:6-200:17" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/81"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="201:4-210:9"> @@ -1282,7 +1402,7 @@ <source xsi:type="ocl:VariableExp" location="202:13-202:14" referredVariable="//@elements.20/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="202:17-202:44" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="202:17-202:27"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/82"/> </source> </arguments> </condition> @@ -1292,7 +1412,7 @@ <source xsi:type="ocl:VariableExp" location="204:15-204:16" referredVariable="//@elements.20/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="204:30-204:57" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="204:30-204:40"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/83"/> </source> </arguments> </condition> @@ -1317,12 +1437,12 @@ <outPattern location="272:2-278:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="273:3-278:4" varName="el"> <type xsi:type="ocl:OclModelElement" location="273:8-273:30" name="ReferenceLink"> - <model href="temp#/0"/> + <model href="new-model#/94"/> </type> <bindings location="274:4-274:57" propertyName="type"> <value xsi:type="ocl:OperationCallExp" location="274:12-274:57" operationName="subNamespace"> <source xsi:type="ocl:VariableExp" location="274:12-274:22"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/95"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="274:36-274:56" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="274:36-274:37" referredVariable="//@elements.21/@inPattern/@elements.0"/> @@ -1346,7 +1466,7 @@ <source xsi:type="ocl:OperationCallExp" location="276:36-276:62" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="276:36-276:37" referredVariable="//@elements.21/@outPattern/@elements.0/@bindings.2/@value/@source/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="276:50-276:61" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/96"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="276:67-276:85" operationName="="> @@ -1364,7 +1484,7 @@ <value xsi:type="ocl:OperationCallExp" location="277:20-277:72" operationName="get"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="277:20-277:48" name="ModelElementsById"> <source xsi:type="ocl:VariableExp" location="277:20-277:30"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/97"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="277:53-277:71" operationName="getAttrVal"> @@ -1378,7 +1498,7 @@ <inPattern location="262:2-271:4"> <elements xsi:type="atl:SimpleInPatternElement" location="263:3-263:16" varName="e" variableExp="//@elements.21/@inPattern/@filter/@condition/@source/@source //@elements.21/@inPattern/@filter/@thenExpression/@condition/@source //@elements.21/@inPattern/@filter/@thenExpression/@elseExpression/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source //@elements.21/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.21/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.3/@value/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="263:5-263:16" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/92"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="264:5-270:9"> @@ -1388,7 +1508,7 @@ <source xsi:type="ocl:VariableExp" location="265:14-265:15" referredVariable="//@elements.21/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="265:29-265:56" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="265:29-265:39"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/93"/> </source> </arguments> </condition> @@ -1414,12 +1534,12 @@ <outPattern location="295:2-301:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="296:3-301:4" varName="el"> <type xsi:type="ocl:OclModelElement" location="296:8-296:33" name="ModelElementLink"> - <model href="temp#/0"/> + <model href="new-model#/101"/> </type> <bindings location="297:4-297:57" propertyName="type"> <value xsi:type="ocl:OperationCallExp" location="297:12-297:57" operationName="subNamespace"> <source xsi:type="ocl:VariableExp" location="297:12-297:22"> - <referredVariable href="temp#/39"/> + <referredVariable href="new-model#/102"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="297:36-297:56" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="297:36-297:37" referredVariable="//@elements.22/@inPattern/@elements.0"/> @@ -1442,7 +1562,7 @@ <source xsi:type="ocl:OperationCallExp" location="299:41-299:67" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="299:41-299:42" referredVariable="//@elements.22/@outPattern/@elements.0/@bindings.2/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="299:55-299:66" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/103"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="299:72-299:92" operationName="="> @@ -1458,7 +1578,7 @@ <bindings location="300:4-300:59" propertyName="links"> <value xsi:type="ocl:OperationCallExp" location="300:13-300:59" operationName="getElementLinks"> <source xsi:type="ocl:VariableExp" location="300:13-300:23"> - <referredVariable href="temp#/40"/> + <referredVariable href="new-model#/104"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="300:40-300:58" operationName="getAttrVal"> <source xsi:type="ocl:VariableExp" location="300:40-300:41" referredVariable="//@elements.22/@inPattern/@elements.0"/> @@ -1471,7 +1591,7 @@ <inPattern location="282:2-294:4"> <elements xsi:type="atl:SimpleInPatternElement" location="283:3-283:18" varName="e" variableExp="//@elements.22/@inPattern/@filter/@condition/@source/@source //@elements.22/@inPattern/@filter/@thenExpression/@condition/@source //@elements.22/@inPattern/@filter/@thenExpression/@elseExpression/@condition/@source //@elements.22/@inPattern/@filter/@thenExpression/@elseExpression/@elseExpression/@source //@elements.22/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source //@elements.22/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.22/@outPattern/@elements.0/@bindings.2/@value/@source/@source //@elements.22/@outPattern/@elements.0/@bindings.3/@value/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="283:7-283:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/98"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="284:4-293:9"> @@ -1481,7 +1601,7 @@ <source xsi:type="ocl:VariableExp" location="285:13-285:14" referredVariable="//@elements.22/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="285:17-285:44" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="285:17-285:27"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/99"/> </source> </arguments> </condition> @@ -1491,7 +1611,7 @@ <source xsi:type="ocl:VariableExp" location="287:15-287:16" referredVariable="//@elements.22/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="287:30-287:57" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="287:30-287:40"> - <referredVariable href="temp#/38"/> + <referredVariable href="new-model#/100"/> </source> </arguments> </condition> @@ -1514,7 +1634,7 @@ <outPattern location="318:2-323:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="319:3-323:4" varName="r"> <type xsi:type="ocl:OclModelElement" location="319:7-319:20" name="Role"> - <model href="temp#/0"/> + <model href="new-model#/107"/> </type> <bindings location="320:4-320:32" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="320:12-320:32" operationName="getAttrVal"> @@ -1531,7 +1651,7 @@ <value xsi:type="ocl:OperationCallExp" location="322:15-322:67" operationName="get"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="322:15-322:43" name="ModelElementsById"> <source xsi:type="ocl:VariableExp" location="322:15-322:25"> - <referredVariable href="temp#/42"/> + <referredVariable href="new-model#/108"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="322:48-322:66" operationName="getAttrVal"> @@ -1545,7 +1665,7 @@ <inPattern location="305:2-317:4"> <elements xsi:type="atl:SimpleInPatternElement" location="306:3-306:18" varName="e" variableExp="//@elements.23/@inPattern/@filter/@condition/@source/@source //@elements.23/@inPattern/@filter/@thenExpression/@condition/@source/@source/@source //@elements.23/@inPattern/@filter/@thenExpression/@thenExpression/@condition/@source //@elements.23/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.23/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.23/@outPattern/@elements.0/@bindings.2/@value/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="306:7-306:18" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/105"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="307:4-316:9"> @@ -1556,7 +1676,7 @@ <source xsi:type="ocl:VariableExp" location="309:15-309:16" referredVariable="//@elements.23/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="309:30-309:57" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="309:30-309:40"> - <referredVariable href="temp#/41"/> + <referredVariable href="new-model#/106"/> </source> </arguments> </condition> @@ -1587,7 +1707,7 @@ <outPattern location="340:2-347:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="341:2-344:3" varName="p"> <type xsi:type="ocl:OclModelElement" location="341:6-341:23" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/111"/> </type> <bindings location="342:3-342:29" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="342:9-342:29" operationName="getAttrVal"> @@ -1601,7 +1721,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="345:2-347:3" varName="v" variableExp="//@elements.24/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="345:6-345:26" name="StringValue"> - <model href="temp#/0"/> + <model href="new-model#/112"/> </type> <bindings location="346:3-346:33" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="346:12-346:33" operationName="getAttrVal"> @@ -1614,7 +1734,7 @@ <inPattern location="327:2-339:3"> <elements xsi:type="atl:SimpleInPatternElement" location="328:3-328:16" varName="e" variableExp="//@elements.24/@inPattern/@filter/@condition/@source/@source //@elements.24/@inPattern/@filter/@thenExpression/@condition/@source/@source/@source //@elements.24/@inPattern/@filter/@thenExpression/@thenExpression/@condition/@source //@elements.24/@inPattern/@filter/@thenExpression/@thenExpression/@elseExpression/@source //@elements.24/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.24/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="328:5-328:16" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/109"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="329:3-338:8"> @@ -1625,7 +1745,7 @@ <source xsi:type="ocl:VariableExp" location="331:14-331:15" referredVariable="//@elements.24/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="331:29-331:56" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="331:29-331:39"> - <referredVariable href="temp#/43"/> + <referredVariable href="new-model#/110"/> </source> </arguments> </condition> @@ -1657,7 +1777,7 @@ <outPattern location="364:2-371:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="365:2-368:3" varName="p"> <type xsi:type="ocl:OclModelElement" location="365:6-365:23" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/115"/> </type> <bindings location="366:3-366:29" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="366:9-366:29" operationName="getAttrVal"> @@ -1671,7 +1791,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="369:2-371:3" varName="v" variableExp="//@elements.25/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="369:6-369:27" name="BooleanValue"> - <model href="temp#/0"/> + <model href="new-model#/116"/> </type> <bindings location="370:3-370:34" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="370:12-370:34" operationName="getAttrBool"> @@ -1684,7 +1804,7 @@ <inPattern location="351:2-363:3"> <elements xsi:type="atl:SimpleInPatternElement" location="352:3-352:16" varName="e" variableExp="//@elements.25/@inPattern/@filter/@condition/@source/@source //@elements.25/@inPattern/@filter/@thenExpression/@condition/@source/@source/@source //@elements.25/@inPattern/@filter/@thenExpression/@thenExpression/@condition/@source //@elements.25/@inPattern/@filter/@thenExpression/@thenExpression/@elseExpression/@source //@elements.25/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.25/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="352:5-352:16" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/113"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="353:3-362:8"> @@ -1695,7 +1815,7 @@ <source xsi:type="ocl:VariableExp" location="355:14-355:15" referredVariable="//@elements.25/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="355:29-355:56" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="355:29-355:39"> - <referredVariable href="temp#/44"/> + <referredVariable href="new-model#/114"/> </source> </arguments> </condition> @@ -1727,7 +1847,7 @@ <outPattern location="388:2-395:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="389:2-392:3" varName="p"> <type xsi:type="ocl:OclModelElement" location="389:6-389:23" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/119"/> </type> <bindings location="390:3-390:29" propertyName="name"> <value xsi:type="ocl:OperationCallExp" location="390:9-390:29" operationName="getAttrVal"> @@ -1741,7 +1861,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="393:2-395:3" varName="v" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="393:6-393:27" name="IntegerValue"> - <model href="temp#/0"/> + <model href="new-model#/120"/> </type> <bindings location="394:3-394:45" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="394:12-394:45" operationName="toInteger"> @@ -1756,7 +1876,7 @@ <inPattern location="375:2-387:3"> <elements xsi:type="atl:SimpleInPatternElement" location="376:3-376:16" varName="e" variableExp="//@elements.26/@inPattern/@filter/@condition/@source/@source //@elements.26/@inPattern/@filter/@thenExpression/@condition/@source/@source/@source //@elements.26/@inPattern/@filter/@thenExpression/@thenExpression/@condition/@source //@elements.26/@inPattern/@filter/@thenExpression/@thenExpression/@elseExpression/@source //@elements.26/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.26/@outPattern/@elements.1/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="376:5-376:16" name="Element"> - <model href="temp#/1"/> + <model href="new-model#/117"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="377:3-386:8"> @@ -1767,7 +1887,7 @@ <source xsi:type="ocl:VariableExp" location="379:14-379:15" referredVariable="//@elements.26/@inPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="379:29-379:56" operationName="elementToAvoid"> <source xsi:type="ocl:VariableExp" location="379:29-379:39"> - <referredVariable href="temp#/45"/> + <referredVariable href="new-model#/118"/> </source> </arguments> </condition> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Enumerations/Ecore/Ecore.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Enumerations/Ecore/Ecore.atl.xmi new file mode 100644 index 00000000..127941cb --- /dev/null +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Enumerations/Ecore/Ecore.atl.xmi @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="Cp1252"?> +<atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="3:1-52:2" name="sample"> + <commentsBefore>-- @path MM=/enumerations/Ecore/MM.ecore</commentsBefore> + <inModels location="4:22-4:29" name="IN"> + <metamodel href="new-model#/1"/> + </inModels> + <outModels location="4:8-4:16" name="OUT"> + <metamodel href="new-model#/0"/> + </outModels> + <elements xsi:type="atl:MatchedRule" location="6:1-20:2" name="E"> + <outPattern location="9:2-19:3"> + <elements xsi:type="atl:SimpleOutPatternElement" location="11:3-14:3" varName="output1"> + <commentsBefore>-- from input model</commentsBefore> + <type xsi:type="ocl:OclModelElement" location="11:13-11:17" name="E"> + <model href="new-model#/4"/> + </type> + <bindings location="12:4-12:22" propertyName="name"> + <value xsi:type="ocl:NavigationOrAttributeCallExp" location="12:12-12:22" name="name"> + <source xsi:type="ocl:VariableExp" location="12:12-12:17" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </value> + </bindings> + <bindings location="13:4-13:16" propertyName="a"> + <value xsi:type="ocl:NavigationOrAttributeCallExp" location="13:9-13:16" name="a"> + <source xsi:type="ocl:VariableExp" location="13:9-13:14" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </value> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="16:3-19:3" varName="output2"> + <commentsBefore>-- from input model, as String</commentsBefore> + <type xsi:type="ocl:OclModelElement" location="16:13-16:17" name="E"> + <model href="new-model#/5"/> + </type> + <bindings location="17:4-17:22" propertyName="name"> + <value xsi:type="ocl:NavigationOrAttributeCallExp" location="17:12-17:22" name="name"> + <source xsi:type="ocl:VariableExp" location="17:12-17:17" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </value> + </bindings> + <bindings location="18:4-18:27" propertyName="a"> + <value xsi:type="ocl:OperationCallExp" location="18:9-18:27" operationName="toString"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="18:9-18:16" name="a"> + <source xsi:type="ocl:VariableExp" location="18:9-18:14" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + </value> + </bindings> + </elements> + </outPattern> + <inPattern location="7:2-8:41"> + <elements xsi:type="atl:SimpleInPatternElement" location="8:3-8:15" varName="input" variableExp="//@elements.0/@inPattern/@filter/@source //@elements.0/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.0/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.0/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.0/@outPattern/@elements.1/@bindings.1/@value/@source/@source"> + <type xsi:type="ocl:OclModelElement" location="8:11-8:15" name="E"> + <model href="new-model#/2"/> + </type> + </elements> + <filter xsi:type="ocl:OperationCallExp" location="8:17-8:40" operationName="oclIsTypeOf"> + <source xsi:type="ocl:VariableExp" location="8:17-8:22" referredVariable="//@elements.0/@inPattern/@elements.0"/> + <arguments xsi:type="ocl:OclModelElement" location="8:35-8:39" name="E"> + <model href="new-model#/3"/> + </arguments> + </filter> + </inPattern> + </elements> + <elements xsi:type="atl:MatchedRule" location="22:1-52:2" name="ESub"> + <outPattern location="25:2-51:4"> + <elements xsi:type="atl:SimpleOutPatternElement" location="27:3-30:4" varName="output1"> + <commentsBefore>-- hardcoded</commentsBefore> + <type xsi:type="ocl:OclModelElement" location="27:13-27:17" name="E"> + <model href="new-model#/7"/> + </type> + <bindings location="28:4-28:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="28:12-28:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="28:12-28:22" name="name"> + <source xsi:type="ocl:VariableExp" location="28:12-28:17" referredVariable="//@elements.1/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="28:25-28:28" stringSymbol="1"/> + </value> + </bindings> + <bindings location="29:4-29:17" propertyName="a"> + <value xsi:type="ocl:EnumLiteralExp" location="29:9-29:17" name="literal"/> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="31:3-34:4" varName="output2"> + <type xsi:type="ocl:OclModelElement" location="31:13-31:17" name="E"> + <model href="new-model#/8"/> + </type> + <bindings location="32:4-32:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="32:12-32:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="32:12-32:22" name="name"> + <source xsi:type="ocl:VariableExp" location="32:12-32:17" referredVariable="//@elements.1/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="32:25-32:28" stringSymbol="2"/> + </value> + </bindings> + <bindings location="33:4-33:22" propertyName="a"> + <value xsi:type="ocl:EnumLiteralExp" location="33:9-33:22" name="literal_name"/> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="35:3-38:4" varName="output3"> + <type xsi:type="ocl:OclModelElement" location="35:13-35:17" name="E"> + <model href="new-model#/9"/> + </type> + <bindings location="36:4-36:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="36:12-36:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="36:12-36:22" name="name"> + <source xsi:type="ocl:VariableExp" location="36:12-36:17" referredVariable="//@elements.1/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="36:25-36:28" stringSymbol="3"/> + </value> + </bindings> + <bindings location="37:4-37:14" propertyName="a"> + <value xsi:type="ocl:EnumLiteralExp" location="37:9-37:14" name="in"/> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="39:3-42:4" varName="output4"> + <type xsi:type="ocl:OclModelElement" location="39:13-39:17" name="E"> + <model href="new-model#/10"/> + </type> + <bindings location="40:4-40:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="40:12-40:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="40:12-40:22" name="name"> + <source xsi:type="ocl:VariableExp" location="40:12-40:17" referredVariable="//@elements.1/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="40:25-40:28" stringSymbol="4"/> + </value> + </bindings> + <bindings location="41:4-41:15" propertyName="a"> + <value xsi:type="ocl:EnumLiteralExp" location="41:9-41:15" name="inout"/> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="44:3-47:4" varName="output5"> + <commentsBefore>-- hardcoded, from a String</commentsBefore> + <type xsi:type="ocl:OclModelElement" location="44:13-44:17" name="E"> + <model href="new-model#/11"/> + </type> + <bindings location="45:4-45:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="45:12-45:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="45:12-45:22" name="name"> + <source xsi:type="ocl:VariableExp" location="45:12-45:17" referredVariable="//@elements.1/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="45:25-45:28" stringSymbol="5"/> + </value> + </bindings> + <bindings location="46:4-46:23" propertyName="a"> + <value xsi:type="ocl:StringExp" location="46:9-46:23" stringSymbol="literal_name"/> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="48:3-51:4" varName="output6"> + <type xsi:type="ocl:OclModelElement" location="48:13-48:17" name="E"> + <model href="new-model#/12"/> + </type> + <bindings location="49:4-49:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="49:12-49:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="49:12-49:22" name="name"> + <source xsi:type="ocl:VariableExp" location="49:12-49:17" referredVariable="//@elements.1/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="49:25-49:28" stringSymbol="6"/> + </value> + </bindings> + <bindings location="50:4-50:17" propertyName="a"> + <value xsi:type="ocl:StringExp" location="50:9-50:17" stringSymbol="in out"/> + </bindings> + </elements> + </outPattern> + <inPattern location="23:2-24:18"> + <elements xsi:type="atl:SimpleInPatternElement" location="24:3-24:18" varName="input" variableExp="//@elements.1/@outPattern/@elements.0/@bindings.0/@value/@source/@source //@elements.1/@outPattern/@elements.1/@bindings.0/@value/@source/@source //@elements.1/@outPattern/@elements.2/@bindings.0/@value/@source/@source //@elements.1/@outPattern/@elements.3/@bindings.0/@value/@source/@source //@elements.1/@outPattern/@elements.4/@bindings.0/@value/@source/@source //@elements.1/@outPattern/@elements.5/@bindings.0/@value/@source/@source"> + <type xsi:type="ocl:OclModelElement" location="24:11-24:18" name="ESub"> + <model href="new-model#/6"/> + </type> + </elements> + </inPattern> + </elements> +</atl:Module> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Enumerations/UML/UML.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Enumerations/UML/UML.atl.xmi new file mode 100644 index 00000000..58c02629 --- /dev/null +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Enumerations/UML/UML.atl.xmi @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="Cp1252"?> +<atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="3:1-30:2" name="sample"> + <commentsBefore>-- @nsURI UML=http://www.eclipse.org/uml2/2.1.0/UML</commentsBefore> + <inModels location="4:23-4:31" name="IN"> + <metamodel href="new-model#/1"/> + </inModels> + <outModels location="4:8-4:17" name="OUT"> + <metamodel href="new-model#/0"/> + </outModels> + <elements xsi:type="atl:MatchedRule" location="6:1-30:2" name="class"> + <outPattern location="9:2-29:3"> + <elements xsi:type="atl:SimpleOutPatternElement" location="11:3-14:3" varName="output1"> + <commentsBefore>-- from input model</commentsBefore> + <type xsi:type="ocl:OclModelElement" location="11:13-11:22" name="Class"> + <model href="new-model#/3"/> + </type> + <bindings location="12:4-12:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="12:12-12:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="12:12-12:22" name="name"> + <source xsi:type="ocl:VariableExp" location="12:12-12:17" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="12:25-12:28" stringSymbol="1"/> + </value> + </bindings> + <bindings location="13:4-13:34" propertyName="visibility"> + <value xsi:type="ocl:NavigationOrAttributeCallExp" location="13:18-13:34" name="visibility"> + <source xsi:type="ocl:VariableExp" location="13:18-13:23" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </value> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="16:3-19:3" varName="output1_bus"> + <commentsBefore>-- from input model, as String</commentsBefore> + <type xsi:type="ocl:OclModelElement" location="16:17-16:26" name="Class"> + <model href="new-model#/4"/> + </type> + <bindings location="17:4-17:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="17:12-17:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="17:12-17:22" name="name"> + <source xsi:type="ocl:VariableExp" location="17:12-17:17" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="17:25-17:28" stringSymbol="1"/> + </value> + </bindings> + <bindings location="18:4-18:45" propertyName="visibility"> + <value xsi:type="ocl:OperationCallExp" location="18:18-18:45" operationName="toString"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="18:18-18:34" name="visibility"> + <source xsi:type="ocl:VariableExp" location="18:18-18:23" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + </value> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="21:3-24:3" varName="output2"> + <commentsBefore>-- hardcoded</commentsBefore> + <type xsi:type="ocl:OclModelElement" location="21:13-21:22" name="Class"> + <model href="new-model#/5"/> + </type> + <bindings location="22:4-22:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="22:12-22:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="22:12-22:22" name="name"> + <source xsi:type="ocl:VariableExp" location="22:12-22:17" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="22:25-22:28" stringSymbol="2"/> + </value> + </bindings> + <bindings location="23:4-23:26" propertyName="visibility"> + <value xsi:type="ocl:EnumLiteralExp" location="23:18-23:26" name="private"/> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="26:3-29:3" varName="output3"> + <commentsBefore>-- hardcoded, from a String</commentsBefore> + <type xsi:type="ocl:OclModelElement" location="26:13-26:22" name="Class"> + <model href="new-model#/6"/> + </type> + <bindings location="27:4-27:28" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="27:12-27:28" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="27:12-27:22" name="name"> + <source xsi:type="ocl:VariableExp" location="27:12-27:17" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="27:25-27:28" stringSymbol="3"/> + </value> + </bindings> + <bindings location="28:4-28:27" propertyName="visibility"> + <value xsi:type="ocl:StringExp" location="28:18-28:27" stringSymbol="private"/> + </bindings> + </elements> + </outPattern> + <inPattern location="7:2-8:20"> + <elements xsi:type="atl:SimpleInPatternElement" location="8:3-8:20" varName="input" variableExp="//@elements.0/@outPattern/@elements.0/@bindings.0/@value/@source/@source //@elements.0/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.0/@outPattern/@elements.1/@bindings.0/@value/@source/@source //@elements.0/@outPattern/@elements.1/@bindings.1/@value/@source/@source //@elements.0/@outPattern/@elements.2/@bindings.0/@value/@source/@source //@elements.0/@outPattern/@elements.3/@bindings.0/@value/@source/@source"> + <type xsi:type="ocl:OclModelElement" location="8:11-8:20" name="Class"> + <model href="new-model#/2"/> + </type> + </elements> + </inPattern> + </elements> +</atl:Module> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Families2Persons/Families2Persons.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Families2Persons/Families2Persons.atl.xmi index 6acf90b2..8ef65984 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Families2Persons/Families2Persons.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Families2Persons/Families2Persons.atl.xmi @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-46:2" name="Families2Persons"> <inModels location="2:27-2:40" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:21" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="4:1-17:8"> <definition location="4:8-17:7"> @@ -13,7 +13,7 @@ <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="6:3-6:29" name="lastName"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="6:3-6:20" name="familyFather"> <source xsi:type="ocl:VariableExp" location="6:3-6:7"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/4"/> </source> </source> </thenExpression> @@ -21,7 +21,7 @@ <source xsi:type="ocl:OperationCallExp" location="5:9-5:43" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="5:9-5:26" name="familyFather"> <source xsi:type="ocl:VariableExp" location="5:9-5:13"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/3"/> </source> </source> </source> @@ -30,7 +30,7 @@ <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="9:4-9:30" name="lastName"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="9:4-9:21" name="familyMother"> <source xsi:type="ocl:VariableExp" location="9:4-9:8"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/6"/> </source> </source> </thenExpression> @@ -38,7 +38,7 @@ <source xsi:type="ocl:OperationCallExp" location="8:10-8:44" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="8:10-8:27" name="familyMother"> <source xsi:type="ocl:VariableExp" location="8:10-8:14"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/5"/> </source> </source> </source> @@ -47,7 +47,7 @@ <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="12:5-12:28" name="lastName"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="12:5-12:19" name="familySon"> <source xsi:type="ocl:VariableExp" location="12:5-12:9"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/8"/> </source> </source> </thenExpression> @@ -55,7 +55,7 @@ <source xsi:type="ocl:OperationCallExp" location="11:11-11:42" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="11:11-11:25" name="familySon"> <source xsi:type="ocl:VariableExp" location="11:11-11:15"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/7"/> </source> </source> </source> @@ -63,7 +63,7 @@ <elseExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="14:5-14:33" name="lastName"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="14:5-14:24" name="familyDaughter"> <source xsi:type="ocl:VariableExp" location="14:5-14:9"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/9"/> </source> </source> </elseExpression> @@ -74,7 +74,7 @@ </feature> <context_ location="4:8-4:31"> <context_ xsi:type="ocl:OclModelElement" location="4:16-4:31" name="Member"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </context_> </context_> </definition> @@ -89,7 +89,7 @@ <source xsi:type="ocl:OperationCallExp" location="20:9-20:43" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="20:9-20:26" name="familyMother"> <source xsi:type="ocl:VariableExp" location="20:9-20:13"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/11"/> </source> </source> </source> @@ -100,7 +100,7 @@ <source xsi:type="ocl:OperationCallExp" location="23:10-23:46" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="23:10-23:29" name="familyDaughter"> <source xsi:type="ocl:VariableExp" location="23:10-23:14"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/12"/> </source> </source> </source> @@ -111,7 +111,7 @@ </feature> <context_ location="19:8-19:31"> <context_ xsi:type="ocl:OclModelElement" location="19:16-19:31" name="Member"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </context_> </context_> </definition> @@ -120,7 +120,7 @@ <outPattern location="33:2-36:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="34:3-36:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="34:7-34:19" name="Male"> - <model href="temp#/0"/> + <model href="new-model#/14"/> </type> <bindings location="35:4-35:48" propertyName="fullName"> <value xsi:type="ocl:OperatorCallExp" location="35:16-35:48" operationName="+"> @@ -140,7 +140,7 @@ <inPattern location="31:2-32:41"> <elements xsi:type="atl:SimpleInPatternElement" location="32:3-32:22" varName="s" variableExp="//@elements.2/@inPattern/@filter/@source/@source //@elements.2/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source //@elements.2/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="32:7-32:22" name="Member"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="32:24-32:40" operationName="not"> @@ -154,7 +154,7 @@ <outPattern location="42:2-45:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="43:3-45:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="43:7-43:21" name="Female"> - <model href="temp#/0"/> + <model href="new-model#/16"/> </type> <bindings location="44:4-44:48" propertyName="fullName"> <value xsi:type="ocl:OperatorCallExp" location="44:16-44:48" operationName="+"> @@ -174,7 +174,7 @@ <inPattern location="40:2-41:37"> <elements xsi:type="atl:SimpleInPatternElement" location="41:3-41:22" varName="s" variableExp="//@elements.3/@inPattern/@filter/@source //@elements.3/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source //@elements.3/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="41:7-41:22" name="Member"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="41:24-41:36" operationName="isFemale"> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/FlattenTest/FlattenTest.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/FlattenTest/FlattenTest.atl.xmi index 678dfcb8..032330f7 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/FlattenTest/FlattenTest.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/FlattenTest/FlattenTest.atl.xmi @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-42:2" name="FlattenTest"> <inModels location="2:23-2:31" name="IN"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="4:1-5:74"> <definition location="4:8-5:73"> @@ -127,7 +127,7 @@ <outPattern location="20:2-41:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="21:3-29:4" varName="container"> <type xsi:type="ocl:OclModelElement" location="21:15-21:24" name="Model"> - <model href="temp#/0"/> + <model href="new-model#/3"/> </type> <bindings location="22:4-22:27" propertyName="name"> <value xsi:type="ocl:StringExp" location="22:12-22:27" stringSymbol="tests results"/> @@ -143,14 +143,14 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="30:3-32:4" varName="testSequenceClass" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="30:23-30:32" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/4"/> </type> <bindings location="31:4-31:62" propertyName="name"> <value xsi:type="ocl:CollectionOperationCallExp" location="31:12-31:62" operationName="toString"> <source xsi:type="ocl:CollectionOperationCallExp" location="31:12-31:48" operationName="flatten"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="31:12-31:35" name="testSequence"> <source xsi:type="ocl:VariableExp" location="31:12-31:22"> - <referredVariable href="temp#/1"/> + <referredVariable href="new-model#/5"/> </source> </source> </source> @@ -159,30 +159,19 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="33:3-35:4" varName="testBagClass" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="33:18-33:27" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/6"/> </type> - <bindings location="34:4-34:57" propertyName="name"> - <value xsi:type="ocl:CollectionOperationCallExp" location="34:12-34:57" operationName="toString"> - <source xsi:type="ocl:CollectionOperationCallExp" location="34:12-34:43" operationName="flatten"> - <source xsi:type="ocl:NavigationOrAttributeCallExp" location="34:12-34:30" name="testBag"> - <source xsi:type="ocl:VariableExp" location="34:12-34:22"> - <referredVariable href="temp#/2"/> - </source> - </source> - </source> - </value> - </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="36:3-38:4" varName="testSetClass" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="36:18-36:27" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/7"/> </type> <bindings location="37:4-37:57" propertyName="name"> <value xsi:type="ocl:CollectionOperationCallExp" location="37:12-37:57" operationName="toString"> <source xsi:type="ocl:CollectionOperationCallExp" location="37:12-37:43" operationName="flatten"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="37:12-37:30" name="testSet"> <source xsi:type="ocl:VariableExp" location="37:12-37:22"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/8"/> </source> </source> </source> @@ -191,14 +180,14 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="39:3-41:4" varName="testOrderedSetClass" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="39:25-39:34" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/9"/> </type> <bindings location="40:4-40:64" propertyName="name"> <value xsi:type="ocl:CollectionOperationCallExp" location="40:12-40:64" operationName="toString"> <source xsi:type="ocl:CollectionOperationCallExp" location="40:12-40:50" operationName="flatten"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="40:12-40:37" name="testOrderedSet"> <source xsi:type="ocl:VariableExp" location="40:12-40:22"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/10"/> </source> </source> </source> @@ -209,7 +198,7 @@ <inPattern location="17:2-18:22"> <elements xsi:type="atl:SimpleInPatternElement" location="18:3-18:22" varName="trigger"> <type xsi:type="ocl:OclModelElement" location="18:13-18:22" name="Model"> - <model href="temp#/0"/> + <model href="new-model#/2"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/MultipleOutputs/MultipleOutputs.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/MultipleOutputs/MultipleOutputs.atl.xmi new file mode 100644 index 00000000..8f7482ef --- /dev/null +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/MultipleOutputs/MultipleOutputs.atl.xmi @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="Cp1252"?> +<atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-19:2" name="sample"> + <inModels location="7:1-7:9" name="IN"> + <metamodel href="new-model#/3"/> + </inModels> + <outModels location="3:1-3:16" name="OUT1"> + <metamodel href="new-model#/0"/> + </outModels> + <outModels location="4:1-4:16" name="OUT2"> + <metamodel href="new-model#/1"/> + </outModels> + <outModels location="5:1-5:16" name="OUT3"> + <metamodel href="new-model#/2"/> + </outModels> + <elements xsi:type="atl:MatchedRule" location="9:1-19:2" name="test"> + <outPattern location="12:2-18:64"> + <elements xsi:type="atl:SimpleOutPatternElement" location="13:3-13:64" varName="output1_a"> + <type xsi:type="ocl:OclModelElement" location="13:15-13:29" name="Class"> + <model href="new-model#/5"/> + </type> + <bindings location="13:30-13:63" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="13:38-13:63" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="13:38-13:48" name="name"> + <source xsi:type="ocl:VariableExp" location="13:38-13:43" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="13:51-13:63" stringSymbol="_output1_a"/> + </value> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="14:3-14:64" varName="output1_b"> + <type xsi:type="ocl:OclModelElement" location="14:15-14:29" name="Class"> + <model href="new-model#/6"/> + </type> + <bindings location="14:30-14:63" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="14:38-14:63" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="14:38-14:48" name="name"> + <source xsi:type="ocl:VariableExp" location="14:38-14:43" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="14:51-14:63" stringSymbol="_output1_b"/> + </value> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="15:3-15:64" varName="output2_a"> + <type xsi:type="ocl:OclModelElement" location="15:15-15:29" name="Class"> + <model href="new-model#/7"/> + </type> + <bindings location="15:30-15:63" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="15:38-15:63" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="15:38-15:48" name="name"> + <source xsi:type="ocl:VariableExp" location="15:38-15:43" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="15:51-15:63" stringSymbol="_output2_a"/> + </value> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="16:3-16:64" varName="output2_b"> + <type xsi:type="ocl:OclModelElement" location="16:15-16:29" name="Class"> + <model href="new-model#/8"/> + </type> + <bindings location="16:30-16:63" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="16:38-16:63" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="16:38-16:48" name="name"> + <source xsi:type="ocl:VariableExp" location="16:38-16:43" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="16:51-16:63" stringSymbol="_output2_b"/> + </value> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="17:3-17:64" varName="output3_a"> + <type xsi:type="ocl:OclModelElement" location="17:15-17:29" name="Class"> + <model href="new-model#/9"/> + </type> + <bindings location="17:30-17:63" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="17:38-17:63" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="17:38-17:48" name="name"> + <source xsi:type="ocl:VariableExp" location="17:38-17:43" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="17:51-17:63" stringSymbol="_output3_a"/> + </value> + </bindings> + </elements> + <elements xsi:type="atl:SimpleOutPatternElement" location="18:3-18:64" varName="output3_b"> + <type xsi:type="ocl:OclModelElement" location="18:15-18:29" name="Class"> + <model href="new-model#/10"/> + </type> + <bindings location="18:30-18:63" propertyName="name"> + <value xsi:type="ocl:OperatorCallExp" location="18:38-18:63" operationName="+"> + <source xsi:type="ocl:NavigationOrAttributeCallExp" location="18:38-18:48" name="name"> + <source xsi:type="ocl:VariableExp" location="18:38-18:43" referredVariable="//@elements.0/@inPattern/@elements.0"/> + </source> + <arguments xsi:type="ocl:StringExp" location="18:51-18:63" stringSymbol="_output3_b"/> + </value> + </bindings> + </elements> + </outPattern> + <inPattern location="10:2-11:20"> + <elements xsi:type="atl:SimpleInPatternElement" location="11:3-11:20" varName="input" variableExp="//@elements.0/@outPattern/@elements.0/@bindings.0/@value/@source/@source //@elements.0/@outPattern/@elements.1/@bindings.0/@value/@source/@source //@elements.0/@outPattern/@elements.2/@bindings.0/@value/@source/@source //@elements.0/@outPattern/@elements.3/@bindings.0/@value/@source/@source //@elements.0/@outPattern/@elements.4/@bindings.0/@value/@source/@source //@elements.0/@outPattern/@elements.5/@bindings.0/@value/@source/@source"> + <type xsi:type="ocl:OclModelElement" location="11:11-11:20" name="Class"> + <model href="new-model#/4"/> + </type> + </elements> + </inPattern> + </elements> +</atl:Module> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/RSM2TPC/RSM2TPC_V0/RSM2TPC_V0.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/RSM2TPC/RSM2TPC_V0/RSM2TPC_V0.atl.xmi index f9eb1ac3..0a953d7e 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/RSM2TPC/RSM2TPC_V0/RSM2TPC_V0.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/RSM2TPC/RSM2TPC_V0/RSM2TPC_V0.atl.xmi @@ -1,22 +1,29 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="2:1-943:8" name="EMX2DI"> + <commentsBefore>-- @atlcompiler atl2006</commentsBefore> + <commentsAfter>----*************************************************************************************************************************************</commentsAfter> <inModels location="3:23-3:31" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="3:8-3:16" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="11:1-11:74"> + <commentsBefore>-- This file describes transformation from a RSM format (file with a EMX extension) to a DI format supported by the Topcased UML2 editor</commentsBefore> + <commentsBefore>-- The UML diagrams handle are :</commentsBefore> + <commentsBefore>-- 1) Class Diagram</commentsBefore> + <commentsBefore>-- 2) UseCase Diagram</commentsBefore> + <commentsBefore>-- ***** COMMON ATTRIBUTES -- STATIC HELPERS (computed one time) *****</commentsBefore> <definition location="11:8-11:73"> <feature xsi:type="ocl:Attribute" location="11:14-11:73" name="allPackages"> <initExpression xsi:type="ocl:OperationCallExp" location="11:47-11:73" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="11:47-11:58" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </source> </initExpression> <type xsi:type="ocl:SetType" location="11:28-11:44"> <elementType xsi:type="ocl:OclModelElement" location="11:32-11:43" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </elementType> </type> </feature> @@ -27,12 +34,12 @@ <feature xsi:type="ocl:Attribute" location="13:14-13:73" name="allDiagrams"> <initExpression xsi:type="ocl:OperationCallExp" location="13:47-13:73" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="13:47-13:58" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </source> </initExpression> <type xsi:type="ocl:SetType" location="13:28-13:44"> <elementType xsi:type="ocl:OclModelElement" location="13:32-13:43" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </elementType> </type> </feature> @@ -43,12 +50,12 @@ <feature xsi:type="ocl:Attribute" location="15:14-15:64" name="allNodes"> <initExpression xsi:type="ocl:OperationCallExp" location="15:41-15:64" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="15:41-15:49" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </source> </initExpression> <type xsi:type="ocl:SetType" location="15:25-15:38"> <elementType xsi:type="ocl:OclModelElement" location="15:29-15:37" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </elementType> </type> </feature> @@ -59,38 +66,45 @@ <feature xsi:type="ocl:Attribute" location="17:14-17:79" name="allInterfaces"> <initExpression xsi:type="ocl:OperationCallExp" location="17:51-17:79" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="17:51-17:64" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/9"/> </source> </initExpression> <type xsi:type="ocl:SetType" location="17:30-17:48"> <elementType xsi:type="ocl:OclModelElement" location="17:34-17:47" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="19:1-19:69"> + <commentsAfter>-- ***** COMMON PART *****</commentsAfter> + <commentsAfter>-- This part covers common transformations such as Model, Diagram, Comment, Note, Comment and Note associations.</commentsAfter> + <commentsAfter>-- Processing of type Model</commentsAfter> <definition location="19:8-19:68"> <feature xsi:type="ocl:Attribute" location="19:14-19:68" name="allClasses"> <initExpression xsi:type="ocl:OperationCallExp" location="19:44-19:68" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="19:44-19:53" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </source> </initExpression> <type xsi:type="ocl:SetType" location="19:27-19:41"> <elementType xsi:type="ocl:OclModelElement" location="19:31-19:40" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="25:1-37:2" name="umlDiagrams"> + <commentsBefore>-- ***** COMMON PART *****</commentsBefore> + <commentsBefore>-- This part covers common transformations such as Model, Diagram, Comment, Note, Comment and Note associations.</commentsBefore> + <commentsBefore>-- Processing of type Model</commentsBefore> + <commentsAfter>-- Ignore others kinds of diagram and in particular Collaboration of Communication Type</commentsAfter> <outPattern location="28:2-36:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="29:3-32:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="29:8-29:19" name="Diagrams"> - <model href="temp#/0"/> + <model href="new-model#/13"/> </type> <bindings location="30:4-30:15" propertyName="model"> <value xsi:type="ocl:VariableExp" location="30:13-30:15" referredVariable="//@elements.5/@outPattern/@elements.1"/> @@ -99,7 +113,7 @@ <value xsi:type="ocl:CollectionOperationCallExp" location="31:16-31:52" operationName="asSequence"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="31:16-31:38" name="allDiagrams"> <source xsi:type="ocl:VariableExp" location="31:16-31:26"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/14"/> </source> </source> </value> @@ -107,7 +121,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="34:3-36:4" varName="mo" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="34:8-34:18" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> <bindings location="35:4-35:25" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="35:12-35:25" name="idelement"> @@ -119,12 +133,14 @@ <inPattern location="26:2-27:18"> <elements xsi:type="atl:SimpleInPatternElement" location="27:3-27:18" varName="emx" variableExp="//@elements.5/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="27:9-27:18" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/12"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:Helper" location="41:1-42:47"> + <commentsBefore>-- Ignore others kinds of diagram and in particular Collaboration of Communication Type</commentsBefore> + <commentsAfter>-- Processing of type Diagram </commentsAfter> <definition location="41:8-42:46"> <feature xsi:type="ocl:Operation" location="41:34-42:46" name="isValidDiagram"> <returnType xsi:type="ocl:BooleanType" location="41:53-41:60"/> @@ -132,7 +148,7 @@ <source xsi:type="ocl:OperatorCallExp" location="42:2-42:23" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="42:2-42:11" name="type"> <source xsi:type="ocl:VariableExp" location="42:2-42:6"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/17"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="42:14-42:23" stringSymbol="Usecase"/> @@ -140,7 +156,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="42:27-42:46" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="42:27-42:36" name="type"> <source xsi:type="ocl:VariableExp" location="42:27-42:31"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/18"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="42:39-42:46" stringSymbol="Class"/> @@ -149,16 +165,18 @@ </feature> <context_ location="41:8-41:27"> <context_ xsi:type="ocl:OclModelElement" location="41:16-41:27" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/16"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="45:1-118:2" name="umlDiagram"> + <commentsBefore>-- Processing of type Diagram </commentsBefore> + <commentsAfter>-- Process for type Comment</commentsAfter> <outPattern location="48:2-117:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="49:3-58:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="49:8-49:18" name="Diagram"> - <model href="temp#/0"/> + <model href="new-model#/20"/> </type> <bindings location="51:4-51:20" propertyName="position"> <value xsi:type="ocl:StringExp" location="51:15-51:20" stringSymbol="0,0"/> @@ -204,7 +222,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="60:5-63:4" varName="sem" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.5/@value"> <type xsi:type="ocl:OclModelElement" location="60:11-60:36" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/21"/> </type> <bindings location="61:4-61:45" propertyName="presentation"> <value xsi:type="ocl:OperationCallExp" location="61:20-61:45" operationName="getPresentationType"> @@ -217,7 +235,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="65:3-67:4" varName="ref" variableExp="//@elements.7/@outPattern/@elements.1/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="65:9-65:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/22"/> </type> <bindings location="66:4-66:34" propertyName="href"> <value xsi:type="ocl:OperationCallExp" location="66:12-66:34" operationName="getPackageParent"> @@ -227,7 +245,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="69:3-72:4" varName="prop0" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="69:11-69:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/23"/> </type> <bindings location="70:4-70:45" propertyName="key"> <value xsi:type="ocl:StringExp" location="70:11-70:45" stringSymbol="org.topcased.modeler.di.typeName"/> @@ -240,7 +258,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="74:3-77:4" varName="prop1" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="74:11-74:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/24"/> </type> <bindings location="75:4-75:27" propertyName="key"> <value xsi:type="ocl:StringExp" location="75:11-75:27" stringSymbol="pageFormatName"/> @@ -251,29 +269,35 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="79:3-82:4" varName="prop2" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="79:11-79:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/25"/> </type> <bindings location="80:4-80:25" propertyName="key"> <value xsi:type="ocl:StringExp" location="80:11-80:25" stringSymbol="diagramWidth"/> </bindings> <bindings location="81:4-81:19" propertyName="value"> - <value xsi:type="ocl:StringExp" location="81:13-81:19" stringSymbol="1188"/> + <commentsAfter>--'840'</commentsAfter> + <value xsi:type="ocl:StringExp" location="81:13-81:19" stringSymbol="1188"> + <commentsAfter>--'840'</commentsAfter> + </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="84:3-87:4" varName="prop3" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="84:11-84:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/26"/> </type> <bindings location="85:4-85:26" propertyName="key"> <value xsi:type="ocl:StringExp" location="85:11-85:26" stringSymbol="diagramHeight"/> </bindings> <bindings location="86:4-86:18" propertyName="value"> - <value xsi:type="ocl:StringExp" location="86:13-86:18" stringSymbol="840"/> + <commentsAfter>--'1188'</commentsAfter> + <value xsi:type="ocl:StringExp" location="86:13-86:18" stringSymbol="840"> + <commentsAfter>--'1188'</commentsAfter> + </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="89:3-92:4" varName="prop4" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="89:11-89:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/27"/> </type> <bindings location="90:4-90:27" propertyName="key"> <value xsi:type="ocl:StringExp" location="90:11-90:27" stringSymbol="pageMarginName"/> @@ -284,7 +308,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="94:3-97:4" varName="prop5" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="94:11-94:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/28"/> </type> <bindings location="95:4-95:29" propertyName="key"> <value xsi:type="ocl:StringExp" location="95:11-95:29" stringSymbol="diagramTopMargin"/> @@ -295,7 +319,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="99:3-102:4" varName="prop6" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="99:11-99:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/29"/> </type> <bindings location="100:4-100:32" propertyName="key"> <value xsi:type="ocl:StringExp" location="100:11-100:32" stringSymbol="diagramBottomMargin"/> @@ -306,7 +330,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="104:3-107:4" varName="prop7" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="104:11-104:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/30"/> </type> <bindings location="105:4-105:30" propertyName="key"> <value xsi:type="ocl:StringExp" location="105:11-105:30" stringSymbol="diagramLeftMargin"/> @@ -317,7 +341,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="109:3-112:4" varName="prop8" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.8"> <type xsi:type="ocl:OclModelElement" location="109:11-109:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/31"/> </type> <bindings location="110:4-110:31" propertyName="key"> <value xsi:type="ocl:StringExp" location="110:11-110:31" stringSymbol="diagramRightMargin"/> @@ -328,20 +352,23 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="114:3-117:4" varName="prop9" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.4/@value/@elements.9"> <type xsi:type="ocl:OclModelElement" location="114:11-114:22" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/32"/> </type> <bindings location="115:4-115:24" propertyName="key"> <value xsi:type="ocl:StringExp" location="115:11-115:24" stringSymbol="orientation"/> </bindings> <bindings location="116:4-116:23" propertyName="value"> - <value xsi:type="ocl:StringExp" location="116:13-116:23" stringSymbol="portrait"/> + <commentsAfter>-- ne pas mettre 'paysage' ou 'landscape' sinon comportement non attendu</commentsAfter> + <value xsi:type="ocl:StringExp" location="116:13-116:23" stringSymbol="portrait"> + <commentsAfter>-- ne pas mettre 'paysage' ou 'landscape' sinon comportement non attendu</commentsAfter> + </value> </bindings> </elements> </outPattern> <inPattern location="46:2-47:43"> <elements xsi:type="atl:SimpleInPatternElement" location="47:3-47:20" varName="emx" variableExp="//@elements.7/@inPattern/@filter/@source //@elements.7/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.6/@value/@elements.0/@source //@elements.7/@outPattern/@elements.0/@bindings.6/@value/@elements.1/@source //@elements.7/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.2/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.3/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="47:9-47:20" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="47:22-47:42" operationName="isValidDiagram"> @@ -350,10 +377,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="121:1-143:2" name="umlComment"> + <commentsBefore>-- Process for type Comment</commentsBefore> + <commentsAfter>-- Process for type Association of Comment</commentsAfter> <outPattern location="124:2-142:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="125:3-130:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="125:8-125:20" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/34"/> </type> <bindings location="126:6-126:135" propertyName="position"> <value xsi:type="ocl:OperatorCallExp" location="126:18-126:135" operationName="+"> @@ -426,7 +455,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="132:3-135:4" varName="sem" variableExp="//@elements.8/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="132:9-132:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/35"/> </type> <bindings location="133:4-133:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="133:15-133:18" referredVariable="//@elements.8/@outPattern/@elements.2"/> @@ -437,7 +466,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="137:3-139:4" varName="ref" variableExp="//@elements.8/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="137:9-137:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/36"/> </type> <bindings location="138:4-138:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="138:12-138:33" name="idelement"> @@ -449,14 +478,14 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="141:3-142:4" varName="graphConn" variableExp="//@elements.8/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="141:15-141:32" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/37"/> </type> </elements> </outPattern> <inPattern location="122:2-123:40"> <elements xsi:type="atl:SimpleInPatternElement" location="123:3-123:17" varName="emx" variableExp="//@elements.8/@inPattern/@filter/@source //@elements.8/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source/@source //@elements.8/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.8/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source/@source/@source/@source/@source //@elements.8/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.8/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="123:9-123:17" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="123:20-123:39" operationName="isTypeComment"> @@ -465,16 +494,18 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="146:1-159:2" name="umlCommentAssociation"> + <commentsBefore>-- Process for type Association of Comment</commentsBefore> + <commentsAfter>-- Enables to get the type name of the current diagram	</commentsAfter> <outPattern location="149:2-158:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="150:3-154:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="150:8-150:20" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/39"/> </type> <bindings location="151:4-151:119" propertyName="anchor"> <value xsi:type="ocl:SequenceExp" location="151:14-151:119"> <elements xsi:type="ocl:OperationCallExp" location="151:24-151:70" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="151:24-151:34"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/40"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="151:47-151:57" name="source"> <source xsi:type="ocl:VariableExp" location="151:47-151:50" referredVariable="//@elements.9/@inPattern/@elements.0"/> @@ -483,7 +514,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="151:72-151:118" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="151:72-151:82"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/41"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="151:95-151:105" name="target"> <source xsi:type="ocl:VariableExp" location="151:95-151:98" referredVariable="//@elements.9/@inPattern/@elements.0"/> @@ -493,12 +524,15 @@ </value> </bindings> <bindings location="152:4-152:24" propertyName="semanticModel"> - <value xsi:type="ocl:VariableExp" location="152:21-152:24" referredVariable="//@elements.9/@outPattern/@elements.1"/> + <commentsAfter>--waypoints <- emx.isValidBendpoint()</commentsAfter> + <value xsi:type="ocl:VariableExp" location="152:21-152:24" referredVariable="//@elements.9/@outPattern/@elements.1"> + <commentsAfter>--waypoints <- emx.isValidBendpoint()</commentsAfter> + </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="156:3-158:4" varName="sem" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="156:9-156:38" name="SimpleSemanticModelElement"> - <model href="temp#/0"/> + <model href="new-model#/42"/> </type> <bindings location="157:4-157:40" propertyName="typeInfo"> <value xsi:type="ocl:StringExp" location="157:16-157:40" stringSymbol="CommentLink EditPolicy"/> @@ -508,7 +542,7 @@ <inPattern location="147:2-148:118"> <elements xsi:type="atl:SimpleInPatternElement" location="148:3-148:17" varName="emx" variableExp="//@elements.9/@inPattern/@filter/@source/@source/@source //@elements.9/@inPattern/@filter/@source/@arguments.0/@source/@source/@source //@elements.9/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.9/@outPattern/@elements.0/@bindings.0/@value/@elements.0/@arguments.0/@source //@elements.9/@outPattern/@elements.0/@bindings.0/@value/@elements.1/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="148:9-148:17" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/38"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="148:19-148:117" operationName="and"> @@ -535,6 +569,8 @@ </inPattern> </elements> <elements xsi:type="atl:Helper" location="162:1-169:8"> + <commentsBefore>-- Enables to get the type name of the current diagram	</commentsBefore> + <commentsAfter>-- Enables to get the type of the current diagram</commentsAfter> <definition location="162:8-169:7"> <feature xsi:type="ocl:Operation" location="162:34-169:7" name="getDiagramTypeName"> <returnType xsi:type="ocl:StringType" location="162:57-162:63"/> @@ -543,7 +579,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="163:5-163:26" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="163:5-163:14" name="type"> <source xsi:type="ocl:VariableExp" location="163:5-163:9"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/44"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="163:17-163:26" stringSymbol="Usecase"/> @@ -553,7 +589,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="165:10-165:29" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="165:10-165:19" name="type"> <source xsi:type="ocl:VariableExp" location="165:10-165:14"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/45"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="165:22-165:29" stringSymbol="Class"/> @@ -564,12 +600,14 @@ </feature> <context_ location="162:8-162:27"> <context_ xsi:type="ocl:OclModelElement" location="162:16-162:27" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/43"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="172:1-179:8"> + <commentsBefore>-- Enables to get the type of the current diagram</commentsBefore> + <commentsAfter>-- Enables to get the reference of the package which contains the processed diagram </commentsAfter> <definition location="172:8-179:7"> <feature xsi:type="ocl:Operation" location="172:34-179:7" name="getPresentationType"> <returnType xsi:type="ocl:StringType" location="172:58-172:64"/> @@ -578,7 +616,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="173:5-173:26" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="173:5-173:14" name="type"> <source xsi:type="ocl:VariableExp" location="173:5-173:9"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/47"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="173:17-173:26" stringSymbol="Usecase"/> @@ -588,7 +626,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="175:10-175:29" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="175:10-175:19" name="type"> <source xsi:type="ocl:VariableExp" location="175:10-175:14"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/48"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="175:22-175:29" stringSymbol="Class"/> @@ -599,12 +637,14 @@ </feature> <context_ location="172:8-172:27"> <context_ xsi:type="ocl:OclModelElement" location="172:16-172:27" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/46"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="182:1-187:8"> + <commentsBefore>-- Enables to get the reference of the package which contains the processed diagram </commentsBefore> + <commentsAfter>-- Tests if a Node is a Comment </commentsAfter> <definition location="182:8-187:7"> <feature xsi:type="ocl:Operation" location="182:34-187:7" name="getPackageParent"> <returnType xsi:type="ocl:StringType" location="182:55-182:61"/> @@ -612,13 +652,13 @@ <variable location="183:6-183:143" varName="selectedPackages" variableExp="//@elements.12/@definition/@feature/@body/@in_/@condition/@source //@elements.12/@definition/@feature/@body/@in_/@thenExpression/@source/@source"> <type xsi:type="ocl:SetType" location="183:25-183:38"> <elementType xsi:type="ocl:OclModelElement" location="183:29-183:37" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/50"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="183:41-183:143" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="183:41-183:63" name="allPackages"> <source xsi:type="ocl:VariableExp" location="183:41-183:51"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/51"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="183:76-183:142" operationName="notEmpty"> @@ -631,7 +671,7 @@ <source xsi:type="ocl:VariableExp" location="183:103-183:104" referredVariable="//@elements.12/@definition/@feature/@body/@variable/@initExpression/@body/@source/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="183:124-183:128"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/52"/> </arguments> </body> <iterators location="183:99-183:100" varName="e" variableExp="//@elements.12/@definition/@feature/@body/@variable/@initExpression/@body/@source/@body/@source/@source"/> @@ -651,7 +691,7 @@ </condition> <elseExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="186:8-186:22" name="idelement"> <source xsi:type="ocl:VariableExp" location="186:8-186:12"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/53"/> </source> </elseExpression> </in_> @@ -659,12 +699,14 @@ </feature> <context_ location="182:8-182:27"> <context_ xsi:type="ocl:OclModelElement" location="182:16-182:27" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/49"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="190:1-191:57"> + <commentsBefore>-- Tests if a Node is a Comment </commentsBefore> + <commentsAfter>-- Tests if the current Edge is a comment association</commentsAfter> <definition location="190:8-191:56"> <feature xsi:type="ocl:Operation" location="190:31-191:56" name="isTypeComment"> <returnType xsi:type="ocl:BooleanType" location="190:49-190:56"/> @@ -672,17 +714,17 @@ <source xsi:type="ocl:OperationCallExp" location="191:2-191:39" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="191:2-191:14" name="element"> <source xsi:type="ocl:VariableExp" location="191:2-191:6"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/55"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="191:27-191:38" name="Comment"> - <model href="temp#/1"/> + <model href="new-model#/56"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="191:44-191:56" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="191:44-191:53" name="type"> <source xsi:type="ocl:VariableExp" location="191:44-191:48"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/57"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="191:54-191:56" stringSymbol=""/> @@ -691,12 +733,14 @@ </feature> <context_ location="190:8-190:24"> <context_ xsi:type="ocl:OclModelElement" location="190:16-190:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/54"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="194:1-198:8"> + <commentsBefore>-- Tests if the current Edge is a comment association</commentsBefore> + <commentsAfter>-- Gets the diagram according to a graphical node </commentsAfter> <definition location="194:8-198:7"> <feature xsi:type="ocl:Operation" location="194:31-198:7" name="isCommentAssociation"> <returnType xsi:type="ocl:BooleanType" location="194:56-194:63"/> @@ -705,7 +749,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="195:5-195:27" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="195:5-195:14" name="type"> <source xsi:type="ocl:VariableExp" location="195:5-195:9"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/59"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="195:16-195:27" stringSymbol="Reference"/> @@ -715,16 +759,19 @@ </feature> <context_ location="194:8-194:24"> <context_ xsi:type="ocl:OclModelElement" location="194:16-194:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/58"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="201:1-202:195"> + <commentsBefore>-- Gets the diagram according to a graphical node </commentsBefore> + <commentsAfter>-- Gives the diagram type which the Node belongs to.</commentsAfter> + <commentsAfter>-- For a given Node, this helper finds the corresponding Diagram and returns the String representing the type.</commentsAfter> <definition location="201:8-202:194"> <feature xsi:type="ocl:Operation" location="201:31-202:194" name="getDiagram"> <returnType xsi:type="ocl:OclModelElement" location="201:46-201:57" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/61"/> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="202:2-202:194" operationName="first"> <source xsi:type="ocl:CollectionOperationCallExp" location="202:2-202:185" operationName="asSequence"> @@ -732,7 +779,7 @@ <source xsi:type="ocl:IteratorExp" location="202:2-202:160" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="202:2-202:24" name="allDiagrams"> <source xsi:type="ocl:VariableExp" location="202:2-202:12"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/62"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="202:40-202:159" operationName="notEmpty"> @@ -750,7 +797,7 @@ <source xsi:type="ocl:VariableExp" location="202:101-202:108" referredVariable="//@elements.15/@definition/@feature/@body/@source/@source/@source/@body/@source/@body/@source/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="202:128-202:132"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/63"/> </arguments> </body> <iterators location="202:91-202:98" varName="subnode" variableExp="//@elements.15/@definition/@feature/@body/@source/@source/@source/@body/@source/@body/@source/@body/@source/@source"/> @@ -767,12 +814,15 @@ </feature> <context_ location="201:8-201:24"> <context_ xsi:type="ocl:OclModelElement" location="201:16-201:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/60"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="206:1-217:8"> + <commentsBefore>-- Gives the diagram type which the Node belongs to.</commentsBefore> + <commentsBefore>-- For a given Node, this helper finds the corresponding Diagram and returns the String representing the type.</commentsBefore> + <commentsAfter>-- Gets the corresponding diagram according to a graphical edge</commentsAfter> <definition location="206:8-217:7"> <feature xsi:type="ocl:Operation" location="206:31-217:7" name="getDiagramType"> <returnType xsi:type="ocl:StringType" location="206:50-206:56"/> @@ -780,13 +830,13 @@ <variable location="207:8-207:109" varName="selectedDiagrams" variableExp="//@elements.16/@definition/@feature/@body/@in_/@thenExpression/@condition/@source //@elements.16/@definition/@feature/@body/@in_/@thenExpression/@thenExpression/@condition/@source/@source/@source/@source //@elements.16/@definition/@feature/@body/@in_/@thenExpression/@thenExpression/@thenExpression/@source/@source"> <type xsi:type="ocl:SetType" location="207:27-207:43"> <elementType xsi:type="ocl:OclModelElement" location="207:31-207:42" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/65"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="207:47-207:109" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="207:47-207:69" name="allDiagrams"> <source xsi:type="ocl:VariableExp" location="207:47-207:57"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/66"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="207:82-207:108" operationName="includes"> @@ -794,7 +844,7 @@ <source xsi:type="ocl:VariableExp" location="207:82-207:83" referredVariable="//@elements.16/@definition/@feature/@body/@variable/@initExpression/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="207:103-207:107"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/67"/> </arguments> </body> <iterators location="207:78-207:79" varName="d" variableExp="//@elements.16/@definition/@feature/@body/@variable/@initExpression/@body/@source/@source"/> @@ -827,7 +877,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="208:5-208:17" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="208:5-208:14" name="type"> <source xsi:type="ocl:VariableExp" location="208:5-208:9"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/68"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="208:15-208:17" stringSymbol=""/> @@ -838,23 +888,25 @@ </feature> <context_ location="206:8-206:24"> <context_ xsi:type="ocl:OclModelElement" location="206:16-206:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/64"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="220:1-221:85"> + <commentsBefore>-- Gets the corresponding diagram according to a graphical edge</commentsBefore> + <commentsAfter>-- Gives the diagram type which the current Edge belongs to </commentsAfter> <definition location="220:8-221:84"> <feature xsi:type="ocl:Operation" location="220:31-221:84" name="getDiagram"> <returnType xsi:type="ocl:OclModelElement" location="220:46-220:57" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/70"/> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="221:2-221:84" operationName="first"> <source xsi:type="ocl:CollectionOperationCallExp" location="221:2-221:75" operationName="asSequence"> <source xsi:type="ocl:IteratorExp" location="221:2-221:61" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="221:2-221:24" name="allDiagrams"> <source xsi:type="ocl:VariableExp" location="221:2-221:12"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/71"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="221:37-221:60" operationName="includes"> @@ -862,7 +914,7 @@ <source xsi:type="ocl:VariableExp" location="221:37-221:38" referredVariable="//@elements.17/@definition/@feature/@body/@source/@source/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="221:55-221:59"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/72"/> </arguments> </body> <iterators location="221:33-221:34" varName="d" variableExp="//@elements.17/@definition/@feature/@body/@source/@source/@body/@source/@source"/> @@ -872,35 +924,42 @@ </feature> <context_ location="220:8-220:24"> <context_ xsi:type="ocl:OclModelElement" location="220:16-220:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/69"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="224:1-225:25"> + <commentsBefore>-- Gives the diagram type which the current Edge belongs to </commentsBefore> + <commentsAfter>-- ***** CLASS DIAGRAM SECTION *****</commentsAfter> + <commentsAfter>-- This section covers the transformations for : Class, Interface, DataType, Feature, Operation, ClassInstance, Package and the possible associations.</commentsAfter> + <commentsAfter>-- Process for type Class or Interface or DataType</commentsAfter> <definition location="224:8-225:24"> <feature xsi:type="ocl:Operation" location="224:31-225:24" name="getDiagramType"> <returnType xsi:type="ocl:StringType" location="224:50-224:56"/> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="225:2-225:24" name="type"> <source xsi:type="ocl:OperationCallExp" location="225:2-225:19" operationName="getDiagram"> <source xsi:type="ocl:VariableExp" location="225:2-225:6"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/74"/> </source> </source> </body> </feature> <context_ location="224:8-224:24"> <context_ xsi:type="ocl:OclModelElement" location="224:16-224:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/73"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="232:1-293:2" name="umlClassDiagramElement1"> + <commentsBefore>-- ***** CLASS DIAGRAM SECTION *****</commentsBefore> + <commentsBefore>-- This section covers the transformations for : Class, Interface, DataType, Feature, Operation, ClassInstance, Package and the possible associations.</commentsBefore> + <commentsBefore>-- Process for type Class or Interface or DataType</commentsBefore> <outPattern location="235:2-292:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="236:3-242:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="236:8-236:20" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/76"/> </type> <bindings location="237:5-237:134" propertyName="position"> <value xsi:type="ocl:OperatorCallExp" location="237:17-237:134" operationName="+"> @@ -979,12 +1038,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="244:3-245:4" varName="graphConn" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="244:15-244:32" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/77"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="247:3-250:4" varName="sem" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="247:9-247:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/78"/> </type> <bindings location="248:4-248:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="248:15-248:18" referredVariable="//@elements.19/@outPattern/@elements.3"/> @@ -995,7 +1054,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="252:3-254:4" varName="ref" variableExp="//@elements.19/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="252:9-252:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/79"/> </type> <bindings location="253:4-253:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="253:12-253:33" name="idelement"> @@ -1007,7 +1066,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="256:3-259:4" varName="feat1" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.4/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="256:11-256:23" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/80"/> </type> <bindings location="257:4-257:25" propertyName="property"> <value xsi:type="ocl:VariableExp" location="257:16-257:25" referredVariable="//@elements.19/@outPattern/@elements.5"/> @@ -1018,7 +1077,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="261:3-264:4" varName="propFeat1" variableExp="//@elements.19/@outPattern/@elements.4/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="261:15-261:26" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/81"/> </type> <bindings location="262:4-262:33" propertyName="key"> <value xsi:type="ocl:StringExp" location="262:11-262:33" stringSymbol="eStructuralFeatureID"/> @@ -1033,7 +1092,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="266:3-269:4" varName="semFeat1" variableExp="//@elements.19/@outPattern/@elements.4/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="266:14-266:39" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/82"/> </type> <bindings location="267:4-267:23" propertyName="element"> <value xsi:type="ocl:VariableExp" location="267:15-267:23" referredVariable="//@elements.19/@outPattern/@elements.7"/> @@ -1044,7 +1103,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="271:3-273:4" varName="refFeat1" variableExp="//@elements.19/@outPattern/@elements.6/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="271:14-271:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/83"/> </type> <bindings location="272:4-272:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="272:12-272:33" name="idelement"> @@ -1056,7 +1115,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="275:3-278:4" varName="feat2" variableExp="//@elements.19/@outPattern/@elements.0/@bindings.4/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="275:11-275:23" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/84"/> </type> <bindings location="276:4-276:25" propertyName="property"> <value xsi:type="ocl:VariableExp" location="276:16-276:25" referredVariable="//@elements.19/@outPattern/@elements.9"/> @@ -1067,7 +1126,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="280:3-283:4" varName="propFeat2" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="280:15-280:26" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/85"/> </type> <bindings location="281:4-281:33" propertyName="key"> <value xsi:type="ocl:StringExp" location="281:11-281:33" stringSymbol="eStructuralFeatureID"/> @@ -1082,7 +1141,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="285:3-288:4" varName="semFeat2" variableExp="//@elements.19/@outPattern/@elements.8/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="285:14-285:39" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/86"/> </type> <bindings location="286:4-286:23" propertyName="element"> <value xsi:type="ocl:VariableExp" location="286:15-286:23" referredVariable="//@elements.19/@outPattern/@elements.11"/> @@ -1093,7 +1152,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="290:3-292:4" varName="refFeat2" variableExp="//@elements.19/@outPattern/@elements.10/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="290:14-290:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/87"/> </type> <bindings location="291:4-291:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="291:12-291:33" name="idelement"> @@ -1107,7 +1166,7 @@ <inPattern location="233:2-234:99"> <elements xsi:type="atl:SimpleInPatternElement" location="234:3-234:17" varName="emx" variableExp="//@elements.19/@inPattern/@filter/@condition/@source //@elements.19/@inPattern/@filter/@thenExpression/@source/@source //@elements.19/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source/@source //@elements.19/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.19/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source/@source/@source/@source/@source //@elements.19/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.19/@outPattern/@elements.3/@bindings.0/@value/@source/@source //@elements.19/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.7/@bindings.0/@value/@source/@source //@elements.19/@outPattern/@elements.9/@bindings.1/@value/@source/@source //@elements.19/@outPattern/@elements.11/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="234:9-234:17" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/75"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="234:19-234:98"> @@ -1127,7 +1186,7 @@ <outPattern location="298:2-356:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="299:3-305:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="299:8-299:20" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/89"/> </type> <bindings location="300:5-300:134" propertyName="position"> <value xsi:type="ocl:OperatorCallExp" location="300:17-300:134" operationName="+"> @@ -1206,12 +1265,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="307:3-308:4" varName="graphConn" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="307:15-307:32" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/90"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="310:3-313:4" varName="sem" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="310:9-310:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/91"/> </type> <bindings location="311:4-311:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="311:15-311:18" referredVariable="//@elements.20/@outPattern/@elements.3"/> @@ -1222,7 +1281,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="315:3-317:4" varName="ref" variableExp="//@elements.20/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="315:9-315:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/92"/> </type> <bindings location="316:4-316:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="316:12-316:33" name="idelement"> @@ -1234,7 +1293,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="319:3-323:4" varName="feat1" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.4/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="319:11-319:23" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/93"/> </type> <bindings location="320:4-320:24" propertyName="property"> <value xsi:type="ocl:VariableExp" location="320:15-320:24" referredVariable="//@elements.20/@outPattern/@elements.5"/> @@ -1254,7 +1313,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="325:3-328:4" varName="propFeat1" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="325:15-325:26" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/94"/> </type> <bindings location="326:4-326:33" propertyName="key"> <value xsi:type="ocl:StringExp" location="326:11-326:33" stringSymbol="eStructuralFeatureID"/> @@ -1269,7 +1328,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="330:3-333:4" varName="semFeat1" variableExp="//@elements.20/@outPattern/@elements.4/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="330:14-330:39" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/95"/> </type> <bindings location="331:4-331:23" propertyName="element"> <value xsi:type="ocl:VariableExp" location="331:15-331:23" referredVariable="//@elements.20/@outPattern/@elements.7"/> @@ -1280,7 +1339,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="335:3-337:4" varName="refFeat1" variableExp="//@elements.20/@outPattern/@elements.6/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="335:14-335:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/96"/> </type> <bindings location="336:4-336:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="336:12-336:33" name="idelement"> @@ -1292,7 +1351,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="339:3-342:4" varName="feat2" variableExp="//@elements.20/@outPattern/@elements.0/@bindings.4/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="339:11-339:23" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/97"/> </type> <bindings location="340:4-340:25" propertyName="property"> <value xsi:type="ocl:VariableExp" location="340:16-340:25" referredVariable="//@elements.20/@outPattern/@elements.9"/> @@ -1303,7 +1362,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="344:3-347:4" varName="propFeat2" variableExp="//@elements.20/@outPattern/@elements.8/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="344:15-344:26" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/98"/> </type> <bindings location="345:4-345:33" propertyName="key"> <value xsi:type="ocl:StringExp" location="345:11-345:33" stringSymbol="eStructuralFeatureID"/> @@ -1318,7 +1377,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="349:3-352:4" varName="semFeat2" variableExp="//@elements.20/@outPattern/@elements.8/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="349:14-349:39" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/99"/> </type> <bindings location="350:4-350:23" propertyName="element"> <value xsi:type="ocl:VariableExp" location="350:15-350:23" referredVariable="//@elements.20/@outPattern/@elements.11"/> @@ -1329,7 +1388,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="354:3-356:4" varName="refFeat2" variableExp="//@elements.20/@outPattern/@elements.10/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="354:14-354:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/100"/> </type> <bindings location="355:4-355:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="355:12-355:33" name="idelement"> @@ -1343,7 +1402,7 @@ <inPattern location="296:2-297:138"> <elements xsi:type="atl:SimpleInPatternElement" location="297:3-297:17" varName="emx" variableExp="//@elements.20/@inPattern/@filter/@condition/@source //@elements.20/@inPattern/@filter/@thenExpression/@source/@source/@source/@source //@elements.20/@inPattern/@filter/@thenExpression/@arguments.0/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source/@source/@source/@source/@source //@elements.20/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.20/@outPattern/@elements.3/@bindings.0/@value/@source/@source //@elements.20/@outPattern/@elements.4/@bindings.2/@value/@elements.0/@source/@source //@elements.20/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.20/@outPattern/@elements.7/@bindings.0/@value/@source/@source //@elements.20/@outPattern/@elements.9/@bindings.1/@value/@source/@source //@elements.20/@outPattern/@elements.11/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="297:9-297:17" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/88"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="297:19-297:137"> @@ -1372,7 +1431,7 @@ <outPattern location="362:2-420:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="363:3-369:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="363:8-363:20" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/102"/> </type> <bindings location="364:5-364:134" propertyName="position"> <value xsi:type="ocl:OperatorCallExp" location="364:17-364:134" operationName="+"> @@ -1451,12 +1510,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="371:3-372:4" varName="graphConn" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="371:15-371:32" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/103"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="374:3-377:4" varName="sem" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="374:9-374:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/104"/> </type> <bindings location="375:4-375:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="375:15-375:18" referredVariable="//@elements.21/@outPattern/@elements.3"/> @@ -1467,7 +1526,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="379:3-381:4" varName="ref" variableExp="//@elements.21/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="379:9-379:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/105"/> </type> <bindings location="380:4-380:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="380:12-380:33" name="idelement"> @@ -1479,7 +1538,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="383:3-386:4" varName="feat1" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.4/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="383:11-383:23" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/106"/> </type> <bindings location="384:4-384:25" propertyName="property"> <value xsi:type="ocl:VariableExp" location="384:16-384:25" referredVariable="//@elements.21/@outPattern/@elements.5"/> @@ -1490,7 +1549,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="388:3-391:4" varName="propFeat1" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="388:15-388:26" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/107"/> </type> <bindings location="389:4-389:33" propertyName="key"> <value xsi:type="ocl:StringExp" location="389:11-389:33" stringSymbol="eStructuralFeatureID"/> @@ -1505,7 +1564,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="393:3-396:4" varName="semFeat1" variableExp="//@elements.21/@outPattern/@elements.4/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="393:14-393:39" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/108"/> </type> <bindings location="394:4-394:23" propertyName="element"> <value xsi:type="ocl:VariableExp" location="394:15-394:23" referredVariable="//@elements.21/@outPattern/@elements.7"/> @@ -1516,7 +1575,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="398:3-400:4" varName="refFeat1" variableExp="//@elements.21/@outPattern/@elements.6/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="398:14-398:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/109"/> </type> <bindings location="399:4-399:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="399:12-399:33" name="idelement"> @@ -1528,7 +1587,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="402:3-406:4" varName="feat2" variableExp="//@elements.21/@outPattern/@elements.0/@bindings.4/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="402:11-402:23" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/110"/> </type> <bindings location="403:4-403:25" propertyName="property"> <value xsi:type="ocl:VariableExp" location="403:16-403:25" referredVariable="//@elements.21/@outPattern/@elements.9"/> @@ -1548,7 +1607,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="408:3-411:4" varName="propFeat2" variableExp="//@elements.21/@outPattern/@elements.8/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="408:15-408:26" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/111"/> </type> <bindings location="409:4-409:33" propertyName="key"> <value xsi:type="ocl:StringExp" location="409:11-409:33" stringSymbol="eStructuralFeatureID"/> @@ -1563,7 +1622,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="413:3-416:4" varName="semFeat2" variableExp="//@elements.21/@outPattern/@elements.8/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="413:14-413:39" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/112"/> </type> <bindings location="414:4-414:23" propertyName="element"> <value xsi:type="ocl:VariableExp" location="414:15-414:23" referredVariable="//@elements.21/@outPattern/@elements.11"/> @@ -1574,7 +1633,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="418:3-420:4" varName="refFeat2" variableExp="//@elements.21/@outPattern/@elements.10/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="418:14-418:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/113"/> </type> <bindings location="419:4-419:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="419:12-419:33" name="idelement"> @@ -1588,7 +1647,7 @@ <inPattern location="360:2-361:138"> <elements xsi:type="atl:SimpleInPatternElement" location="361:3-361:17" varName="emx" variableExp="//@elements.21/@inPattern/@filter/@condition/@source //@elements.21/@inPattern/@filter/@thenExpression/@source/@source/@source/@source //@elements.21/@inPattern/@filter/@thenExpression/@arguments.0/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source/@source/@source/@source/@source //@elements.21/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.21/@outPattern/@elements.3/@bindings.0/@value/@source/@source //@elements.21/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.21/@outPattern/@elements.7/@bindings.0/@value/@source/@source //@elements.21/@outPattern/@elements.8/@bindings.2/@value/@elements.0/@source/@source //@elements.21/@outPattern/@elements.9/@bindings.1/@value/@source/@source //@elements.21/@outPattern/@elements.11/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="361:9-361:17" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/101"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="361:19-361:137"> @@ -1614,10 +1673,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="423:1-486:2" name="umlClassDiagramElement4"> + <commentsAfter>-- Process for type Package and InstanceClass</commentsAfter> <outPattern location="426:2-485:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="427:3-433:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="427:8-427:20" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/115"/> </type> <bindings location="428:5-428:134" propertyName="position"> <value xsi:type="ocl:OperatorCallExp" location="428:17-428:134" operationName="+"> @@ -1696,12 +1756,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="435:3-436:4" varName="graphConn" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="435:15-435:32" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/116"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="438:3-441:4" varName="sem" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="438:9-438:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/117"/> </type> <bindings location="439:4-439:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="439:15-439:18" referredVariable="//@elements.22/@outPattern/@elements.3"/> @@ -1712,7 +1772,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="443:3-445:4" varName="ref" variableExp="//@elements.22/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="443:9-443:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/118"/> </type> <bindings location="444:4-444:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="444:12-444:33" name="idelement"> @@ -1724,7 +1784,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="447:3-451:4" varName="feat1" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.4/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="447:11-447:23" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/119"/> </type> <bindings location="448:4-448:24" propertyName="property"> <value xsi:type="ocl:VariableExp" location="448:15-448:24" referredVariable="//@elements.22/@outPattern/@elements.5"/> @@ -1744,7 +1804,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="453:3-456:4" varName="propFeat1" variableExp="//@elements.22/@outPattern/@elements.4/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="453:15-453:26" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/120"/> </type> <bindings location="454:4-454:33" propertyName="key"> <value xsi:type="ocl:StringExp" location="454:11-454:33" stringSymbol="eStructuralFeatureID"/> @@ -1759,7 +1819,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="458:3-461:4" varName="semFeat1" variableExp="//@elements.22/@outPattern/@elements.4/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="458:14-458:39" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/121"/> </type> <bindings location="459:4-459:23" propertyName="element"> <value xsi:type="ocl:VariableExp" location="459:15-459:23" referredVariable="//@elements.22/@outPattern/@elements.7"/> @@ -1770,7 +1830,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="463:3-465:4" varName="refFeat1" variableExp="//@elements.22/@outPattern/@elements.6/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="463:14-463:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/122"/> </type> <bindings location="464:4-464:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="464:12-464:33" name="idelement"> @@ -1782,7 +1842,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="467:3-471:4" varName="feat2" variableExp="//@elements.22/@outPattern/@elements.0/@bindings.4/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="467:11-467:23" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/123"/> </type> <bindings location="468:4-468:25" propertyName="property"> <value xsi:type="ocl:VariableExp" location="468:16-468:25" referredVariable="//@elements.22/@outPattern/@elements.9"/> @@ -1802,7 +1862,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="473:3-476:4" varName="propFeat2" variableExp="//@elements.22/@outPattern/@elements.8/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="473:15-473:26" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/124"/> </type> <bindings location="474:4-474:33" propertyName="key"> <value xsi:type="ocl:StringExp" location="474:11-474:33" stringSymbol="eStructuralFeatureID"/> @@ -1817,7 +1877,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="478:3-481:4" varName="semFeat2" variableExp="//@elements.22/@outPattern/@elements.8/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="478:14-478:39" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/125"/> </type> <bindings location="479:4-479:23" propertyName="element"> <value xsi:type="ocl:VariableExp" location="479:15-479:23" referredVariable="//@elements.22/@outPattern/@elements.11"/> @@ -1828,7 +1888,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="483:3-485:4" varName="refFeat2" variableExp="//@elements.22/@outPattern/@elements.10/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="483:14-483:24" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/126"/> </type> <bindings location="484:4-484:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="484:12-484:33" name="idelement"> @@ -1842,7 +1902,7 @@ <inPattern location="424:2-425:142"> <elements xsi:type="atl:SimpleInPatternElement" location="425:3-425:17" varName="emx" variableExp="//@elements.22/@inPattern/@filter/@condition/@source //@elements.22/@inPattern/@filter/@thenExpression/@source/@source/@source/@source //@elements.22/@inPattern/@filter/@thenExpression/@arguments.0/@source/@source/@source //@elements.22/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source/@source //@elements.22/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.22/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source/@source/@source/@source/@source //@elements.22/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.22/@outPattern/@elements.3/@bindings.0/@value/@source/@source //@elements.22/@outPattern/@elements.4/@bindings.2/@value/@elements.0/@source/@source //@elements.22/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.22/@outPattern/@elements.7/@bindings.0/@value/@source/@source //@elements.22/@outPattern/@elements.8/@bindings.2/@value/@elements.0/@source/@source //@elements.22/@outPattern/@elements.9/@bindings.1/@value/@source/@source //@elements.22/@outPattern/@elements.11/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="425:9-425:17" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/114"/> </type> </elements> <filter xsi:type="ocl:IfExp" location="425:19-425:141"> @@ -1870,10 +1930,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="489:1-512:2" name="umlPackageOrInstanceClass"> + <commentsBefore>-- Process for type Package and InstanceClass</commentsBefore> + <commentsAfter>-- Process for attributes and operations of a class or an interface</commentsAfter> <outPattern location="492:2-511:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="493:3-499:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="493:8-493:20" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/128"/> </type> <bindings location="494:9-494:138" propertyName="position"> <value xsi:type="ocl:OperatorCallExp" location="494:21-494:138" operationName="+"> @@ -1955,7 +2017,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="501:3-504:4" varName="sem" variableExp="//@elements.23/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="501:9-501:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/129"/> </type> <bindings location="502:4-502:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="502:15-502:18" referredVariable="//@elements.23/@outPattern/@elements.2"/> @@ -1966,7 +2028,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="506:3-508:4" varName="ref" variableExp="//@elements.23/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="506:9-506:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/130"/> </type> <bindings location="507:4-507:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="507:12-507:33" name="idelement"> @@ -1978,14 +2040,14 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="510:3-511:4" varName="graphConn" variableExp="//@elements.23/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="510:15-510:32" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/131"/> </type> </elements> </outPattern> <inPattern location="490:2-491:76"> <elements xsi:type="atl:SimpleInPatternElement" location="491:3-491:17" varName="emx" variableExp="//@elements.23/@inPattern/@filter/@source/@source //@elements.23/@inPattern/@filter/@arguments.0/@source //@elements.23/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source/@source //@elements.23/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.23/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source/@source/@source/@source/@source //@elements.23/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.23/@outPattern/@elements.0/@bindings.4/@value/@elements.0/@source/@source //@elements.23/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="491:9-491:17" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/127"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="491:19-491:75" operationName="or"> @@ -1999,10 +2061,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="515:1-533:2" name="umlFeatureAndOperation"> + <commentsBefore>-- Process for attributes and operations of a class or an interface</commentsBefore> + <commentsAfter>-- Processing of Implementation, Dependency and Generalization associations for class diagram</commentsAfter> <outPattern location="518:2-532:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="519:3-523:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="519:8-519:20" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/133"/> </type> <bindings location="520:6-520:27" propertyName="position"> <value xsi:type="ocl:StringExp" location="520:18-520:27" stringSymbol="100,100"/> @@ -2016,7 +2080,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="525:3-528:4" varName="sem" variableExp="//@elements.24/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="525:9-525:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/134"/> </type> <bindings location="526:4-526:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="526:15-526:18" referredVariable="//@elements.24/@outPattern/@elements.2"/> @@ -2027,7 +2091,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="530:3-532:4" varName="ref" variableExp="//@elements.24/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="530:9-530:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/135"/> </type> <bindings location="531:5-531:26" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="531:13-531:26" name="idelement"> @@ -2039,7 +2103,7 @@ <inPattern location="516:2-517:99"> <elements xsi:type="atl:SimpleInPatternElement" location="517:3-517:20" varName="emx" variableExp="//@elements.24/@inPattern/@filter/@source/@source //@elements.24/@inPattern/@filter/@arguments.0/@source //@elements.24/@inPattern/@filter/@arguments.0/@arguments.0/@source //@elements.24/@outPattern/@elements.2/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="517:9-517:20" name="Feature"> - <model href="temp#/1"/> + <model href="new-model#/132"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="517:23-517:98" operationName="and"> @@ -2056,19 +2120,23 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="536:1-554:2" name="umlClassDiagramSpecialAssociation"> + <commentsBefore>-- Processing of Implementation, Dependency and Generalization associations for class diagram</commentsBefore> + <commentsAfter>-- Processing of 'basic' associations between the different class diagram objects </commentsAfter> <outPattern location="539:2-553:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="540:3-544:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="540:8-540:20" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/137"/> </type> <bindings location="541:4-541:24" propertyName="semanticModel"> <value xsi:type="ocl:VariableExp" location="541:21-541:24" referredVariable="//@elements.25/@outPattern/@elements.1"/> </bindings> <bindings location="542:4-542:119" propertyName="anchor"> + <commentsAfter>--waypoints <- emx.isValidBendpoint()</commentsAfter> <value xsi:type="ocl:SequenceExp" location="542:14-542:119"> + <commentsAfter>--waypoints <- emx.isValidBendpoint()</commentsAfter> <elements xsi:type="ocl:OperationCallExp" location="542:24-542:70" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="542:24-542:34"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/138"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="542:47-542:57" name="source"> <source xsi:type="ocl:VariableExp" location="542:47-542:50" referredVariable="//@elements.25/@inPattern/@elements.0"/> @@ -2077,7 +2145,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="542:72-542:118" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="542:72-542:82"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/139"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="542:95-542:105" name="target"> <source xsi:type="ocl:VariableExp" location="542:95-542:98" referredVariable="//@elements.25/@inPattern/@elements.0"/> @@ -2089,7 +2157,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="546:3-549:4" varName="sem" variableExp="//@elements.25/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="546:9-546:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/140"/> </type> <bindings location="547:4-547:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="547:15-547:18" referredVariable="//@elements.25/@outPattern/@elements.2"/> @@ -2100,7 +2168,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="551:3-553:4" varName="ref" variableExp="//@elements.25/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="551:9-551:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/141"/> </type> <bindings location="552:4-552:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="552:12-552:33" name="idelement"> @@ -2114,7 +2182,7 @@ <inPattern location="537:2-538:91"> <elements xsi:type="atl:SimpleInPatternElement" location="538:3-538:17" varName="emx" variableExp="//@elements.25/@inPattern/@filter/@source/@source //@elements.25/@inPattern/@filter/@arguments.0/@source //@elements.25/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@arguments.0/@source //@elements.25/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@arguments.0/@source //@elements.25/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="538:9-538:17" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/136"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="538:19-538:90" operationName="and"> @@ -2128,10 +2196,13 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="557:1-609:2" name="umlClassDiagramBasicAssociation"> + <commentsBefore>-- Processing of 'basic' associations between the different class diagram objects </commentsBefore> + <commentsAfter>---- *** DEFINITION OF CLASS DIAGRAM HELPERS ***</commentsAfter> + <commentsAfter>-- Test if the bendpoints are defined or not </commentsAfter> <outPattern location="560:2-608:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="561:3-566:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="561:8-561:20" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/143"/> </type> <bindings location="562:4-562:24" propertyName="semanticModel"> <value xsi:type="ocl:VariableExp" location="562:21-562:24" referredVariable="//@elements.26/@outPattern/@elements.1"/> @@ -2140,7 +2211,7 @@ <value xsi:type="ocl:SequenceExp" location="563:14-563:119"> <elements xsi:type="ocl:OperationCallExp" location="563:24-563:70" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="563:24-563:34"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/144"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="563:47-563:57" name="source"> <source xsi:type="ocl:VariableExp" location="563:47-563:50" referredVariable="//@elements.26/@inPattern/@elements.0"/> @@ -2149,7 +2220,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="563:72-563:118" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="563:72-563:82"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/145"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="563:95-563:105" name="target"> <source xsi:type="ocl:VariableExp" location="563:95-563:98" referredVariable="//@elements.26/@inPattern/@elements.0"/> @@ -2159,7 +2230,9 @@ </value> </bindings> <bindings location="564:4-564:68" propertyName="contained"> + <commentsAfter>--waypoints <- emx.isValidBendpoint()</commentsAfter> <value xsi:type="ocl:SequenceExp" location="564:17-564:68"> + <commentsAfter>--waypoints <- emx.isValidBendpoint()</commentsAfter> <elements xsi:type="ocl:VariableExp" location="564:27-564:32" referredVariable="//@elements.26/@outPattern/@elements.3"/> <elements xsi:type="ocl:VariableExp" location="564:34-564:39" referredVariable="//@elements.26/@outPattern/@elements.4"/> <elements xsi:type="ocl:VariableExp" location="564:41-564:46" referredVariable="//@elements.26/@outPattern/@elements.5"/> @@ -2171,7 +2244,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="568:3-571:4" varName="sem" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="568:9-568:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/146"/> </type> <bindings location="569:4-569:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="569:15-569:18" referredVariable="//@elements.26/@outPattern/@elements.2"/> @@ -2182,7 +2255,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="573:3-575:4" varName="ref" variableExp="//@elements.26/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="573:9-573:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/147"/> </type> <bindings location="574:4-574:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="574:12-574:33" name="idelement"> @@ -2194,7 +2267,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="577:3-581:4" varName="edge1" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="577:11-577:26" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/148"/> </type> <bindings location="578:4-578:29" propertyName="id"> <value xsi:type="ocl:StringExp" location="578:10-578:29" stringSymbol="srcNameEdgeObject"/> @@ -2208,7 +2281,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="583:3-587:4" varName="edge2" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="583:11-583:26" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/149"/> </type> <bindings location="584:4-584:30" propertyName="id"> <value xsi:type="ocl:StringExp" location="584:10-584:30" stringSymbol="srcCountEdgeObject"/> @@ -2224,7 +2297,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="589:3-593:4" varName="edge3" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.2/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="589:11-589:26" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/150"/> </type> <bindings location="590:4-590:32" propertyName="id"> <value xsi:type="ocl:StringExp" location="590:10-590:32" stringSymbol="targetNameEdgeObject"/> @@ -2238,7 +2311,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="595:3-599:4" varName="edge4" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.2/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="595:11-595:26" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/151"/> </type> <bindings location="596:4-596:33" propertyName="id"> <value xsi:type="ocl:StringExp" location="596:10-596:33" stringSymbol="targetCountEdgeObject"/> @@ -2254,7 +2327,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="601:3-603:4" varName="edge5" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.2/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="601:11-601:30" name="EdgeObjectOffset"> - <model href="temp#/0"/> + <model href="new-model#/152"/> </type> <bindings location="602:4-602:32" propertyName="id"> <value xsi:type="ocl:StringExp" location="602:10-602:32" stringSymbol="middleNameEdgeObject"/> @@ -2262,7 +2335,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="605:3-608:4" varName="edge6" variableExp="//@elements.26/@outPattern/@elements.0/@bindings.2/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="605:11-605:30" name="EdgeObjectOffset"> - <model href="temp#/0"/> + <model href="new-model#/153"/> </type> <bindings location="606:4-606:32" propertyName="id"> <value xsi:type="ocl:StringExp" location="606:10-606:32" stringSymbol="stereotypeEdgeObject"/> @@ -2275,7 +2348,7 @@ <inPattern location="558:2-559:89"> <elements xsi:type="atl:SimpleInPatternElement" location="559:3-559:17" varName="emx" variableExp="//@elements.26/@inPattern/@filter/@source/@source //@elements.26/@inPattern/@filter/@arguments.0/@source //@elements.26/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@arguments.0/@source //@elements.26/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@arguments.0/@source //@elements.26/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="559:9-559:17" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/142"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="559:19-559:88" operationName="and"> @@ -2289,6 +2362,9 @@ </inPattern> </elements> <elements xsi:type="atl:Helper" location="614:1-621:8"> + <commentsBefore>---- *** DEFINITION OF CLASS DIAGRAM HELPERS ***</commentsBefore> + <commentsBefore>-- Test if the bendpoints are defined or not </commentsBefore> + <commentsAfter>-- Tests if the element belongs to a Class diagram </commentsAfter> <definition location="614:8-621:7"> <feature xsi:type="ocl:Operation" location="614:31-621:7" name="isValidBendpoint"> <returnType xsi:type="ocl:SequenceType" location="614:52-614:68"> @@ -2299,7 +2375,7 @@ <condition xsi:type="ocl:OperationCallExp" location="615:5-615:37" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="615:5-615:20" name="bendpoints"> <source xsi:type="ocl:VariableExp" location="615:5-615:9"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/155"/> </source> </source> </condition> @@ -2309,7 +2385,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="617:11-617:33" name="points"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="617:11-617:26" name="bendpoints"> <source xsi:type="ocl:VariableExp" location="617:11-617:15"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/156"/> </source> </source> </source> @@ -2318,7 +2394,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="619:10-619:32" name="points"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="619:10-619:25" name="bendpoints"> <source xsi:type="ocl:VariableExp" location="619:10-619:14"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/157"/> </source> </source> </source> @@ -2328,12 +2404,14 @@ </feature> <context_ location="614:8-614:24"> <context_ xsi:type="ocl:OclModelElement" location="614:16-614:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/154"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="624:1-631:8"> + <commentsBefore>-- Tests if the element belongs to a Class diagram </commentsBefore> + <commentsAfter>-- Tests if the Node is a Class</commentsAfter> <definition location="624:8-631:7"> <feature xsi:type="ocl:Operation" location="624:31-631:7" name="isClassDiagramElement"> <returnType xsi:type="ocl:BooleanType" location="624:57-624:64"/> @@ -2342,7 +2420,7 @@ <thenExpression xsi:type="ocl:OperatorCallExp" location="627:10-627:41" operationName="="> <source xsi:type="ocl:OperationCallExp" location="627:10-627:31" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="627:10-627:14"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/163"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="627:34-627:41" stringSymbol="Class"/> @@ -2351,18 +2429,18 @@ <source xsi:type="ocl:OperatorCallExp" location="626:11-626:55" operationName="or"> <source xsi:type="ocl:OperationCallExp" location="626:11-626:29" operationName="isTypeClass"> <source xsi:type="ocl:VariableExp" location="626:11-626:15"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/160"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="626:33-626:55" operationName="isTypeInterface"> <source xsi:type="ocl:VariableExp" location="626:33-626:37"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/161"/> </source> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="626:59-626:76" operationName="isDataType"> <source xsi:type="ocl:VariableExp" location="626:59-626:63"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/162"/> </source> </arguments> </condition> @@ -2371,7 +2449,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="625:5-625:17" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="625:5-625:14" name="type"> <source xsi:type="ocl:VariableExp" location="625:5-625:9"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/159"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="625:15-625:17" stringSymbol=""/> @@ -2381,100 +2459,110 @@ </feature> <context_ location="624:8-624:24"> <context_ xsi:type="ocl:OclModelElement" location="624:16-624:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/158"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="634:1-635:38"> + <commentsBefore>-- Tests if the Node is a Class</commentsBefore> + <commentsAfter>-- Tests if the Node is an Interface</commentsAfter> <definition location="634:8-635:37"> <feature xsi:type="ocl:Operation" location="634:31-635:37" name="isTypeClass"> <returnType xsi:type="ocl:BooleanType" location="634:47-634:54"/> <body xsi:type="ocl:OperationCallExp" location="635:2-635:37" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="635:2-635:14" name="element"> <source xsi:type="ocl:VariableExp" location="635:2-635:6"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/165"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="635:27-635:36" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/166"/> </arguments> </body> </feature> <context_ location="634:8-634:24"> <context_ xsi:type="ocl:OclModelElement" location="634:16-634:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/164"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="638:1-639:42"> + <commentsBefore>-- Tests if the Node is an Interface</commentsBefore> + <commentsAfter>-- Test if the Node is a DataType</commentsAfter> <definition location="638:8-639:41"> <feature xsi:type="ocl:Operation" location="638:31-639:41" name="isTypeInterface"> <returnType xsi:type="ocl:BooleanType" location="638:51-638:58"/> <body xsi:type="ocl:OperationCallExp" location="639:2-639:41" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="639:2-639:14" name="element"> <source xsi:type="ocl:VariableExp" location="639:2-639:6"> - <referredVariable href="temp#/38"/> + <referredVariable href="new-model#/168"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="639:27-639:40" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/169"/> </arguments> </body> </feature> <context_ location="638:8-638:24"> <context_ xsi:type="ocl:OclModelElement" location="638:16-638:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/167"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="642:1-643:41"> + <commentsBefore>-- Test if the Node is a DataType</commentsBefore> + <commentsAfter>-- Test if the Node is a Package</commentsAfter> <definition location="642:8-643:40"> <feature xsi:type="ocl:Operation" location="642:31-643:40" name="isDataType"> <returnType xsi:type="ocl:BooleanType" location="642:46-642:53"/> <body xsi:type="ocl:OperationCallExp" location="643:2-643:40" operationName="oclIsKindOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="643:2-643:14" name="element"> <source xsi:type="ocl:VariableExp" location="643:2-643:6"> - <referredVariable href="temp#/39"/> + <referredVariable href="new-model#/171"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="643:27-643:39" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/172"/> </arguments> </body> </feature> <context_ location="642:8-642:24"> <context_ xsi:type="ocl:OclModelElement" location="642:16-642:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/170"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="646:1-647:40"> + <commentsBefore>-- Test if the Node is a Package</commentsBefore> + <commentsAfter>-- Test if the Node is an instance Specification</commentsAfter> <definition location="646:8-647:39"> <feature xsi:type="ocl:Operation" location="646:31-647:39" name="isTypePackage"> <returnType xsi:type="ocl:BooleanType" location="646:49-646:56"/> <body xsi:type="ocl:OperationCallExp" location="647:2-647:39" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="647:2-647:14" name="element"> <source xsi:type="ocl:VariableExp" location="647:2-647:6"> - <referredVariable href="temp#/40"/> + <referredVariable href="new-model#/174"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="647:27-647:38" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/175"/> </arguments> </body> </feature> <context_ location="646:8-646:24"> <context_ xsi:type="ocl:OclModelElement" location="646:16-646:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/173"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="650:1-654:8"> + <commentsBefore>-- Test if the Node is an instance Specification</commentsBefore> + <commentsAfter>-- Test on the kind of 'basic'association for class diagram </commentsAfter> <definition location="650:8-654:7"> <feature xsi:type="ocl:Operation" location="650:31-654:7" name="isTypeInstanceSpecification"> <returnType xsi:type="ocl:BooleanType" location="650:63-650:70"/> @@ -2482,7 +2570,7 @@ <thenExpression xsi:type="ocl:OperatorCallExp" location="652:8-652:39" operationName="="> <source xsi:type="ocl:OperationCallExp" location="652:8-652:29" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="652:8-652:12"> - <referredVariable href="temp#/42"/> + <referredVariable href="new-model#/179"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="652:32-652:39" stringSymbol="Class"/> @@ -2490,11 +2578,11 @@ <condition xsi:type="ocl:OperationCallExp" location="651:5-651:56" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="651:5-651:17" name="element"> <source xsi:type="ocl:VariableExp" location="651:5-651:9"> - <referredVariable href="temp#/41"/> + <referredVariable href="new-model#/177"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="651:30-651:55" name="InstanceSpecification"> - <model href="temp#/1"/> + <model href="new-model#/178"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="653:8-653:13"/> @@ -2502,12 +2590,14 @@ </feature> <context_ location="650:8-650:24"> <context_ xsi:type="ocl:OclModelElement" location="650:16-650:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/176"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="657:1-664:8"> + <commentsBefore>-- Test on the kind of 'basic'association for class diagram </commentsBefore> + <commentsAfter>-- Test on the kind of 'extended' association for a class diagram</commentsAfter> <definition location="657:8-664:7"> <feature xsi:type="ocl:Operation" location="657:31-664:7" name="isBasicClassDiagramAssociation"> <returnType xsi:type="ocl:BooleanType" location="657:66-657:73"/> @@ -2518,7 +2608,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="660:10-660:32" name="memberEnd"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="660:10-660:22" name="element"> <source xsi:type="ocl:VariableExp" location="660:10-660:14"> - <referredVariable href="temp#/46"/> + <referredVariable href="new-model#/185"/> </source> </source> </source> @@ -2528,11 +2618,11 @@ <condition xsi:type="ocl:OperationCallExp" location="659:11-659:52" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="659:11-659:23" name="element"> <source xsi:type="ocl:VariableExp" location="659:11-659:15"> - <referredVariable href="temp#/45"/> + <referredVariable href="new-model#/183"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="659:36-659:51" name="Association"> - <model href="temp#/1"/> + <model href="new-model#/184"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="661:10-661:15"/> @@ -2541,7 +2631,7 @@ <source xsi:type="ocl:OperatorCallExp" location="658:5-658:17" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="658:5-658:14" name="type"> <source xsi:type="ocl:VariableExp" location="658:5-658:9"> - <referredVariable href="temp#/43"/> + <referredVariable href="new-model#/181"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="658:15-658:17" stringSymbol=""/> @@ -2549,7 +2639,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="658:22-658:53" operationName="="> <source xsi:type="ocl:OperationCallExp" location="658:22-658:43" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="658:22-658:26"> - <referredVariable href="temp#/44"/> + <referredVariable href="new-model#/182"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="658:46-658:53" stringSymbol="Class"/> @@ -2560,36 +2650,42 @@ </feature> <context_ location="657:8-657:24"> <context_ xsi:type="ocl:OclModelElement" location="657:16-657:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/180"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="667:1-678:8"> + <commentsBefore>-- Test on the kind of 'extended' association for a class diagram</commentsBefore> + <commentsAfter>-- Indicates whether the class or the interface has no operation</commentsAfter> <definition location="667:8-678:7"> <feature xsi:type="ocl:Operation" location="667:31-678:7" name="isComplexClassDiagramAssociation"> <returnType xsi:type="ocl:BooleanType" location="667:68-667:75"/> <body xsi:type="ocl:IfExp" location="668:2-678:7"> <thenExpression xsi:type="ocl:IfExp" location="672:6-675:15"> + <commentsBefore>--if self.element.oclIsKindOf(Emx!Implementation) </commentsBefore> + <commentsBefore>--then true</commentsBefore> + <commentsBefore>--else </commentsBefore> + <commentsAfter>--endif</commentsAfter> <thenExpression xsi:type="ocl:BooleanExp" location="673:13-673:17" booleanSymbol="true"/> <condition xsi:type="ocl:OperationCallExp" location="672:9-672:53" operationName="oclIsKindOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="672:9-672:21" name="element"> <source xsi:type="ocl:VariableExp" location="672:9-672:13"> - <referredVariable href="temp#/49"/> + <referredVariable href="new-model#/189"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="672:34-672:52" name="Generalization"> - <model href="temp#/1"/> + <model href="new-model#/190"/> </arguments> </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="674:15-674:55" operationName="oclIsKindOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="674:15-674:27" name="element"> <source xsi:type="ocl:VariableExp" location="674:15-674:19"> - <referredVariable href="temp#/50"/> + <referredVariable href="new-model#/191"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="674:40-674:54" name="Dependency"> - <model href="temp#/1"/> + <model href="new-model#/192"/> </arguments> </elseExpression> </thenExpression> @@ -2597,7 +2693,7 @@ <source xsi:type="ocl:OperatorCallExp" location="668:5-668:17" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="668:5-668:14" name="type"> <source xsi:type="ocl:VariableExp" location="668:5-668:9"> - <referredVariable href="temp#/47"/> + <referredVariable href="new-model#/187"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="668:15-668:17" stringSymbol=""/> @@ -2605,7 +2701,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="668:22-668:53" operationName="="> <source xsi:type="ocl:OperationCallExp" location="668:22-668:43" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="668:22-668:26"> - <referredVariable href="temp#/48"/> + <referredVariable href="new-model#/188"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="668:46-668:53" stringSymbol="Class"/> @@ -2616,12 +2712,14 @@ </feature> <context_ location="667:8-667:24"> <context_ xsi:type="ocl:OclModelElement" location="667:16-667:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/186"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="681:1-685:8"> + <commentsBefore>-- Indicates whether the class or the interface has no operation</commentsBefore> + <commentsAfter>-- Indicates whether the class or the interface has no attribute</commentsAfter> <definition location="681:8-685:7"> <feature xsi:type="ocl:Operation" location="681:37-685:7" name="hasNoOperation"> <returnType xsi:type="ocl:BooleanType" location="681:55-681:62"/> @@ -2630,14 +2728,14 @@ <condition xsi:type="ocl:OperationCallExp" location="682:5-682:41" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="682:5-682:24" name="ownedOperation"> <source xsi:type="ocl:VariableExp" location="682:5-682:9"> - <referredVariable href="temp#/51"/> + <referredVariable href="new-model#/194"/> </source> </source> </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="684:8-684:37" operationName="isEmpty"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="684:8-684:27" name="ownedOperation"> <source xsi:type="ocl:VariableExp" location="684:8-684:12"> - <referredVariable href="temp#/52"/> + <referredVariable href="new-model#/195"/> </source> </source> </elseExpression> @@ -2645,12 +2743,14 @@ </feature> <context_ location="681:8-681:30"> <context_ xsi:type="ocl:OclModelElement" location="681:16-681:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/193"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="688:1-695:8"> + <commentsBefore>-- Indicates whether the class or the interface has no attribute</commentsBefore> + <commentsAfter>-- Indicates whether the class or the interface has features or not</commentsAfter> <definition location="688:8-695:7"> <feature xsi:type="ocl:Operation" location="688:37-695:7" name="hasNoAttribute"> <returnType xsi:type="ocl:BooleanType" location="688:55-688:62"/> @@ -2659,7 +2759,7 @@ <condition xsi:type="ocl:OperationCallExp" location="689:5-689:41" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="689:5-689:24" name="ownedAttribute"> <source xsi:type="ocl:VariableExp" location="689:5-689:9"> - <referredVariable href="temp#/53"/> + <referredVariable href="new-model#/197"/> </source> </source> </condition> @@ -2668,7 +2768,7 @@ <condition xsi:type="ocl:OperationCallExp" location="691:11-691:40" operationName="isEmpty"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="691:11-691:30" name="ownedAttribute"> <source xsi:type="ocl:VariableExp" location="691:11-691:15"> - <referredVariable href="temp#/54"/> + <referredVariable href="new-model#/198"/> </source> </source> </condition> @@ -2676,7 +2776,7 @@ <source xsi:type="ocl:IteratorExp" location="693:10-693:67" name="reject"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="693:10-693:29" name="ownedAttribute"> <source xsi:type="ocl:VariableExp" location="693:10-693:14"> - <referredVariable href="temp#/55"/> + <referredVariable href="new-model#/199"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="693:42-693:66" operationName="not"> @@ -2692,31 +2792,32 @@ </feature> <context_ location="688:8-688:30"> <context_ xsi:type="ocl:OclModelElement" location="688:16-688:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/196"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="698:1-699:50"> + <commentsBefore>-- Indicates whether the class or the interface has features or not</commentsBefore> <definition location="698:8-699:49"> <feature xsi:type="ocl:Operation" location="698:37-699:49" name="hasNoFeature"> <returnType xsi:type="ocl:BooleanType" location="698:53-698:60"/> <body xsi:type="ocl:OperatorCallExp" location="699:2-699:49" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="699:2-699:23" operationName="hasNoAttribute"> <source xsi:type="ocl:VariableExp" location="699:2-699:6"> - <referredVariable href="temp#/56"/> + <referredVariable href="new-model#/201"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="699:28-699:49" operationName="hasNoOperation"> <source xsi:type="ocl:VariableExp" location="699:28-699:32"> - <referredVariable href="temp#/57"/> + <referredVariable href="new-model#/202"/> </source> </arguments> </body> </feature> <context_ location="698:8-698:30"> <context_ xsi:type="ocl:OclModelElement" location="698:16-698:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/200"/> </context_> </context_> </definition> @@ -2730,18 +2831,18 @@ <condition xsi:type="ocl:OperatorCallExp" location="702:6-702:71" operationName="or"> <source xsi:type="ocl:OperationCallExp" location="702:6-702:37" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="702:6-702:10"> - <referredVariable href="temp#/58"/> + <referredVariable href="new-model#/204"/> </source> <arguments xsi:type="ocl:OclModelElement" location="702:23-702:36" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/205"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="702:41-702:71" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="702:41-702:45"> - <referredVariable href="temp#/59"/> + <referredVariable href="new-model#/206"/> </source> <arguments xsi:type="ocl:OclModelElement" location="702:58-702:70" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/207"/> </arguments> </arguments> </condition> @@ -2750,7 +2851,7 @@ </feature> <context_ location="701:8-701:30"> <context_ xsi:type="ocl:OclModelElement" location="701:16-701:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/203"/> </context_> </context_> </definition> @@ -2764,18 +2865,18 @@ <condition xsi:type="ocl:OperatorCallExp" location="708:6-708:71" operationName="or"> <source xsi:type="ocl:OperationCallExp" location="708:6-708:37" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="708:6-708:10"> - <referredVariable href="temp#/60"/> + <referredVariable href="new-model#/209"/> </source> <arguments xsi:type="ocl:OclModelElement" location="708:23-708:36" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/210"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="708:41-708:71" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="708:41-708:45"> - <referredVariable href="temp#/61"/> + <referredVariable href="new-model#/211"/> </source> <arguments xsi:type="ocl:OclModelElement" location="708:58-708:70" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/212"/> </arguments> </arguments> </condition> @@ -2784,7 +2885,7 @@ </feature> <context_ location="707:8-707:30"> <context_ xsi:type="ocl:OclModelElement" location="707:16-707:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/208"/> </context_> </context_> </definition> @@ -2797,10 +2898,10 @@ <thenExpression xsi:type="ocl:BooleanExp" location="715:7-715:11" booleanSymbol="true"/> <condition xsi:type="ocl:OperationCallExp" location="714:5-714:36" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="714:5-714:9"> - <referredVariable href="temp#/62"/> + <referredVariable href="new-model#/214"/> </source> <arguments xsi:type="ocl:OclModelElement" location="714:22-714:35" name="Operation"> - <model href="temp#/1"/> + <model href="new-model#/215"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="717:3-724:8"> @@ -2809,14 +2910,14 @@ <condition xsi:type="ocl:OperationCallExp" location="719:7-719:40" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="719:7-719:23" name="association"> <source xsi:type="ocl:VariableExp" location="719:7-719:11"> - <referredVariable href="temp#/64"/> + <referredVariable href="new-model#/218"/> </source> </source> </condition> <elseExpression xsi:type="ocl:OperatorCallExp" location="721:10-721:31" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="721:10-721:26" name="association"> <source xsi:type="ocl:VariableExp" location="721:10-721:14"> - <referredVariable href="temp#/65"/> + <referredVariable href="new-model#/219"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="721:29-721:31" stringSymbol=""/> @@ -2824,10 +2925,10 @@ </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="717:6-717:36" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="717:6-717:10"> - <referredVariable href="temp#/63"/> + <referredVariable href="new-model#/216"/> </source> <arguments xsi:type="ocl:OclModelElement" location="717:23-717:35" name="Property"> - <model href="temp#/1"/> + <model href="new-model#/217"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="723:8-723:13"/> @@ -2836,17 +2937,18 @@ </feature> <context_ location="713:8-713:27"> <context_ xsi:type="ocl:OclModelElement" location="713:16-713:27" name="Feature"> - <model href="temp#/1"/> + <model href="new-model#/213"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="727:1-731:8"> + <commentsAfter>-- Returns a reference to the parent element</commentsAfter> <definition location="727:8-731:7"> <feature xsi:type="ocl:Operation" location="727:34-731:7" name="belongsToDrawableClassifier"> <parameters location="727:62-727:83" varName="parent" variableExp="//@elements.42/@definition/@feature/@body/@condition/@source/@source //@elements.42/@definition/@feature/@body/@thenExpression/@source/@body/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="727:69-727:83" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/221"/> </type> </parameters> <returnType xsi:type="ocl:BooleanType" location="727:87-727:94"/> @@ -2855,7 +2957,7 @@ <source xsi:type="ocl:IteratorExp" location="729:8-729:65" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="729:8-729:27" name="allNodes"> <source xsi:type="ocl:VariableExp" location="729:8-729:18"> - <referredVariable href="temp#/66"/> + <referredVariable href="new-model#/222"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="729:43-729:64" operationName="="> @@ -2877,16 +2979,21 @@ </feature> <context_ location="727:8-727:27"> <context_ xsi:type="ocl:OclModelElement" location="727:16-727:27" name="Feature"> - <model href="temp#/1"/> + <model href="new-model#/220"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="734:1-745:8"> + <commentsBefore>-- Returns a reference to the parent element</commentsBefore> + <commentsAfter>-- ***** USECASE DIAGRAM SECTION *****</commentsAfter> + <commentsAfter>-- This section covers the transformations for : Actor, Usecase and associations like implement, extend, include, generalization...</commentsAfter> + <commentsAfter>-- For the moment, the bendpoints are not handled.</commentsAfter> + <commentsAfter>-- Process for type Actor or UseCase</commentsAfter> <definition location="734:8-745:7"> <feature xsi:type="ocl:Operation" location="734:34-745:7" name="getParent"> <returnType xsi:type="ocl:OclModelElement" location="734:48-734:62" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/224"/> </returnType> <body xsi:type="ocl:IfExp" location="735:2-745:7"> <thenExpression xsi:type="ocl:IfExp" location="736:8-739:9"> @@ -2895,7 +3002,7 @@ <source xsi:type="ocl:IteratorExp" location="737:10-737:92" name="select"> <source xsi:type="ocl:OperationCallExp" location="737:10-737:38" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="737:10-737:23" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/228"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="737:55-737:91" operationName="includes"> @@ -2903,7 +3010,7 @@ <source xsi:type="ocl:VariableExp" location="737:55-737:60" referredVariable="//@elements.43/@definition/@feature/@body/@thenExpression/@thenExpression/@source/@source/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="737:86-737:90"> - <referredVariable href="temp#/69"/> + <referredVariable href="new-model#/229"/> </arguments> </body> <iterators location="737:47-737:52" varName="inter" variableExp="//@elements.43/@definition/@feature/@body/@thenExpression/@thenExpression/@source/@source/@body/@source/@source"/> @@ -2913,22 +3020,22 @@ <condition xsi:type="ocl:OperationCallExp" location="736:11-736:38" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="736:11-736:21" name="class"> <source xsi:type="ocl:VariableExp" location="736:11-736:15"> - <referredVariable href="temp#/68"/> + <referredVariable href="new-model#/227"/> </source> </source> </condition> <elseExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="738:10-738:20" name="class"> <source xsi:type="ocl:VariableExp" location="738:10-738:14"> - <referredVariable href="temp#/70"/> + <referredVariable href="new-model#/230"/> </source> </elseExpression> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="735:5-735:36" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="735:5-735:9"> - <referredVariable href="temp#/67"/> + <referredVariable href="new-model#/225"/> </source> <arguments xsi:type="ocl:OclModelElement" location="735:22-735:35" name="Operation"> - <model href="temp#/1"/> + <model href="new-model#/226"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="740:8-744:11"> @@ -2938,7 +3045,7 @@ <source xsi:type="ocl:IteratorExp" location="741:10-741:88" name="select"> <source xsi:type="ocl:OperationCallExp" location="741:10-741:34" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="741:10-741:19" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/233"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="741:51-741:87" operationName="includes"> @@ -2946,7 +3053,7 @@ <source xsi:type="ocl:VariableExp" location="741:51-741:56" referredVariable="//@elements.43/@definition/@feature/@body/@elseExpression/@thenExpression/@source/@source/@source/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="741:82-741:86"> - <referredVariable href="temp#/72"/> + <referredVariable href="new-model#/234"/> </arguments> </body> <iterators location="741:43-741:48" varName="inter" variableExp="//@elements.43/@definition/@feature/@body/@elseExpression/@thenExpression/@source/@source/@source/@body/@source/@source"/> @@ -2954,7 +3061,7 @@ <arguments xsi:type="ocl:IteratorExp" location="742:8-742:90" name="select"> <source xsi:type="ocl:OperationCallExp" location="742:8-742:36" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="742:8-742:21" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/235"/> </source> </source> <body xsi:type="ocl:CollectionOperationCallExp" location="742:53-742:89" operationName="includes"> @@ -2962,7 +3069,7 @@ <source xsi:type="ocl:VariableExp" location="742:53-742:58" referredVariable="//@elements.43/@definition/@feature/@body/@elseExpression/@thenExpression/@source/@source/@arguments.0/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="742:84-742:88"> - <referredVariable href="temp#/73"/> + <referredVariable href="new-model#/236"/> </arguments> </body> <iterators location="742:45-742:50" varName="inter" variableExp="//@elements.43/@definition/@feature/@body/@elseExpression/@thenExpression/@source/@source/@arguments.0/@body/@source/@source"/> @@ -2972,10 +3079,10 @@ </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="740:11-740:41" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="740:11-740:15"> - <referredVariable href="temp#/71"/> + <referredVariable href="new-model#/231"/> </source> <arguments xsi:type="ocl:OclModelElement" location="740:28-740:40" name="Property"> - <model href="temp#/1"/> + <model href="new-model#/232"/> </arguments> </condition> <elseExpression xsi:type="ocl:CollectionOperationCallExp" location="743:10-743:29" operationName="first"> @@ -2986,16 +3093,21 @@ </feature> <context_ location="734:8-734:27"> <context_ xsi:type="ocl:OclModelElement" location="734:16-734:27" name="Feature"> - <model href="temp#/1"/> + <model href="new-model#/223"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="752:1-774:2" name="umlUsecaseElement"> + <commentsBefore>-- ***** USECASE DIAGRAM SECTION *****</commentsBefore> + <commentsBefore>-- This section covers the transformations for : Actor, Usecase and associations like implement, extend, include, generalization...</commentsBefore> + <commentsBefore>-- For the moment, the bendpoints are not handled.</commentsBefore> + <commentsBefore>-- Process for type Actor or UseCase</commentsBefore> + <commentsAfter>-- Processing of 'basic' usecase Association</commentsAfter> <outPattern location="755:2-773:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="756:3-761:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="756:8-756:20" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/238"/> </type> <bindings location="757:5-757:130" propertyName="position"> <value xsi:type="ocl:OperatorCallExp" location="757:17-757:130" operationName="+"> @@ -3040,12 +3152,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="763:3-764:4" varName="graphConn" variableExp="//@elements.44/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="763:15-763:32" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/239"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="766:3-769:4" varName="sem" variableExp="//@elements.44/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="766:9-766:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/240"/> </type> <bindings location="767:4-767:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="767:15-767:18" referredVariable="//@elements.44/@outPattern/@elements.3"/> @@ -3056,7 +3168,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="771:3-773:4" varName="ref" variableExp="//@elements.44/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="771:9-771:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/241"/> </type> <bindings location="772:4-772:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="772:12-772:33" name="idelement"> @@ -3070,7 +3182,7 @@ <inPattern location="753:2-754:42"> <elements xsi:type="atl:SimpleInPatternElement" location="754:3-754:17" varName="emx" variableExp="//@elements.44/@inPattern/@filter/@source //@elements.44/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source/@source //@elements.44/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.44/@outPattern/@elements.3/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="754:9-754:17" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/237"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="754:19-754:41" operationName="isUseCaseElement"> @@ -3079,19 +3191,23 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="777:1-795:2" name="umlBasicUsecaseAssociation"> + <commentsBefore>-- Processing of 'basic' usecase Association</commentsBefore> + <commentsAfter>-- Processing of 'include' associations for usecase</commentsAfter> <outPattern location="780:2-794:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="781:3-785:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="781:8-781:20" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/243"/> </type> <bindings location="782:4-782:24" propertyName="semanticModel"> <value xsi:type="ocl:VariableExp" location="782:21-782:24" referredVariable="//@elements.45/@outPattern/@elements.1"/> </bindings> <bindings location="783:4-783:119" propertyName="anchor"> + <commentsAfter>--waypoints <- emx.bendpoints.points.getWaypoints()</commentsAfter> <value xsi:type="ocl:SequenceExp" location="783:14-783:119"> + <commentsAfter>--waypoints <- emx.bendpoints.points.getWaypoints()</commentsAfter> <elements xsi:type="ocl:OperationCallExp" location="783:24-783:70" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="783:24-783:34"> - <referredVariable href="temp#/74"/> + <referredVariable href="new-model#/244"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="783:47-783:57" name="source"> <source xsi:type="ocl:VariableExp" location="783:47-783:50" referredVariable="//@elements.45/@inPattern/@elements.0"/> @@ -3100,7 +3216,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="783:72-783:118" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="783:72-783:82"> - <referredVariable href="temp#/75"/> + <referredVariable href="new-model#/245"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="783:95-783:105" name="target"> <source xsi:type="ocl:VariableExp" location="783:95-783:98" referredVariable="//@elements.45/@inPattern/@elements.0"/> @@ -3112,7 +3228,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="787:3-790:4" varName="sem" variableExp="//@elements.45/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="787:9-787:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/246"/> </type> <bindings location="788:4-788:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="788:15-788:18" referredVariable="//@elements.45/@outPattern/@elements.2"/> @@ -3123,7 +3239,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="792:3-794:4" varName="ref" variableExp="//@elements.45/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="792:9-792:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/247"/> </type> <bindings location="793:4-793:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="793:12-793:33" name="idelement"> @@ -3137,7 +3253,7 @@ <inPattern location="778:2-779:84"> <elements xsi:type="atl:SimpleInPatternElement" location="779:3-779:17" varName="emx" variableExp="//@elements.45/@inPattern/@filter/@source/@source //@elements.45/@inPattern/@filter/@arguments.0/@source //@elements.45/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@arguments.0/@source //@elements.45/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@arguments.0/@source //@elements.45/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="779:9-779:17" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/242"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="779:19-779:83" operationName="and"> @@ -3151,10 +3267,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="798:1-821:2" name="umlIncludeUsecaseAssociation"> + <commentsBefore>-- Processing of 'include' associations for usecase</commentsBefore> + <commentsAfter>-- Processing of 'extend' associations for usecase</commentsAfter> <outPattern location="801:2-820:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="802:3-807:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="802:8-802:20" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/249"/> </type> <bindings location="803:4-803:24" propertyName="semanticModel"> <value xsi:type="ocl:VariableExp" location="803:21-803:24" referredVariable="//@elements.46/@outPattern/@elements.1"/> @@ -3163,7 +3281,7 @@ <value xsi:type="ocl:SequenceExp" location="804:14-804:119"> <elements xsi:type="ocl:OperationCallExp" location="804:24-804:70" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="804:24-804:34"> - <referredVariable href="temp#/76"/> + <referredVariable href="new-model#/250"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="804:47-804:57" name="source"> <source xsi:type="ocl:VariableExp" location="804:47-804:50" referredVariable="//@elements.46/@inPattern/@elements.0"/> @@ -3172,7 +3290,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="804:72-804:118" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="804:72-804:82"> - <referredVariable href="temp#/77"/> + <referredVariable href="new-model#/251"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="804:95-804:105" name="target"> <source xsi:type="ocl:VariableExp" location="804:95-804:98" referredVariable="//@elements.46/@inPattern/@elements.0"/> @@ -3182,14 +3300,16 @@ </value> </bindings> <bindings location="805:4-805:32" propertyName="contained"> + <commentsAfter>--waypoints <- emx.bendpoints.points.getWaypoints()</commentsAfter> <value xsi:type="ocl:SequenceExp" location="805:17-805:32"> + <commentsAfter>--waypoints <- emx.bendpoints.points.getWaypoints()</commentsAfter> <elements xsi:type="ocl:VariableExp" location="805:27-805:31" referredVariable="//@elements.46/@outPattern/@elements.3"/> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="809:3-812:4" varName="sem" variableExp="//@elements.46/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="809:9-809:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/252"/> </type> <bindings location="810:4-810:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="810:15-810:18" referredVariable="//@elements.46/@outPattern/@elements.2"/> @@ -3200,7 +3320,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="814:3-816:4" varName="ref" variableExp="//@elements.46/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="814:9-814:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/253"/> </type> <bindings location="815:4-815:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="815:12-815:33" name="idelement"> @@ -3212,7 +3332,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="818:3-820:4" varName="edge" variableExp="//@elements.46/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="818:10-818:29" name="EdgeObjectOffset"> - <model href="temp#/0"/> + <model href="new-model#/254"/> </type> <bindings location="819:4-819:26" propertyName="id"> <value xsi:type="ocl:StringExp" location="819:10-819:26" stringSymbol="nameEdgeObject"/> @@ -3222,7 +3342,7 @@ <inPattern location="799:2-800:126"> <elements xsi:type="atl:SimpleInPatternElement" location="800:3-800:17" varName="emx" variableExp="//@elements.46/@inPattern/@filter/@source/@source/@source //@elements.46/@inPattern/@filter/@source/@arguments.0/@source/@source/@source //@elements.46/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.46/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@arguments.0/@source //@elements.46/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@arguments.0/@source //@elements.46/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="800:9-800:17" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/248"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="800:19-800:125" operationName="and"> @@ -3249,10 +3369,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="824:1-851:2" name="umlExtendUsecaseAssociation"> + <commentsBefore>-- Processing of 'extend' associations for usecase</commentsBefore> + <commentsAfter>-- Tests if the element belongs to a UseCase diagam</commentsAfter> <outPattern location="827:2-850:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="828:3-833:4" varName="di"> <type xsi:type="ocl:OclModelElement" location="828:8-828:20" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/256"/> </type> <bindings location="829:4-829:24" propertyName="semanticModel"> <value xsi:type="ocl:VariableExp" location="829:21-829:24" referredVariable="//@elements.47/@outPattern/@elements.1"/> @@ -3261,7 +3383,7 @@ <value xsi:type="ocl:SequenceExp" location="830:14-830:119"> <elements xsi:type="ocl:OperationCallExp" location="830:24-830:70" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="830:24-830:34"> - <referredVariable href="temp#/78"/> + <referredVariable href="new-model#/257"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="830:47-830:57" name="source"> <source xsi:type="ocl:VariableExp" location="830:47-830:50" referredVariable="//@elements.47/@inPattern/@elements.0"/> @@ -3270,7 +3392,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="830:72-830:118" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="830:72-830:82"> - <referredVariable href="temp#/79"/> + <referredVariable href="new-model#/258"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="830:95-830:105" name="target"> <source xsi:type="ocl:VariableExp" location="830:95-830:98" referredVariable="//@elements.47/@inPattern/@elements.0"/> @@ -3280,7 +3402,9 @@ </value> </bindings> <bindings location="831:4-831:40" propertyName="contained"> + <commentsAfter>--waypoints <- emx.bendpoints.points.getWaypoints()</commentsAfter> <value xsi:type="ocl:SequenceExp" location="831:17-831:40"> + <commentsAfter>--waypoints <- emx.bendpoints.points.getWaypoints()</commentsAfter> <elements xsi:type="ocl:VariableExp" location="831:27-831:32" referredVariable="//@elements.47/@outPattern/@elements.3"/> <elements xsi:type="ocl:VariableExp" location="831:34-831:39" referredVariable="//@elements.47/@outPattern/@elements.4"/> </value> @@ -3288,7 +3412,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="835:3-838:4" varName="sem" variableExp="//@elements.47/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="835:9-835:34" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/259"/> </type> <bindings location="836:4-836:18" propertyName="element"> <value xsi:type="ocl:VariableExp" location="836:15-836:18" referredVariable="//@elements.47/@outPattern/@elements.2"/> @@ -3299,7 +3423,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="840:3-842:4" varName="ref" variableExp="//@elements.47/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="840:9-840:19" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/260"/> </type> <bindings location="841:4-841:33" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="841:12-841:33" name="idelement"> @@ -3311,7 +3435,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="844:3-846:4" varName="edge1" variableExp="//@elements.47/@outPattern/@elements.0/@bindings.2/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="844:11-844:30" name="EdgeObjectOffset"> - <model href="temp#/0"/> + <model href="new-model#/261"/> </type> <bindings location="845:4-845:26" propertyName="id"> <value xsi:type="ocl:StringExp" location="845:10-845:26" stringSymbol="nameEdgeObject"/> @@ -3319,7 +3443,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="848:3-850:4" varName="edge2" variableExp="//@elements.47/@outPattern/@elements.0/@bindings.2/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="848:11-848:26" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/262"/> </type> <bindings location="849:4-849:31" propertyName="id"> <value xsi:type="ocl:StringExp" location="849:10-849:31" stringSymbol="extensionEdgeObject"/> @@ -3329,7 +3453,7 @@ <inPattern location="825:2-826:124"> <elements xsi:type="atl:SimpleInPatternElement" location="826:3-826:17" varName="emx" variableExp="//@elements.47/@inPattern/@filter/@source/@source/@source //@elements.47/@inPattern/@filter/@source/@arguments.0/@source/@source/@source //@elements.47/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.47/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@arguments.0/@source //@elements.47/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@arguments.0/@source //@elements.47/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="826:9-826:17" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/255"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="826:19-826:123" operationName="and"> @@ -3356,6 +3480,8 @@ </inPattern> </elements> <elements xsi:type="atl:Helper" location="854:1-858:8"> + <commentsBefore>-- Tests if the element belongs to a UseCase diagam</commentsBefore> + <commentsAfter>-- Tests if the current element is a UseCase element</commentsAfter> <definition location="854:8-858:7"> <feature xsi:type="ocl:Operation" location="854:31-858:7" name="isUseCaseElement"> <returnType xsi:type="ocl:BooleanType" location="854:52-854:59"/> @@ -3363,7 +3489,7 @@ <thenExpression xsi:type="ocl:OperatorCallExp" location="856:8-856:41" operationName="="> <source xsi:type="ocl:OperationCallExp" location="856:8-856:29" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="856:8-856:12"> - <referredVariable href="temp#/82"/> + <referredVariable href="new-model#/266"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="856:32-856:41" stringSymbol="Usecase"/> @@ -3371,12 +3497,12 @@ <condition xsi:type="ocl:OperatorCallExp" location="855:5-855:39" operationName="or"> <source xsi:type="ocl:OperationCallExp" location="855:5-855:19" operationName="isActor"> <source xsi:type="ocl:VariableExp" location="855:5-855:9"> - <referredVariable href="temp#/80"/> + <referredVariable href="new-model#/264"/> </source> </source> <arguments xsi:type="ocl:OperationCallExp" location="855:23-855:39" operationName="isUseCase"> <source xsi:type="ocl:VariableExp" location="855:23-855:27"> - <referredVariable href="temp#/81"/> + <referredVariable href="new-model#/265"/> </source> </arguments> </condition> @@ -3385,56 +3511,62 @@ </feature> <context_ location="854:8-854:24"> <context_ xsi:type="ocl:OclModelElement" location="854:16-854:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/263"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="861:1-862:40"> + <commentsBefore>-- Tests if the current element is a UseCase element</commentsBefore> + <commentsAfter>-- Tests if the current element is an Actor element</commentsAfter> <definition location="861:8-862:39"> <feature xsi:type="ocl:Operation" location="861:31-862:39" name="isUseCase"> <returnType xsi:type="ocl:BooleanType" location="861:45-861:52"/> <body xsi:type="ocl:OperationCallExp" location="862:2-862:39" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="862:2-862:14" name="element"> <source xsi:type="ocl:VariableExp" location="862:2-862:6"> - <referredVariable href="temp#/83"/> + <referredVariable href="new-model#/268"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="862:27-862:38" name="UseCase"> - <model href="temp#/1"/> + <model href="new-model#/269"/> </arguments> </body> </feature> <context_ location="861:8-861:24"> <context_ xsi:type="ocl:OclModelElement" location="861:16-861:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/267"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="865:1-866:38"> + <commentsBefore>-- Tests if the current element is an Actor element</commentsBefore> + <commentsAfter>-- Test the standard association for usecase</commentsAfter> <definition location="865:8-866:37"> <feature xsi:type="ocl:Operation" location="865:31-866:37" name="isActor"> <returnType xsi:type="ocl:BooleanType" location="865:43-865:50"/> <body xsi:type="ocl:OperationCallExp" location="866:2-866:37" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="866:2-866:14" name="element"> <source xsi:type="ocl:VariableExp" location="866:2-866:6"> - <referredVariable href="temp#/84"/> + <referredVariable href="new-model#/271"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="866:27-866:36" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/272"/> </arguments> </body> </feature> <context_ location="865:8-865:24"> <context_ xsi:type="ocl:OclModelElement" location="865:16-865:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/270"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="869:1-873:8"> + <commentsBefore>-- Test the standard association for usecase</commentsBefore> + <commentsAfter>-- Test the extend association for a usecase diagram</commentsAfter> <definition location="869:8-873:7"> <feature xsi:type="ocl:Operation" location="869:31-873:7" name="isBasicUsecaseAssociation"> <returnType xsi:type="ocl:BooleanType" location="869:61-869:68"/> @@ -3442,7 +3574,7 @@ <thenExpression xsi:type="ocl:OperatorCallExp" location="871:8-871:41" operationName="="> <source xsi:type="ocl:OperationCallExp" location="871:8-871:29" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="871:8-871:12"> - <referredVariable href="temp#/87"/> + <referredVariable href="new-model#/278"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="871:32-871:41" stringSymbol="Usecase"/> @@ -3451,21 +3583,21 @@ <source xsi:type="ocl:OperationCallExp" location="870:5-870:46" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="870:5-870:17" name="element"> <source xsi:type="ocl:VariableExp" location="870:5-870:9"> - <referredVariable href="temp#/85"/> + <referredVariable href="new-model#/274"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="870:30-870:45" name="Association"> - <model href="temp#/1"/> + <model href="new-model#/275"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="870:50-870:94" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="870:50-870:62" name="element"> <source xsi:type="ocl:VariableExp" location="870:50-870:54"> - <referredVariable href="temp#/86"/> + <referredVariable href="new-model#/276"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="870:75-870:93" name="Generalization"> - <model href="temp#/1"/> + <model href="new-model#/277"/> </arguments> </arguments> </condition> @@ -3474,12 +3606,14 @@ </feature> <context_ location="869:8-869:24"> <context_ xsi:type="ocl:OclModelElement" location="869:16-869:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/273"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="876:1-880:8"> + <commentsBefore>-- Test the extend association for a usecase diagram</commentsBefore> + <commentsAfter>-- Test the include association for a usecase diagram</commentsAfter> <definition location="876:8-880:7"> <feature xsi:type="ocl:Operation" location="876:31-880:7" name="isExtendUsecaseAssociation"> <returnType xsi:type="ocl:BooleanType" location="876:62-876:69"/> @@ -3487,7 +3621,7 @@ <thenExpression xsi:type="ocl:OperatorCallExp" location="878:8-878:41" operationName="="> <source xsi:type="ocl:OperationCallExp" location="878:8-878:29" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="878:8-878:12"> - <referredVariable href="temp#/89"/> + <referredVariable href="new-model#/282"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="878:32-878:41" stringSymbol="Usecase"/> @@ -3495,11 +3629,11 @@ <condition xsi:type="ocl:OperationCallExp" location="877:5-877:41" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="877:5-877:17" name="element"> <source xsi:type="ocl:VariableExp" location="877:5-877:9"> - <referredVariable href="temp#/88"/> + <referredVariable href="new-model#/280"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="877:30-877:40" name="Extend"> - <model href="temp#/1"/> + <model href="new-model#/281"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="879:8-879:13"/> @@ -3507,12 +3641,14 @@ </feature> <context_ location="876:8-876:24"> <context_ xsi:type="ocl:OclModelElement" location="876:16-876:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/279"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="883:1-887:8"> + <commentsBefore>-- Test the include association for a usecase diagram</commentsBefore> + <commentsAfter>-- Test on the source and the target of a special assocaition of a class diagram </commentsAfter> <definition location="883:8-887:7"> <feature xsi:type="ocl:Operation" location="883:31-887:7" name="isIncludeUsecaseAssociation"> <returnType xsi:type="ocl:BooleanType" location="883:63-883:70"/> @@ -3520,7 +3656,7 @@ <thenExpression xsi:type="ocl:OperatorCallExp" location="885:8-885:41" operationName="="> <source xsi:type="ocl:OperationCallExp" location="885:8-885:29" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="885:8-885:12"> - <referredVariable href="temp#/91"/> + <referredVariable href="new-model#/286"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="885:32-885:41" stringSymbol="Usecase"/> @@ -3528,11 +3664,11 @@ <condition xsi:type="ocl:OperationCallExp" location="884:5-884:42" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="884:5-884:17" name="element"> <source xsi:type="ocl:VariableExp" location="884:5-884:9"> - <referredVariable href="temp#/90"/> + <referredVariable href="new-model#/284"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="884:30-884:41" name="Include"> - <model href="temp#/1"/> + <model href="new-model#/285"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="886:8-886:13"/> @@ -3540,12 +3676,22 @@ </feature> <context_ location="883:8-883:24"> <context_ xsi:type="ocl:OclModelElement" location="883:16-883:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/283"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="890:1-901:8"> + <commentsBefore>-- Test on the source and the target of a special assocaition of a class diagram </commentsBefore> + <commentsAfter>--***** HELPERS FOR PROCESSING BENDPOINTS ********************************************************************************************</commentsAfter> + <commentsAfter>-- It is possible to use a linear router by default</commentsAfter> + <commentsAfter>-- For example, the associated code in ATL is :</commentsAfter> + <commentsAfter>--</commentsAfter> + <commentsAfter>--		prop : Di!Property(</commentsAfter> + <commentsAfter>--			key <- 'router',</commentsAfter> + <commentsAfter>--			value <- 'Rectilinear'</commentsAfter> + <commentsAfter>--		),</commentsAfter> + <commentsAfter>-- Converts and divides the string by the ratio</commentsAfter> <definition location="890:8-901:7"> <feature xsi:type="ocl:Operation" location="890:31-901:7" name="isValidSourceAndTarget"> <returnType xsi:type="ocl:BooleanType" location="890:58-890:65"/> @@ -3557,24 +3703,24 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="893:11-893:30" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="893:11-893:22" name="source"> <source xsi:type="ocl:VariableExp" location="893:11-893:15"> - <referredVariable href="temp#/95"/> + <referredVariable href="new-model#/291"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="893:43-893:52" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/292"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="893:57-893:101" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="893:57-893:76" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="893:57-893:68" name="source"> <source xsi:type="ocl:VariableExp" location="893:57-893:61"> - <referredVariable href="temp#/96"/> + <referredVariable href="new-model#/293"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="893:89-893:100" name="UseCase"> - <model href="temp#/1"/> + <model href="new-model#/294"/> </arguments> </arguments> </source> @@ -3583,24 +3729,24 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="894:10-894:29" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="894:10-894:21" name="target"> <source xsi:type="ocl:VariableExp" location="894:10-894:14"> - <referredVariable href="temp#/97"/> + <referredVariable href="new-model#/295"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="894:42-894:51" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/296"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="894:56-894:100" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="894:56-894:75" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="894:56-894:67" name="target"> <source xsi:type="ocl:VariableExp" location="894:56-894:60"> - <referredVariable href="temp#/98"/> + <referredVariable href="new-model#/297"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="894:88-894:99" name="UseCase"> - <model href="temp#/1"/> + <model href="new-model#/298"/> </arguments> </arguments> </arguments> @@ -3608,7 +3754,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="892:11-892:44" operationName="="> <source xsi:type="ocl:OperationCallExp" location="892:11-892:32" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="892:11-892:15"> - <referredVariable href="temp#/94"/> + <referredVariable href="new-model#/290"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="892:35-892:44" stringSymbol="Usecase"/> @@ -3620,12 +3766,12 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="896:16-896:35" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="896:16-896:27" name="source"> <source xsi:type="ocl:VariableExp" location="896:16-896:20"> - <referredVariable href="temp#/100"/> + <referredVariable href="new-model#/300"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="896:48-896:57" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/301"/> </arguments> </source> </source> @@ -3634,12 +3780,12 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="896:67-896:86" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="896:67-896:78" name="target"> <source xsi:type="ocl:VariableExp" location="896:67-896:71"> - <referredVariable href="temp#/101"/> + <referredVariable href="new-model#/302"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="896:99-896:108" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/303"/> </arguments> </source> </arguments> @@ -3647,7 +3793,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="895:13-895:44" operationName="="> <source xsi:type="ocl:OperationCallExp" location="895:13-895:34" operationName="getDiagramType"> <source xsi:type="ocl:VariableExp" location="895:13-895:17"> - <referredVariable href="temp#/99"/> + <referredVariable href="new-model#/299"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="895:37-895:44" stringSymbol="Class"/> @@ -3660,7 +3806,7 @@ <source xsi:type="ocl:OperationCallExp" location="891:9-891:37" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="891:9-891:20" name="source"> <source xsi:type="ocl:VariableExp" location="891:9-891:13"> - <referredVariable href="temp#/92"/> + <referredVariable href="new-model#/288"/> </source> </source> </source> @@ -3669,7 +3815,7 @@ <source xsi:type="ocl:OperationCallExp" location="891:46-891:74" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="891:46-891:57" name="target"> <source xsi:type="ocl:VariableExp" location="891:46-891:50"> - <referredVariable href="temp#/93"/> + <referredVariable href="new-model#/289"/> </source> </source> </source> @@ -3680,12 +3826,22 @@ </feature> <context_ location="890:8-890:24"> <context_ xsi:type="ocl:OclModelElement" location="890:16-890:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/287"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="913:1-914:48"> + <commentsBefore>--***** HELPERS FOR PROCESSING BENDPOINTS ********************************************************************************************</commentsBefore> + <commentsBefore>-- It is possible to use a linear router by default</commentsBefore> + <commentsBefore>-- For example, the associated code in ATL is :</commentsBefore> + <commentsBefore>--</commentsBefore> + <commentsBefore>--		prop : Di!Property(</commentsBefore> + <commentsBefore>--			key <- 'router',</commentsBefore> + <commentsBefore>--			value <- 'Rectilinear'</commentsBefore> + <commentsBefore>--		),</commentsBefore> + <commentsBefore>-- Converts and divides the string by the ratio</commentsBefore> + <commentsAfter>-- Splits the string according to $ character</commentsAfter> <definition location="913:8-914:47"> <feature xsi:type="ocl:Operation" location="913:29-914:47" name="divPoint"> <returnType xsi:type="ocl:StringType" location="913:42-913:48"/> @@ -3694,7 +3850,7 @@ <source xsi:type="ocl:OperatorCallExp" location="914:3-914:27" operationName="*"> <source xsi:type="ocl:OperationCallExp" location="914:3-914:16" operationName="toReal"> <source xsi:type="ocl:VariableExp" location="914:3-914:7"> - <referredVariable href="temp#/102"/> + <referredVariable href="new-model#/304"/> </source> </source> <arguments xsi:type="ocl:RealExp" location="914:19-914:27" realSymbol="0.031496"/> @@ -3708,6 +3864,8 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="917:1-922:8"> + <commentsBefore>-- Splits the string according to $ character</commentsBefore> + <commentsAfter>-- Removes the left square brackets </commentsAfter> <definition location="917:8-922:7"> <feature xsi:type="ocl:Operation" location="917:29-922:7" name="getWaypoints"> <returnType xsi:type="ocl:SequenceType" location="917:46-917:62"> @@ -3722,7 +3880,7 @@ <source xsi:type="ocl:OperationCallExp" location="919:22-919:83" operationName="withoutRightSquareBrackets"> <source xsi:type="ocl:OperationCallExp" location="919:22-919:54" operationName="withoutLeftSquareBrackets"> <source xsi:type="ocl:VariableExp" location="919:22-919:26"> - <referredVariable href="temp#/104"/> + <referredVariable href="new-model#/306"/> </source> </source> </source> @@ -3734,7 +3892,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="918:5-918:26" operationName="<"> <source xsi:type="ocl:OperationCallExp" location="918:5-918:22" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="918:5-918:9"> - <referredVariable href="temp#/103"/> + <referredVariable href="new-model#/305"/> </source> <arguments xsi:type="ocl:StringExp" location="918:18-918:21" stringSymbol="$"/> </source> @@ -3744,12 +3902,12 @@ <source xsi:type="ocl:OperationCallExp" location="920:7-920:70" operationName="getWaypoints"> <source xsi:type="ocl:OperationCallExp" location="920:7-920:55" operationName="substring"> <source xsi:type="ocl:VariableExp" location="920:7-920:11"> - <referredVariable href="temp#/105"/> + <referredVariable href="new-model#/307"/> </source> <arguments xsi:type="ocl:OperatorCallExp" location="920:22-920:41" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="920:22-920:39" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="920:22-920:26"> - <referredVariable href="temp#/106"/> + <referredVariable href="new-model#/308"/> </source> <arguments xsi:type="ocl:StringExp" location="920:35-920:38" stringSymbol="$"/> </source> @@ -3757,7 +3915,7 @@ </arguments> <arguments xsi:type="ocl:OperationCallExp" location="920:43-920:54" operationName="size"> <source xsi:type="ocl:VariableExp" location="920:43-920:47"> - <referredVariable href="temp#/107"/> + <referredVariable href="new-model#/309"/> </source> </arguments> </source> @@ -3771,12 +3929,12 @@ <source xsi:type="ocl:OperationCallExp" location="921:30-921:94" operationName="withoutLeftSquareBrackets"> <source xsi:type="ocl:OperationCallExp" location="921:30-921:66" operationName="substring"> <source xsi:type="ocl:VariableExp" location="921:30-921:34"> - <referredVariable href="temp#/108"/> + <referredVariable href="new-model#/310"/> </source> <arguments xsi:type="ocl:IntegerExp" location="921:45-921:46" integerSymbol="1"/> <arguments xsi:type="ocl:OperationCallExp" location="921:48-921:65" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="921:48-921:52"> - <referredVariable href="temp#/109"/> + <referredVariable href="new-model#/311"/> </source> <arguments xsi:type="ocl:StringExp" location="921:61-921:64" stringSymbol="$"/> </arguments> @@ -3797,17 +3955,19 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="925:1-929:8"> + <commentsBefore>-- Removes the left square brackets </commentsBefore> + <commentsAfter>-- Removes the right square brackets </commentsAfter> <definition location="925:8-929:7"> <feature xsi:type="ocl:Operation" location="925:29-929:7" name="withoutLeftSquareBrackets"> <returnType xsi:type="ocl:StringType" location="925:59-925:65"/> <body xsi:type="ocl:IfExp" location="926:2-929:7"> <thenExpression xsi:type="ocl:VariableExp" location="927:8-927:12"> - <referredVariable href="temp#/111"/> + <referredVariable href="new-model#/313"/> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="926:5-926:26" operationName="<"> <source xsi:type="ocl:OperationCallExp" location="926:5-926:22" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="926:5-926:9"> - <referredVariable href="temp#/110"/> + <referredVariable href="new-model#/312"/> </source> <arguments xsi:type="ocl:StringExp" location="926:18-926:21" stringSymbol="["/> </source> @@ -3816,12 +3976,12 @@ <elseExpression xsi:type="ocl:OperationCallExp" location="928:8-928:84" operationName="withoutLeftSquareBrackets"> <source xsi:type="ocl:OperationCallExp" location="928:8-928:56" operationName="substring"> <source xsi:type="ocl:VariableExp" location="928:8-928:12"> - <referredVariable href="temp#/112"/> + <referredVariable href="new-model#/314"/> </source> <arguments xsi:type="ocl:OperatorCallExp" location="928:23-928:42" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="928:23-928:40" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="928:23-928:27"> - <referredVariable href="temp#/113"/> + <referredVariable href="new-model#/315"/> </source> <arguments xsi:type="ocl:StringExp" location="928:36-928:39" stringSymbol="["/> </source> @@ -3829,7 +3989,7 @@ </arguments> <arguments xsi:type="ocl:OperationCallExp" location="928:44-928:55" operationName="size"> <source xsi:type="ocl:VariableExp" location="928:44-928:48"> - <referredVariable href="temp#/114"/> + <referredVariable href="new-model#/316"/> </source> </arguments> </source> @@ -3842,17 +4002,19 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="932:1-936:8"> + <commentsBefore>-- Removes the right square brackets </commentsBefore> + <commentsAfter>-- Split the string according to comma characters</commentsAfter> <definition location="932:8-936:7"> <feature xsi:type="ocl:Operation" location="932:29-936:7" name="withoutRightSquareBrackets"> <returnType xsi:type="ocl:StringType" location="932:60-932:66"/> <body xsi:type="ocl:IfExp" location="933:2-936:7"> <thenExpression xsi:type="ocl:VariableExp" location="934:8-934:12"> - <referredVariable href="temp#/116"/> + <referredVariable href="new-model#/318"/> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="933:5-933:26" operationName="<"> <source xsi:type="ocl:OperationCallExp" location="933:5-933:22" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="933:5-933:9"> - <referredVariable href="temp#/115"/> + <referredVariable href="new-model#/317"/> </source> <arguments xsi:type="ocl:StringExp" location="933:18-933:21" stringSymbol="]"/> </source> @@ -3861,12 +4023,12 @@ <elseExpression xsi:type="ocl:OperationCallExp" location="935:8-935:73" operationName="withoutRightSquareBrackets"> <source xsi:type="ocl:OperationCallExp" location="935:8-935:44" operationName="substring"> <source xsi:type="ocl:VariableExp" location="935:8-935:12"> - <referredVariable href="temp#/117"/> + <referredVariable href="new-model#/319"/> </source> <arguments xsi:type="ocl:IntegerExp" location="935:23-935:24" integerSymbol="1"/> <arguments xsi:type="ocl:OperationCallExp" location="935:26-935:43" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="935:26-935:30"> - <referredVariable href="temp#/118"/> + <referredVariable href="new-model#/320"/> </source> <arguments xsi:type="ocl:StringExp" location="935:39-935:42" stringSymbol="]"/> </arguments> @@ -3880,19 +4042,21 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="939:1-943:8"> + <commentsBefore>-- Split the string according to comma characters</commentsBefore> + <commentsAfter>----*************************************************************************************************************************************</commentsAfter> <definition location="939:8-943:7"> <feature xsi:type="ocl:Operation" location="939:29-943:7" name="withoutComma"> <returnType xsi:type="ocl:StringType" location="939:46-939:52"/> <body xsi:type="ocl:IfExp" location="940:2-943:7"> <thenExpression xsi:type="ocl:OperationCallExp" location="941:8-941:23" operationName="divPoint"> <source xsi:type="ocl:VariableExp" location="941:8-941:12"> - <referredVariable href="temp#/120"/> + <referredVariable href="new-model#/322"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="940:5-940:26" operationName="<"> <source xsi:type="ocl:OperationCallExp" location="940:5-940:22" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="940:5-940:9"> - <referredVariable href="temp#/119"/> + <referredVariable href="new-model#/321"/> </source> <arguments xsi:type="ocl:StringExp" location="940:18-940:21" stringSymbol=","/> </source> @@ -3903,12 +4067,12 @@ <source xsi:type="ocl:OperationCallExp" location="942:8-942:55" operationName="divPoint"> <source xsi:type="ocl:OperationCallExp" location="942:8-942:44" operationName="substring"> <source xsi:type="ocl:VariableExp" location="942:8-942:12"> - <referredVariable href="temp#/121"/> + <referredVariable href="new-model#/323"/> </source> <arguments xsi:type="ocl:IntegerExp" location="942:23-942:24" integerSymbol="1"/> <arguments xsi:type="ocl:OperationCallExp" location="942:26-942:43" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="942:26-942:30"> - <referredVariable href="temp#/122"/> + <referredVariable href="new-model#/324"/> </source> <arguments xsi:type="ocl:StringExp" location="942:39-942:42" stringSymbol=","/> </arguments> @@ -3919,12 +4083,12 @@ <arguments xsi:type="ocl:OperationCallExp" location="942:65-942:128" operationName="withoutComma"> <source xsi:type="ocl:OperationCallExp" location="942:65-942:113" operationName="substring"> <source xsi:type="ocl:VariableExp" location="942:65-942:69"> - <referredVariable href="temp#/123"/> + <referredVariable href="new-model#/325"/> </source> <arguments xsi:type="ocl:OperatorCallExp" location="942:80-942:99" operationName="+"> <source xsi:type="ocl:OperationCallExp" location="942:80-942:97" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="942:80-942:84"> - <referredVariable href="temp#/124"/> + <referredVariable href="new-model#/326"/> </source> <arguments xsi:type="ocl:StringExp" location="942:93-942:96" stringSymbol=","/> </source> @@ -3932,7 +4096,7 @@ </arguments> <arguments xsi:type="ocl:OperationCallExp" location="942:101-942:112" operationName="size"> <source xsi:type="ocl:VariableExp" location="942:101-942:105"> - <referredVariable href="temp#/125"/> + <referredVariable href="new-model#/327"/> </source> </arguments> </source> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/RSM2TPC/RSM2TPC_V1/RSM2TPC_V1.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/RSM2TPC/RSM2TPC_V1/RSM2TPC_V1.atl.xmi index 6dcc92cd..870f87a4 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/RSM2TPC/RSM2TPC_V1/RSM2TPC_V1.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/RSM2TPC/RSM2TPC_V1/RSM2TPC_V1.atl.xmi @@ -1,28 +1,36 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="2:1-716:16" name="EMX2DI"> + <commentsBefore>--@atlcompiler atl2006</commentsBefore> <inModels location="3:23-3:31" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="3:8-3:16" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="11:1-11:65"> + <commentsBefore>-- This file describes the transformation from a RSM format (file with a EMX extension) to a DI format supported by the Topcased UML2 editor.</commentsBefore> + <commentsBefore>-- The current state of this transformation takes into account the following kind of UML2 diagrams :</commentsBefore> + <commentsBefore>-- 1) Class Diagram</commentsBefore> + <commentsBefore>-- 2) UseCase Diagram</commentsBefore> + <commentsBefore>-- ===== HELPERS OPERATIONS ===== --</commentsBefore> + <commentsAfter>-- ===== HELPER ATTRIBUTES ===== --</commentsAfter> <definition location="11:8-11:64"> <feature xsi:type="ocl:Attribute" location="11:14-11:64" name="allNodes"> <initExpression xsi:type="ocl:OperationCallExp" location="11:41-11:64" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="11:41-11:49" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </source> </initExpression> <type xsi:type="ocl:SetType" location="11:25-11:38"> <elementType xsi:type="ocl:OclModelElement" location="11:29-11:37" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </elementType> </type> </feature> </definition> </elements> <elements xsi:type="atl:Helper" location="14:1-14:43"> + <commentsBefore>-- ===== HELPER ATTRIBUTES ===== --</commentsBefore> <definition location="14:8-14:42"> <feature xsi:type="ocl:Attribute" location="14:14-14:42" name="usecase"> <initExpression xsi:type="ocl:StringExp" location="14:33-14:42" stringSymbol="Usecase"/> @@ -63,6 +71,9 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="19:1-19:61"> + <commentsAfter>-- =====COMMON PART ===== --</commentsAfter> + <commentsAfter>-- This part covers common items such as Model, Diagram, Comment, Note, Comment and Note associations.</commentsAfter> + <commentsAfter>-- Processing of type Model</commentsAfter> <definition location="19:8-19:60"> <feature xsi:type="ocl:Attribute" location="19:14-19:60" name="extensionEdge"> <initExpression xsi:type="ocl:StringExp" location="19:39-19:60" stringSymbol="extensionEdgeObject"/> @@ -71,10 +82,14 @@ </definition> </elements> <elements xsi:type="atl:MatchedRule" location="26:1-38:2" name="umlDiagrams"> + <commentsBefore>-- =====COMMON PART ===== --</commentsBefore> + <commentsBefore>-- This part covers common items such as Model, Diagram, Comment, Note, Comment and Note associations.</commentsBefore> + <commentsBefore>-- Processing of type Model</commentsBefore> + <commentsAfter>-- Ignore others kinds of diagram and in particular Collaboration of Communication Type</commentsAfter> <outPattern location="29:10-37:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="30:18-33:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="30:23-30:34" name="Diagrams"> - <model href="temp#/0"/> + <model href="new-model#/5"/> </type> <bindings location="31:26-31:37" propertyName="model"> <value xsi:type="ocl:VariableExp" location="31:35-31:37" referredVariable="//@elements.7/@outPattern/@elements.1"/> @@ -82,14 +97,14 @@ <bindings location="32:26-32:64" propertyName="diagrams"> <value xsi:type="ocl:OperationCallExp" location="32:38-32:64" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="32:38-32:49" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="35:18-37:19" varName="mo" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="35:23-35:33" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/7"/> </type> <bindings location="36:26-36:47" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="36:34-36:47" name="idelement"> @@ -101,36 +116,38 @@ <inPattern location="27:10-28:33"> <elements xsi:type="atl:SimpleInPatternElement" location="28:18-28:33" varName="emx" variableExp="//@elements.7/@outPattern/@elements.1/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="28:24-28:33" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:Helper" location="41:1-42:73"> + <commentsBefore>-- Ignore others kinds of diagram and in particular Collaboration of Communication Type</commentsBefore> + <commentsAfter>-- Processing of type Diagram</commentsAfter> <definition location="41:8-42:72"> <feature xsi:type="ocl:Attribute" location="41:34-42:72" name="isValidDiagram"> <initExpression xsi:type="ocl:OperatorCallExp" location="42:10-42:72" operationName="or"> <source xsi:type="ocl:OperatorCallExp" location="42:10-42:40" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="42:10-42:19" name="type"> <source xsi:type="ocl:VariableExp" location="42:10-42:14"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/9"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="42:22-42:40" name="usecase"> <source xsi:type="ocl:VariableExp" location="42:22-42:32"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/10"/> </source> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="42:44-42:72" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="42:44-42:53" name="type"> <source xsi:type="ocl:VariableExp" location="42:44-42:48"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/11"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="42:56-42:72" name="class"> <source xsi:type="ocl:VariableExp" location="42:56-42:66"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/12"/> </source> </arguments> </arguments> @@ -139,16 +156,18 @@ </feature> <context_ location="41:8-41:27"> <context_ xsi:type="ocl:OclModelElement" location="41:16-41:27" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="45:1-118:2" name="umlDiagram"> + <commentsBefore>-- Processing of type Diagram</commentsBefore> + <commentsAfter>-- Process for type Comment</commentsAfter> <outPattern location="48:10-117:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="49:18-58:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="49:23-49:33" name="Diagram"> - <model href="temp#/0"/> + <model href="new-model#/14"/> </type> <bindings location="51:26-51:42" propertyName="position"> <value xsi:type="ocl:StringExp" location="51:37-51:42" stringSymbol="0,0"/> @@ -194,7 +213,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="60:13-63:19" varName="sem" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.5/@value"> <type xsi:type="ocl:OclModelElement" location="60:19-60:44" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> <bindings location="61:26-61:65" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="61:42-61:65" name="getPresentationType"> @@ -207,7 +226,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="65:18-67:19" varName="ref" variableExp="//@elements.9/@outPattern/@elements.1/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="65:24-65:34" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/16"/> </type> <bindings location="66:26-66:54" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="66:34-66:54" name="getPackageParent"> @@ -217,7 +236,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="69:18-72:19" varName="prop0" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="69:26-69:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/17"/> </type> <bindings location="70:26-70:67" propertyName="key"> <value xsi:type="ocl:StringExp" location="70:33-70:67" stringSymbol="org.topcased.modeler.di.typeName"/> @@ -230,7 +249,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="74:18-77:19" varName="prop1" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="74:26-74:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/18"/> </type> <bindings location="75:26-75:49" propertyName="key"> <value xsi:type="ocl:StringExp" location="75:33-75:49" stringSymbol="pageFormatName"/> @@ -241,29 +260,35 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="79:18-82:19" varName="prop2" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="79:26-79:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/19"/> </type> <bindings location="80:26-80:47" propertyName="key"> <value xsi:type="ocl:StringExp" location="80:33-80:47" stringSymbol="diagramWidth"/> </bindings> <bindings location="81:26-81:41" propertyName="value"> - <value xsi:type="ocl:StringExp" location="81:35-81:41" stringSymbol="1188"/> + <commentsAfter>--'840'</commentsAfter> + <value xsi:type="ocl:StringExp" location="81:35-81:41" stringSymbol="1188"> + <commentsAfter>--'840'</commentsAfter> + </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="84:18-87:19" varName="prop3" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="84:26-84:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/20"/> </type> <bindings location="85:26-85:48" propertyName="key"> <value xsi:type="ocl:StringExp" location="85:33-85:48" stringSymbol="diagramHeight"/> </bindings> <bindings location="86:26-86:40" propertyName="value"> - <value xsi:type="ocl:StringExp" location="86:35-86:40" stringSymbol="840"/> + <commentsAfter>--'1188'</commentsAfter> + <value xsi:type="ocl:StringExp" location="86:35-86:40" stringSymbol="840"> + <commentsAfter>--'1188'</commentsAfter> + </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="89:18-92:19" varName="prop4" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="89:26-89:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/21"/> </type> <bindings location="90:26-90:49" propertyName="key"> <value xsi:type="ocl:StringExp" location="90:33-90:49" stringSymbol="pageMarginName"/> @@ -274,7 +299,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="94:18-97:19" varName="prop5" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="94:26-94:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/22"/> </type> <bindings location="95:26-95:51" propertyName="key"> <value xsi:type="ocl:StringExp" location="95:33-95:51" stringSymbol="diagramTopMargin"/> @@ -285,7 +310,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="99:18-102:19" varName="prop6" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.6"> <type xsi:type="ocl:OclModelElement" location="99:26-99:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/23"/> </type> <bindings location="100:26-100:54" propertyName="key"> <value xsi:type="ocl:StringExp" location="100:33-100:54" stringSymbol="diagramBottomMargin"/> @@ -296,7 +321,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="104:18-107:19" varName="prop7" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.7"> <type xsi:type="ocl:OclModelElement" location="104:26-104:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/24"/> </type> <bindings location="105:26-105:52" propertyName="key"> <value xsi:type="ocl:StringExp" location="105:33-105:52" stringSymbol="diagramLeftMargin"/> @@ -307,7 +332,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="109:18-112:19" varName="prop8" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.8"> <type xsi:type="ocl:OclModelElement" location="109:26-109:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/25"/> </type> <bindings location="110:26-110:53" propertyName="key"> <value xsi:type="ocl:StringExp" location="110:33-110:53" stringSymbol="diagramRightMargin"/> @@ -318,20 +343,23 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="114:18-117:19" varName="prop9" variableExp="//@elements.9/@outPattern/@elements.0/@bindings.4/@value/@elements.9"> <type xsi:type="ocl:OclModelElement" location="114:26-114:37" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/26"/> </type> <bindings location="115:26-115:46" propertyName="key"> <value xsi:type="ocl:StringExp" location="115:33-115:46" stringSymbol="orientation"/> </bindings> <bindings location="116:26-116:45" propertyName="value"> - <value xsi:type="ocl:StringExp" location="116:35-116:45" stringSymbol="portrait"/> + <commentsAfter>-- ne pas mettre 'paysage' ou 'landscape' sinon comportement non attendu</commentsAfter> + <value xsi:type="ocl:StringExp" location="116:35-116:45" stringSymbol="portrait"> + <commentsAfter>-- ne pas mettre 'paysage' ou 'landscape' sinon comportement non attendu</commentsAfter> + </value> </bindings> </elements> </outPattern> <inPattern location="46:10-47:56"> <elements xsi:type="atl:SimpleInPatternElement" location="47:18-47:35" varName="emx" variableExp="//@elements.9/@inPattern/@filter/@source //@elements.9/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.9/@outPattern/@elements.0/@bindings.6/@value/@elements.0/@source //@elements.9/@outPattern/@elements.0/@bindings.6/@value/@elements.1/@source //@elements.9/@outPattern/@elements.1/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.2/@bindings.0/@value/@source //@elements.9/@outPattern/@elements.3/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="47:24-47:35" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </type> </elements> <filter xsi:type="ocl:NavigationOrAttributeCallExp" location="47:37-47:55" name="isValidDiagram"> @@ -340,10 +368,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="121:1-142:2" name="umlComment"> + <commentsBefore>-- Process for type Comment</commentsBefore> + <commentsAfter>-- Process for type Association of Comment</commentsAfter> <outPattern location="124:10-141:47"> <elements xsi:type="atl:SimpleOutPatternElement" location="125:18-130:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="125:23-125:35" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/28"/> </type> <bindings location="126:21-126:48" propertyName="position"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="126:33-126:48" name="getPosition"> @@ -364,7 +394,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="132:18-135:19" varName="sem" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="132:24-132:49" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/29"/> </type> <bindings location="133:26-133:40" propertyName="element"> <value xsi:type="ocl:VariableExp" location="133:37-133:40" referredVariable="//@elements.10/@outPattern/@elements.2"/> @@ -372,14 +402,14 @@ <bindings location="134:26-134:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="134:42-134:60" name="default"> <source xsi:type="ocl:VariableExp" location="134:42-134:52"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/30"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="137:18-139:19" varName="ref" variableExp="//@elements.10/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="137:24-137:34" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/31"/> </type> <bindings location="138:26-138:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="138:34-138:55" name="idelement"> @@ -391,14 +421,14 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="141:18-141:47" varName="graphConn" variableExp="//@elements.10/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="141:30-141:47" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/32"/> </type> </elements> </outPattern> <inPattern location="122:10-123:53"> <elements xsi:type="atl:SimpleInPatternElement" location="123:18-123:32" varName="emx" variableExp="//@elements.10/@inPattern/@filter/@source //@elements.10/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.10/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.10/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="123:24-123:32" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/27"/> </type> </elements> <filter xsi:type="ocl:NavigationOrAttributeCallExp" location="123:35-123:52" name="isTypeComment"> @@ -407,16 +437,18 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="145:1-157:2" name="umlCommentAssociation"> + <commentsBefore>-- Process for type Association of Comment</commentsBefore> + <commentsAfter>-- Enables to get the type name of the current diagram</commentsAfter> <outPattern location="148:10-156:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="149:18-152:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="149:23-149:35" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/34"/> </type> <bindings location="150:26-150:141" propertyName="anchor"> <value xsi:type="ocl:SequenceExp" location="150:36-150:141"> <elements xsi:type="ocl:OperationCallExp" location="150:46-150:92" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="150:46-150:56"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/35"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="150:69-150:79" name="source"> <source xsi:type="ocl:VariableExp" location="150:69-150:72" referredVariable="//@elements.11/@inPattern/@elements.0"/> @@ -425,7 +457,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="150:94-150:140" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="150:94-150:104"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/36"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="150:117-150:127" name="target"> <source xsi:type="ocl:VariableExp" location="150:117-150:120" referredVariable="//@elements.11/@inPattern/@elements.0"/> @@ -440,7 +472,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="154:18-156:19" varName="sem" variableExp="//@elements.11/@outPattern/@elements.0/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="154:24-154:53" name="SimpleSemanticModelElement"> - <model href="temp#/0"/> + <model href="new-model#/37"/> </type> <bindings location="155:26-155:62" propertyName="typeInfo"> <value xsi:type="ocl:StringExp" location="155:38-155:62" stringSymbol="CommentLink EditPolicy"/> @@ -450,7 +482,7 @@ <inPattern location="146:10-147:131"> <elements xsi:type="atl:SimpleInPatternElement" location="147:18-147:32" varName="emx" variableExp="//@elements.11/@inPattern/@filter/@source/@source/@source //@elements.11/@inPattern/@filter/@source/@arguments.0/@source/@source/@source //@elements.11/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.11/@outPattern/@elements.0/@bindings.0/@value/@elements.0/@arguments.0/@source //@elements.11/@outPattern/@elements.0/@bindings.0/@value/@elements.1/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="147:24-147:32" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="147:34-147:130" operationName="and"> @@ -477,6 +509,8 @@ </inPattern> </elements> <elements xsi:type="atl:Helper" location="160:1-167:16"> + <commentsBefore>-- Enables to get the type name of the current diagram</commentsBefore> + <commentsAfter>-- Enables to get the type of the current diagram</commentsAfter> <definition location="160:8-167:15"> <feature xsi:type="ocl:Attribute" location="160:34-167:15" name="getDiagramTypeName"> <initExpression xsi:type="ocl:IfExp" location="161:10-167:15"> @@ -484,12 +518,12 @@ <condition xsi:type="ocl:OperatorCallExp" location="161:13-161:43" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="161:13-161:22" name="type"> <source xsi:type="ocl:VariableExp" location="161:13-161:17"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/39"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="161:25-161:43" name="usecase"> <source xsi:type="ocl:VariableExp" location="161:25-161:35"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/40"/> </source> </arguments> </condition> @@ -498,12 +532,12 @@ <condition xsi:type="ocl:OperatorCallExp" location="163:18-163:46" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="163:18-163:27" name="type"> <source xsi:type="ocl:VariableExp" location="163:18-163:22"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/41"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="163:30-163:46" name="class"> <source xsi:type="ocl:VariableExp" location="163:30-163:40"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/42"/> </source> </arguments> </condition> @@ -514,12 +548,14 @@ </feature> <context_ location="160:8-160:27"> <context_ xsi:type="ocl:OclModelElement" location="160:16-160:27" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/38"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="170:1-177:16"> + <commentsBefore>-- Enables to get the type of the current diagram</commentsBefore> + <commentsAfter>-- Enables to get the reference of the package which contains the processed diagram</commentsAfter> <definition location="170:8-177:15"> <feature xsi:type="ocl:Attribute" location="170:34-177:15" name="getPresentationType"> <initExpression xsi:type="ocl:IfExp" location="171:10-177:15"> @@ -527,12 +563,12 @@ <condition xsi:type="ocl:OperatorCallExp" location="171:13-171:43" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="171:13-171:22" name="type"> <source xsi:type="ocl:VariableExp" location="171:13-171:17"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/44"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="171:25-171:43" name="usecase"> <source xsi:type="ocl:VariableExp" location="171:25-171:35"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/45"/> </source> </arguments> </condition> @@ -541,12 +577,12 @@ <condition xsi:type="ocl:OperatorCallExp" location="173:18-173:46" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="173:18-173:27" name="type"> <source xsi:type="ocl:VariableExp" location="173:18-173:22"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/46"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="173:30-173:46" name="class"> <source xsi:type="ocl:VariableExp" location="173:30-173:40"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/47"/> </source> </arguments> </condition> @@ -557,19 +593,21 @@ </feature> <context_ location="170:8-170:27"> <context_ xsi:type="ocl:OclModelElement" location="170:16-170:27" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/43"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="180:1-181:73"> + <commentsBefore>-- Enables to get the reference of the package which contains the processed diagram</commentsBefore> + <commentsAfter>-- Tests if a Node is a Comment</commentsAfter> <definition location="180:8-181:72"> <feature xsi:type="ocl:Attribute" location="180:34-181:72" name="getPackageParent"> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="181:10-181:72" name="idelement"> <source xsi:type="ocl:OperationCallExp" location="181:10-181:62" operationName="refImmediateComposite"> <source xsi:type="ocl:OperationCallExp" location="181:10-181:38" operationName="refImmediateComposite"> <source xsi:type="ocl:VariableExp" location="181:10-181:14"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/49"/> </source> </source> </source> @@ -578,29 +616,31 @@ </feature> <context_ location="180:8-180:27"> <context_ xsi:type="ocl:OclModelElement" location="180:16-180:27" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/48"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="184:1-185:65"> + <commentsBefore>-- Tests if a Node is a Comment</commentsBefore> + <commentsAfter>-- Tests if the current Edge is a comment association</commentsAfter> <definition location="184:8-185:64"> <feature xsi:type="ocl:Attribute" location="184:31-185:64" name="isTypeComment"> <initExpression xsi:type="ocl:OperatorCallExp" location="185:10-185:64" operationName="and"> <source xsi:type="ocl:OperationCallExp" location="185:10-185:47" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="185:10-185:22" name="element"> <source xsi:type="ocl:VariableExp" location="185:10-185:14"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/51"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="185:35-185:46" name="Comment"> - <model href="temp#/1"/> + <model href="new-model#/52"/> </arguments> </source> <arguments xsi:type="ocl:OperatorCallExp" location="185:52-185:64" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="185:52-185:61" name="type"> <source xsi:type="ocl:VariableExp" location="185:52-185:56"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/53"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="185:62-185:64" stringSymbol=""/> @@ -610,18 +650,20 @@ </feature> <context_ location="184:8-184:24"> <context_ xsi:type="ocl:OclModelElement" location="184:16-184:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/50"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="188:1-189:33"> + <commentsBefore>-- Tests if the current Edge is a comment association</commentsBefore> + <commentsAfter>-- Gets the diagram according to a graphical node</commentsAfter> <definition location="188:8-189:32"> <feature xsi:type="ocl:Attribute" location="188:31-189:32" name="isCommentAssociation"> <initExpression xsi:type="ocl:OperatorCallExp" location="189:10-189:32" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="189:10-189:19" name="type"> <source xsi:type="ocl:VariableExp" location="189:10-189:14"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/55"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="189:21-189:32" stringSymbol="Reference"/> @@ -630,51 +672,57 @@ </feature> <context_ location="188:8-188:24"> <context_ xsi:type="ocl:OclModelElement" location="188:16-188:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/54"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="192:1-193:63"> + <commentsBefore>-- Gets the diagram according to a graphical node</commentsBefore> + <commentsAfter>-- Gives the diagram type which the Node belongs to.</commentsAfter> + <commentsAfter>-- For a given Node, this helper finds the corresponding Diagram and returns the String representing the type.</commentsAfter> <definition location="192:8-193:62"> <feature xsi:type="ocl:Attribute" location="192:31-193:62" name="getDiagram"> <initExpression xsi:type="ocl:OperationCallExp" location="193:10-193:62" operationName="refImmediateComposite"> <source xsi:type="ocl:OperationCallExp" location="193:10-193:38" operationName="refImmediateComposite"> <source xsi:type="ocl:VariableExp" location="193:10-193:14"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/58"/> </source> </source> </initExpression> <type xsi:type="ocl:OclModelElement" location="192:44-192:55" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/57"/> </type> </feature> <context_ location="192:8-192:24"> <context_ xsi:type="ocl:OclModelElement" location="192:16-192:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/56"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="197:1-201:16"> + <commentsBefore>-- Gives the diagram type which the Node belongs to.</commentsBefore> + <commentsBefore>-- For a given Node, this helper finds the corresponding Diagram and returns the String representing the type.</commentsBefore> + <commentsAfter>-- Gets the corresponding diagram according to a graphical edge</commentsAfter> <definition location="197:8-201:15"> <feature xsi:type="ocl:Attribute" location="197:31-201:15" name="getDiagramType"> <initExpression xsi:type="ocl:IfExp" location="198:10-201:15"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="199:23-199:56" name="type"> <source xsi:type="ocl:OperationCallExp" location="199:23-199:51" operationName="refImmediateComposite"> <source xsi:type="ocl:VariableExp" location="199:23-199:27"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/62"/> </source> </source> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="198:13-198:66" operationName="oclIsTypeOf"> <source xsi:type="ocl:OperationCallExp" location="198:13-198:41" operationName="refImmediateComposite"> <source xsi:type="ocl:VariableExp" location="198:13-198:17"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/60"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="198:54-198:65" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/61"/> </arguments> </condition> <elseExpression xsi:type="ocl:OclUndefinedExp" location="200:23-200:35"/> @@ -683,37 +731,42 @@ </feature> <context_ location="197:8-197:24"> <context_ xsi:type="ocl:OclModelElement" location="197:16-197:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/59"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="204:1-205:39"> + <commentsBefore>-- Gets the corresponding diagram according to a graphical edge</commentsBefore> + <commentsAfter>-- Gives the diagram type which the current Edge belongs to</commentsAfter> <definition location="204:8-205:38"> <feature xsi:type="ocl:Attribute" location="204:31-205:38" name="getDiagram"> <initExpression xsi:type="ocl:OperationCallExp" location="205:10-205:38" operationName="refImmediateComposite"> <source xsi:type="ocl:VariableExp" location="205:10-205:14"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/65"/> </source> </initExpression> <type xsi:type="ocl:OclModelElement" location="204:44-204:55" name="Diagram"> - <model href="temp#/1"/> + <model href="new-model#/64"/> </type> </feature> <context_ location="204:8-204:24"> <context_ xsi:type="ocl:OclModelElement" location="204:16-204:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/63"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="208:1-209:31"> + <commentsBefore>-- Gives the diagram type which the current Edge belongs to</commentsBefore> + <commentsAfter>-- ====== HELPERS RELATED TO GRAPHICAL INFORMATION =====--</commentsAfter> + <commentsAfter>-- Calculates the X position of an element</commentsAfter> <definition location="208:8-209:30"> <feature xsi:type="ocl:Attribute" location="208:31-209:30" name="getDiagramType"> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="209:10-209:30" name="type"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="209:10-209:25" name="getDiagram"> <source xsi:type="ocl:VariableExp" location="209:10-209:14"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/67"/> </source> </source> </initExpression> @@ -721,12 +774,15 @@ </feature> <context_ location="208:8-208:24"> <context_ xsi:type="ocl:OclModelElement" location="208:16-208:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/66"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="214:1-215:66"> + <commentsBefore>-- ====== HELPERS RELATED TO GRAPHICAL INFORMATION =====--</commentsBefore> + <commentsBefore>-- Calculates the X position of an element</commentsBefore> + <commentsAfter>-- Calculates the Y position of an element</commentsAfter> <definition location="214:8-215:65"> <feature xsi:type="ocl:Attribute" location="214:31-215:65" name="getPosX"> <initExpression xsi:type="ocl:OperationCallExp" location="215:10-215:65" operationName="toString"> @@ -735,7 +791,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="215:11-215:34" name="x"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="215:11-215:32" name="layoutConstraint"> <source xsi:type="ocl:VariableExp" location="215:11-215:15"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/69"/> </source> </source> </source> @@ -747,12 +803,14 @@ </feature> <context_ location="214:8-214:24"> <context_ xsi:type="ocl:OclModelElement" location="214:16-214:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/68"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="218:1-219:66"> + <commentsBefore>-- Calculates the Y position of an element</commentsBefore> + <commentsAfter>-- Reconstitutes the initial position of the element</commentsAfter> <definition location="218:8-219:65"> <feature xsi:type="ocl:Attribute" location="218:31-219:65" name="getPosY"> <initExpression xsi:type="ocl:OperationCallExp" location="219:10-219:65" operationName="toString"> @@ -761,7 +819,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="219:11-219:34" name="y"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="219:11-219:32" name="layoutConstraint"> <source xsi:type="ocl:VariableExp" location="219:11-219:15"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/71"/> </source> </source> </source> @@ -773,26 +831,28 @@ </feature> <context_ location="218:8-218:24"> <context_ xsi:type="ocl:OclModelElement" location="218:16-218:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/70"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="222:1-223:44"> + <commentsBefore>-- Reconstitutes the initial position of the element</commentsBefore> + <commentsAfter>-- Calculates the Width of the element</commentsAfter> <definition location="222:8-223:43"> <feature xsi:type="ocl:Attribute" location="222:31-223:43" name="getPosition"> <initExpression xsi:type="ocl:OperatorCallExp" location="223:10-223:43" operationName="+"> <source xsi:type="ocl:OperatorCallExp" location="223:10-223:28" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="223:10-223:22" name="getPosX"> <source xsi:type="ocl:VariableExp" location="223:10-223:14"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/73"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="223:25-223:28" stringSymbol=","/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="223:31-223:43" name="getPosY"> <source xsi:type="ocl:VariableExp" location="223:31-223:35"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/74"/> </source> </arguments> </initExpression> @@ -800,12 +860,14 @@ </feature> <context_ location="222:8-222:24"> <context_ xsi:type="ocl:OclModelElement" location="222:16-222:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/72"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="226:1-227:70"> + <commentsBefore>-- Calculates the Width of the element</commentsBefore> + <commentsAfter>-- Calculates the Height of the element</commentsAfter> <definition location="226:8-227:69"> <feature xsi:type="ocl:Attribute" location="226:31-227:69" name="getWidth"> <initExpression xsi:type="ocl:OperationCallExp" location="227:10-227:69" operationName="toString"> @@ -814,7 +876,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="227:11-227:38" name="width"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="227:11-227:32" name="layoutConstraint"> <source xsi:type="ocl:VariableExp" location="227:11-227:15"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/76"/> </source> </source> </source> @@ -826,12 +888,14 @@ </feature> <context_ location="226:8-226:24"> <context_ xsi:type="ocl:OclModelElement" location="226:16-226:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/75"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="230:1-231:71"> + <commentsBefore>-- Calculates the Height of the element</commentsBefore> + <commentsAfter>-- Reconstitutes the size of the element</commentsAfter> <definition location="230:8-231:70"> <feature xsi:type="ocl:Attribute" location="230:31-231:70" name="getHeight"> <initExpression xsi:type="ocl:OperationCallExp" location="231:10-231:70" operationName="toString"> @@ -840,7 +904,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="231:11-231:39" name="height"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="231:11-231:32" name="layoutConstraint"> <source xsi:type="ocl:VariableExp" location="231:11-231:15"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/78"/> </source> </source> </source> @@ -852,12 +916,16 @@ </feature> <context_ location="230:8-230:24"> <context_ xsi:type="ocl:OclModelElement" location="230:16-230:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/77"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="234:1-235:47"> + <commentsBefore>-- Reconstitutes the size of the element</commentsBefore> + <commentsAfter>-- ***** CLASS DIAGRAM SECTION *****</commentsAfter> + <commentsAfter>-- This section covers the transformations for : Class, Interface, DataType, Feature, Operation, ClassInstance, Package and the possible associations.</commentsAfter> + <commentsAfter>-- Process for type Class or Interface or DataType</commentsAfter> <definition location="234:8-235:46"> <feature xsi:type="ocl:Operation" location="234:31-235:46" name="getSize"> <returnType xsi:type="ocl:StringType" location="234:43-234:49"/> @@ -865,30 +933,34 @@ <source xsi:type="ocl:OperatorCallExp" location="235:10-235:29" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="235:10-235:23" name="getWidth"> <source xsi:type="ocl:VariableExp" location="235:10-235:14"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/80"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="235:26-235:29" stringSymbol=","/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="235:32-235:46" name="getHeight"> <source xsi:type="ocl:VariableExp" location="235:32-235:36"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/81"/> </source> </arguments> </body> </feature> <context_ location="234:8-234:24"> <context_ xsi:type="ocl:OclModelElement" location="234:16-234:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/79"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="242:1-302:2" name="umlClassDiagramElement" children="//@elements.28 //@elements.29 //@elements.30 //@elements.31" isAbstract="true"> + <commentsBefore>-- ***** CLASS DIAGRAM SECTION *****</commentsBefore> + <commentsBefore>-- This section covers the transformations for : Class, Interface, DataType, Feature, Operation, ClassInstance, Package and the possible associations.</commentsBefore> + <commentsBefore>-- Process for type Class or Interface or DataType</commentsBefore> + <commentsAfter>-- Process only class without operations and without attributes</commentsAfter> <outPattern location="245:10-301:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="246:18-252:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="246:23-246:35" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/83"/> </type> <bindings location="247:20-247:47" propertyName="position"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="247:32-247:47" name="getPosition"> @@ -923,12 +995,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="254:18-254:47" varName="graphConn" variableExp="//@elements.27/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="254:30-254:47" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/84"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="256:18-259:19" varName="sem" variableExp="//@elements.27/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="256:24-256:49" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/85"/> </type> <bindings location="257:26-257:40" propertyName="element"> <value xsi:type="ocl:VariableExp" location="257:37-257:40" referredVariable="//@elements.27/@outPattern/@elements.3"/> @@ -936,14 +1008,14 @@ <bindings location="258:26-258:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="258:42-258:60" name="default"> <source xsi:type="ocl:VariableExp" location="258:42-258:52"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/86"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="261:18-263:19" varName="ref" variableExp="//@elements.27/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="261:24-261:34" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/87"/> </type> <bindings location="262:26-262:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="262:34-262:55" name="idelement"> @@ -955,7 +1027,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="265:18-268:19" varName="feat1" variableExp="//@elements.27/@outPattern/@elements.0/@bindings.4/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="265:26-265:38" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/88"/> </type> <bindings location="266:26-266:47" propertyName="property"> <value xsi:type="ocl:VariableExp" location="266:38-266:47" referredVariable="//@elements.27/@outPattern/@elements.5"/> @@ -966,12 +1038,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="270:18-273:19" varName="propFeat1" variableExp="//@elements.27/@outPattern/@elements.4/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="270:30-270:41" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/89"/> </type> <bindings location="271:26-271:53" propertyName="key"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="271:33-271:53" name="featureID"> <source xsi:type="ocl:VariableExp" location="271:33-271:43"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/90"/> </source> </value> </bindings> @@ -985,7 +1057,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="275:18-278:19" varName="semFeat1" variableExp="//@elements.27/@outPattern/@elements.4/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="275:29-275:54" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/91"/> </type> <bindings location="276:26-276:45" propertyName="element"> <value xsi:type="ocl:VariableExp" location="276:37-276:45" referredVariable="//@elements.27/@outPattern/@elements.7"/> @@ -993,14 +1065,14 @@ <bindings location="277:26-277:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="277:42-277:60" name="default"> <source xsi:type="ocl:VariableExp" location="277:42-277:52"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/92"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="280:18-282:19" varName="refFeat1" variableExp="//@elements.27/@outPattern/@elements.6/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="280:29-280:39" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/93"/> </type> <bindings location="281:26-281:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="281:34-281:55" name="idelement"> @@ -1012,7 +1084,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="284:18-287:19" varName="feat2" variableExp="//@elements.27/@outPattern/@elements.0/@bindings.4/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="284:26-284:38" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/94"/> </type> <bindings location="285:26-285:47" propertyName="property"> <value xsi:type="ocl:VariableExp" location="285:38-285:47" referredVariable="//@elements.27/@outPattern/@elements.9"/> @@ -1023,12 +1095,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="289:18-292:19" varName="propFeat2" variableExp="//@elements.27/@outPattern/@elements.8/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="289:30-289:41" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/95"/> </type> <bindings location="290:26-290:53" propertyName="key"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="290:33-290:53" name="featureID"> <source xsi:type="ocl:VariableExp" location="290:33-290:43"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/96"/> </source> </value> </bindings> @@ -1042,7 +1114,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="294:18-297:19" varName="semFeat2" variableExp="//@elements.27/@outPattern/@elements.8/@bindings.1/@value"> <type xsi:type="ocl:OclModelElement" location="294:29-294:54" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/97"/> </type> <bindings location="295:26-295:45" propertyName="element"> <value xsi:type="ocl:VariableExp" location="295:37-295:45" referredVariable="//@elements.27/@outPattern/@elements.11"/> @@ -1050,14 +1122,14 @@ <bindings location="296:26-296:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="296:42-296:60" name="default"> <source xsi:type="ocl:VariableExp" location="296:42-296:52"> - <referredVariable href="temp#/38"/> + <referredVariable href="new-model#/98"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="299:18-301:19" varName="refFeat2" variableExp="//@elements.27/@outPattern/@elements.10/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="299:29-299:39" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/99"/> </type> <bindings location="300:26-300:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="300:34-300:55" name="idelement"> @@ -1071,7 +1143,7 @@ <inPattern location="243:10-244:60"> <elements xsi:type="atl:SimpleInPatternElement" location="244:18-244:32" varName="emx" variableExp="//@elements.27/@inPattern/@filter/@source //@elements.27/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.27/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source //@elements.27/@outPattern/@elements.0/@bindings.1/@value/@arguments.0/@source //@elements.27/@outPattern/@elements.3/@bindings.0/@value/@source/@source //@elements.27/@outPattern/@elements.5/@bindings.1/@value/@source/@source //@elements.27/@outPattern/@elements.7/@bindings.0/@value/@source/@source //@elements.27/@outPattern/@elements.9/@bindings.1/@value/@source/@source //@elements.27/@outPattern/@elements.11/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="244:24-244:32" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/82"/> </type> </elements> <filter xsi:type="ocl:NavigationOrAttributeCallExp" location="244:34-244:59" name="isClassDiagramElement"> @@ -1080,10 +1152,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="305:1-308:2" name="umlClassDiagramWithoutFeatures" superRule="//@elements.27"> + <commentsBefore>-- Process only class without operations and without attributes</commentsBefore> + <commentsAfter>-- Process only class with attributes but no operations</commentsAfter> <inPattern location="306:10-307:59"> <elements xsi:type="atl:SimpleInPatternElement" location="307:18-307:32" varName="emx" variableExp="//@elements.28/@inPattern/@filter/@source/@source"> <type xsi:type="ocl:OclModelElement" location="307:24-307:32" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/100"/> </type> </elements> <filter xsi:type="ocl:NavigationOrAttributeCallExp" location="307:34-307:58" name="hasNoFeature"> @@ -1094,15 +1168,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="311:1-319:2" name="umlClassDiagramWithAttributes" superRule="//@elements.27"> + <commentsBefore>-- Process only class with attributes but no operations</commentsBefore> + <commentsAfter>-- Process only class with operations but no attributes</commentsAfter> <outPattern location="314:10-318:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="315:18-315:35" varName="di"> <type xsi:type="ocl:OclModelElement" location="315:23-315:35" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/102"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="316:18-318:19" varName="feat1"> <type xsi:type="ocl:OclModelElement" location="316:26-316:38" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/103"/> </type> <bindings location="317:26-317:75" propertyName="contained"> <value xsi:type="ocl:SequenceExp" location="317:39-317:75"> @@ -1118,7 +1194,7 @@ <inPattern location="312:10-313:97"> <elements xsi:type="atl:SimpleInPatternElement" location="313:18-313:32" varName="emx" variableExp="//@elements.29/@inPattern/@filter/@source/@source/@source/@source //@elements.29/@inPattern/@filter/@arguments.0/@source/@source //@elements.29/@outPattern/@elements.1/@bindings.0/@value/@elements.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="313:24-313:32" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/101"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="313:35-313:96" operationName="and"> @@ -1138,15 +1214,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="322:1-330:2" name="umlClassDiagramWithOperations" superRule="//@elements.27"> + <commentsBefore>-- Process only class with operations but no attributes</commentsBefore> + <commentsAfter>-- Process only class with operations and attributes</commentsAfter> <outPattern location="325:10-329:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="326:18-326:35" varName="di"> <type xsi:type="ocl:OclModelElement" location="326:23-326:35" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/105"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="327:18-329:19" varName="feat2"> <type xsi:type="ocl:OclModelElement" location="327:26-327:38" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/106"/> </type> <bindings location="328:26-328:75" propertyName="contained"> <value xsi:type="ocl:SequenceExp" location="328:39-328:75"> @@ -1162,7 +1240,7 @@ <inPattern location="323:10-324:96"> <elements xsi:type="atl:SimpleInPatternElement" location="324:18-324:32" varName="emx" variableExp="//@elements.30/@inPattern/@filter/@source/@source/@source/@source //@elements.30/@inPattern/@filter/@arguments.0/@source/@source //@elements.30/@outPattern/@elements.1/@bindings.0/@value/@elements.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="324:24-324:32" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/104"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="324:34-324:95" operationName="and"> @@ -1182,15 +1260,17 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="333:1-344:2" name="umlClassDiagramWithFeatures" superRule="//@elements.27"> + <commentsBefore>-- Process only class with operations and attributes</commentsBefore> + <commentsAfter>-- Process for type Package and InstanceClass</commentsAfter> <outPattern location="336:10-343:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="337:18-337:35" varName="di"> <type xsi:type="ocl:OclModelElement" location="337:23-337:35" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/108"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="338:18-340:19" varName="feat1"> <type xsi:type="ocl:OclModelElement" location="338:26-338:38" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/109"/> </type> <bindings location="339:26-339:75" propertyName="contained"> <value xsi:type="ocl:SequenceExp" location="339:39-339:75"> @@ -1204,7 +1284,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="341:18-343:19" varName="feat2"> <type xsi:type="ocl:OclModelElement" location="341:26-341:38" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/110"/> </type> <bindings location="342:26-342:75" propertyName="contained"> <value xsi:type="ocl:SequenceExp" location="342:39-342:75"> @@ -1220,7 +1300,7 @@ <inPattern location="334:10-335:100"> <elements xsi:type="atl:SimpleInPatternElement" location="335:18-335:32" varName="emx" variableExp="//@elements.31/@inPattern/@filter/@source/@source/@source/@source //@elements.31/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.31/@outPattern/@elements.1/@bindings.0/@value/@elements.0/@source/@source //@elements.31/@outPattern/@elements.2/@bindings.0/@value/@elements.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="335:24-335:32" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/107"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="335:34-335:99" operationName="and"> @@ -1242,10 +1322,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="347:1-369:2" name="umlPackageOrInstanceClass"> + <commentsBefore>-- Process for type Package and InstanceClass</commentsBefore> + <commentsAfter>-- Process for attributes and operations of a class or an interface</commentsAfter> <outPattern location="350:10-368:47"> <elements xsi:type="atl:SimpleOutPatternElement" location="351:18-357:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="351:23-351:35" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/112"/> </type> <bindings location="352:17-352:44" propertyName="position"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="352:29-352:44" name="getPosition"> @@ -1275,7 +1357,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="359:18-362:19" varName="sem" variableExp="//@elements.32/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="359:24-359:49" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/113"/> </type> <bindings location="360:26-360:40" propertyName="element"> <value xsi:type="ocl:VariableExp" location="360:37-360:40" referredVariable="//@elements.32/@outPattern/@elements.2"/> @@ -1283,14 +1365,14 @@ <bindings location="361:26-361:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="361:42-361:60" name="default"> <source xsi:type="ocl:VariableExp" location="361:42-361:52"> - <referredVariable href="temp#/39"/> + <referredVariable href="new-model#/114"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="364:18-366:19" varName="ref" variableExp="//@elements.32/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="364:24-364:34" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/115"/> </type> <bindings location="365:26-365:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="365:34-365:55" name="idelement"> @@ -1302,14 +1384,14 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="368:18-368:47" varName="graphConn" variableExp="//@elements.32/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="368:30-368:47" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/116"/> </type> </elements> </outPattern> <inPattern location="348:10-349:87"> <elements xsi:type="atl:SimpleInPatternElement" location="349:18-349:32" varName="emx" variableExp="//@elements.32/@inPattern/@filter/@source/@source //@elements.32/@inPattern/@filter/@arguments.0/@source //@elements.32/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.32/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.32/@outPattern/@elements.0/@bindings.4/@value/@elements.0/@source/@source //@elements.32/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="349:24-349:32" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/111"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="349:34-349:86" operationName="or"> @@ -1323,10 +1405,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="372:1-390:2" name="umlFeatureAndOperation"> + <commentsBefore>-- Process for attributes and operations of a class or an interface</commentsBefore> + <commentsAfter>-- Processing of Implementation, Dependency and Generalization associations for class diagram</commentsAfter> <outPattern location="375:10-389:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="376:18-380:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="376:23-376:35" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/118"/> </type> <bindings location="377:26-377:47" propertyName="position"> <value xsi:type="ocl:StringExp" location="377:38-377:47" stringSymbol="100,100"/> @@ -1340,7 +1424,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="382:18-385:19" varName="sem" variableExp="//@elements.33/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="382:24-382:49" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/119"/> </type> <bindings location="383:26-383:40" propertyName="element"> <value xsi:type="ocl:VariableExp" location="383:37-383:40" referredVariable="//@elements.33/@outPattern/@elements.2"/> @@ -1348,14 +1432,14 @@ <bindings location="384:26-384:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="384:42-384:60" name="default"> <source xsi:type="ocl:VariableExp" location="384:42-384:52"> - <referredVariable href="temp#/40"/> + <referredVariable href="new-model#/120"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="387:18-389:19" varName="ref" variableExp="//@elements.33/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="387:24-387:34" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/121"/> </type> <bindings location="388:34-388:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="388:42-388:55" name="idelement"> @@ -1367,7 +1451,7 @@ <inPattern location="373:10-374:110"> <elements xsi:type="atl:SimpleInPatternElement" location="374:18-374:35" varName="emx" variableExp="//@elements.33/@inPattern/@filter/@source/@source //@elements.33/@inPattern/@filter/@arguments.0/@source //@elements.33/@inPattern/@filter/@arguments.0/@arguments.0/@source //@elements.33/@outPattern/@elements.2/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="374:24-374:35" name="Feature"> - <model href="temp#/1"/> + <model href="new-model#/117"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="374:38-374:109" operationName="and"> @@ -1384,10 +1468,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="393:1-412:2" name="umlClassDiagramAssociation" children="//@elements.35 //@elements.36" isAbstract="true"> + <commentsBefore>-- Processing of Implementation, Dependency and Generalization associations for class diagram</commentsBefore> + <commentsAfter>-- Processing of some special associations</commentsAfter> <outPattern location="397:10-410:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="398:18-401:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="398:23-398:35" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/123"/> </type> <bindings location="399:26-399:46" propertyName="semanticModel"> <value xsi:type="ocl:VariableExp" location="399:43-399:46" referredVariable="//@elements.34/@outPattern/@elements.1"/> @@ -1396,7 +1482,7 @@ <value xsi:type="ocl:SequenceExp" location="400:36-400:141"> <elements xsi:type="ocl:OperationCallExp" location="400:46-400:92" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="400:46-400:56"> - <referredVariable href="temp#/41"/> + <referredVariable href="new-model#/124"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="400:69-400:79" name="source"> <source xsi:type="ocl:VariableExp" location="400:69-400:72" referredVariable="//@elements.34/@inPattern/@elements.0"/> @@ -1405,7 +1491,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="400:94-400:140" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="400:94-400:104"> - <referredVariable href="temp#/42"/> + <referredVariable href="new-model#/125"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="400:117-400:127" name="target"> <source xsi:type="ocl:VariableExp" location="400:117-400:120" referredVariable="//@elements.34/@inPattern/@elements.0"/> @@ -1417,7 +1503,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="403:18-406:19" varName="sem" variableExp="//@elements.34/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="403:24-403:49" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/126"/> </type> <bindings location="404:26-404:40" propertyName="element"> <value xsi:type="ocl:VariableExp" location="404:37-404:40" referredVariable="//@elements.34/@outPattern/@elements.2"/> @@ -1425,14 +1511,14 @@ <bindings location="405:26-405:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="405:42-405:60" name="default"> <source xsi:type="ocl:VariableExp" location="405:42-405:52"> - <referredVariable href="temp#/43"/> + <referredVariable href="new-model#/127"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="408:18-410:19" varName="ref" variableExp="//@elements.34/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="408:24-408:34" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/128"/> </type> <bindings location="409:26-409:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="409:34-409:55" name="idelement"> @@ -1446,16 +1532,18 @@ <inPattern location="395:10-396:32"> <elements xsi:type="atl:SimpleInPatternElement" location="396:18-396:32" varName="emx" variableExp="//@elements.34/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@arguments.0/@source //@elements.34/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@arguments.0/@source //@elements.34/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="396:24-396:32" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/122"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="415:1-418:2" name="umlClassDiagramSpecialAssociation" superRule="//@elements.34"> + <commentsBefore>-- Processing of some special associations</commentsBefore> + <commentsAfter>-- Processing of 'basic' associations between the different class diagram objects</commentsAfter> <inPattern location="416:10-417:102"> <elements xsi:type="atl:SimpleInPatternElement" location="417:18-417:32" varName="emx" variableExp="//@elements.35/@inPattern/@filter/@source/@source //@elements.35/@inPattern/@filter/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="417:24-417:32" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/129"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="417:34-417:101" operationName="and"> @@ -1469,10 +1557,13 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="421:1-461:2" name="umlClassDiagramBasicAssociation" superRule="//@elements.34"> + <commentsBefore>-- Processing of 'basic' associations between the different class diagram objects</commentsBefore> + <commentsAfter>---- *** DEFINITION OF CLASS DIAGRAM HELPERS ***</commentsAfter> + <commentsAfter>-- Tests if the element belongs to a Class diagram</commentsAfter> <outPattern location="424:10-460:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="425:18-427:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="425:23-425:35" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/131"/> </type> <bindings location="426:26-426:90" propertyName="contained"> <value xsi:type="ocl:SequenceExp" location="426:39-426:90"> @@ -1487,7 +1578,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="429:18-433:19" varName="edge1" variableExp="//@elements.36/@outPattern/@elements.0/@bindings.0/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="429:26-429:41" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/132"/> </type> <bindings location="430:26-430:51" propertyName="id"> <value xsi:type="ocl:StringExp" location="430:32-430:51" stringSymbol="srcNameEdgeObject"/> @@ -1501,7 +1592,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="435:18-439:19" varName="edge2" variableExp="//@elements.36/@outPattern/@elements.0/@bindings.0/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="435:26-435:41" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/133"/> </type> <bindings location="436:26-436:52" propertyName="id"> <value xsi:type="ocl:StringExp" location="436:32-436:52" stringSymbol="srcCountEdgeObject"/> @@ -1517,7 +1608,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="441:18-445:19" varName="edge3" variableExp="//@elements.36/@outPattern/@elements.0/@bindings.0/@value/@elements.2"> <type xsi:type="ocl:OclModelElement" location="441:26-441:41" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/134"/> </type> <bindings location="442:26-442:54" propertyName="id"> <value xsi:type="ocl:StringExp" location="442:32-442:54" stringSymbol="targetNameEdgeObject"/> @@ -1531,7 +1622,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="447:18-451:19" varName="edge4" variableExp="//@elements.36/@outPattern/@elements.0/@bindings.0/@value/@elements.3"> <type xsi:type="ocl:OclModelElement" location="447:26-447:41" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/135"/> </type> <bindings location="448:26-448:55" propertyName="id"> <value xsi:type="ocl:StringExp" location="448:32-448:55" stringSymbol="targetCountEdgeObject"/> @@ -1547,7 +1638,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="453:18-455:19" varName="edge5" variableExp="//@elements.36/@outPattern/@elements.0/@bindings.0/@value/@elements.4"> <type xsi:type="ocl:OclModelElement" location="453:26-453:45" name="EdgeObjectOffset"> - <model href="temp#/0"/> + <model href="new-model#/136"/> </type> <bindings location="454:26-454:54" propertyName="id"> <value xsi:type="ocl:StringExp" location="454:32-454:54" stringSymbol="middleNameEdgeObject"/> @@ -1555,7 +1646,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="457:18-460:19" varName="edge6" variableExp="//@elements.36/@outPattern/@elements.0/@bindings.0/@value/@elements.5"> <type xsi:type="ocl:OclModelElement" location="457:26-457:45" name="EdgeObjectOffset"> - <model href="temp#/0"/> + <model href="new-model#/137"/> </type> <bindings location="458:26-458:54" propertyName="id"> <value xsi:type="ocl:StringExp" location="458:32-458:54" stringSymbol="stereotypeEdgeObject"/> @@ -1568,7 +1659,7 @@ <inPattern location="422:10-423:100"> <elements xsi:type="atl:SimpleInPatternElement" location="423:18-423:32" varName="emx" variableExp="//@elements.36/@inPattern/@filter/@source/@source //@elements.36/@inPattern/@filter/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="423:24-423:32" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/130"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="423:34-423:99" operationName="and"> @@ -1582,6 +1673,9 @@ </inPattern> </elements> <elements xsi:type="atl:Helper" location="466:1-473:16"> + <commentsBefore>---- *** DEFINITION OF CLASS DIAGRAM HELPERS ***</commentsBefore> + <commentsBefore>-- Tests if the element belongs to a Class diagram</commentsBefore> + <commentsAfter>-- Tests if the Node is a Class</commentsAfter> <definition location="466:8-473:15"> <feature xsi:type="ocl:Attribute" location="466:31-473:15" name="isClassDiagramElement"> <initExpression xsi:type="ocl:IfExp" location="467:10-473:15"> @@ -1589,12 +1683,12 @@ <thenExpression xsi:type="ocl:OperatorCallExp" location="469:39-469:77" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="469:39-469:58" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="469:39-469:43"> - <referredVariable href="temp#/48"/> + <referredVariable href="new-model#/143"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="469:61-469:77" name="class"> <source xsi:type="ocl:VariableExp" location="469:61-469:71"> - <referredVariable href="temp#/49"/> + <referredVariable href="new-model#/144"/> </source> </arguments> </thenExpression> @@ -1602,18 +1696,18 @@ <source xsi:type="ocl:OperatorCallExp" location="468:26-468:66" operationName="or"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="468:26-468:42" name="isTypeClass"> <source xsi:type="ocl:VariableExp" location="468:26-468:30"> - <referredVariable href="temp#/45"/> + <referredVariable href="new-model#/140"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="468:46-468:66" name="isTypeInterface"> <source xsi:type="ocl:VariableExp" location="468:46-468:50"> - <referredVariable href="temp#/46"/> + <referredVariable href="new-model#/141"/> </source> </arguments> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="468:70-468:85" name="isDataType"> <source xsi:type="ocl:VariableExp" location="468:70-468:74"> - <referredVariable href="temp#/47"/> + <referredVariable href="new-model#/142"/> </source> </arguments> </condition> @@ -1622,7 +1716,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="467:13-467:25" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="467:13-467:22" name="type"> <source xsi:type="ocl:VariableExp" location="467:13-467:17"> - <referredVariable href="temp#/44"/> + <referredVariable href="new-model#/139"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="467:23-467:25" stringSymbol=""/> @@ -1633,123 +1727,133 @@ </feature> <context_ location="466:8-466:24"> <context_ xsi:type="ocl:OclModelElement" location="466:16-466:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/138"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="476:1-477:46"> + <commentsBefore>-- Tests if the Node is a Class</commentsBefore> + <commentsAfter>-- Tests if the Node is an Interface</commentsAfter> <definition location="476:8-477:45"> <feature xsi:type="ocl:Attribute" location="476:31-477:45" name="isTypeClass"> <initExpression xsi:type="ocl:OperationCallExp" location="477:10-477:45" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="477:10-477:22" name="element"> <source xsi:type="ocl:VariableExp" location="477:10-477:14"> - <referredVariable href="temp#/50"/> + <referredVariable href="new-model#/146"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="477:35-477:44" name="Class"> - <model href="temp#/1"/> + <model href="new-model#/147"/> </arguments> </initExpression> <type xsi:type="ocl:BooleanType" location="476:45-476:52"/> </feature> <context_ location="476:8-476:24"> <context_ xsi:type="ocl:OclModelElement" location="476:16-476:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/145"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="480:1-481:50"> + <commentsBefore>-- Tests if the Node is an Interface</commentsBefore> + <commentsAfter>-- Test if the Node is a DataType</commentsAfter> <definition location="480:8-481:49"> <feature xsi:type="ocl:Attribute" location="480:31-481:49" name="isTypeInterface"> <initExpression xsi:type="ocl:OperationCallExp" location="481:10-481:49" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="481:10-481:22" name="element"> <source xsi:type="ocl:VariableExp" location="481:10-481:14"> - <referredVariable href="temp#/51"/> + <referredVariable href="new-model#/149"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="481:35-481:48" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/150"/> </arguments> </initExpression> <type xsi:type="ocl:BooleanType" location="480:49-480:56"/> </feature> <context_ location="480:8-480:24"> <context_ xsi:type="ocl:OclModelElement" location="480:16-480:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/148"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="484:1-485:49"> + <commentsBefore>-- Test if the Node is a DataType</commentsBefore> + <commentsAfter>-- Test if the Node is a Package</commentsAfter> <definition location="484:8-485:48"> <feature xsi:type="ocl:Attribute" location="484:31-485:48" name="isDataType"> <initExpression xsi:type="ocl:OperationCallExp" location="485:10-485:48" operationName="oclIsKindOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="485:10-485:22" name="element"> <source xsi:type="ocl:VariableExp" location="485:10-485:14"> - <referredVariable href="temp#/52"/> + <referredVariable href="new-model#/152"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="485:35-485:47" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/153"/> </arguments> </initExpression> <type xsi:type="ocl:BooleanType" location="484:44-484:51"/> </feature> <context_ location="484:8-484:24"> <context_ xsi:type="ocl:OclModelElement" location="484:16-484:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/151"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="488:1-489:48"> + <commentsBefore>-- Test if the Node is a Package</commentsBefore> + <commentsAfter>-- Test if the Node is an instance Specification</commentsAfter> <definition location="488:8-489:47"> <feature xsi:type="ocl:Attribute" location="488:31-489:47" name="isTypePackage"> <initExpression xsi:type="ocl:OperationCallExp" location="489:10-489:47" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="489:10-489:22" name="element"> <source xsi:type="ocl:VariableExp" location="489:10-489:14"> - <referredVariable href="temp#/53"/> + <referredVariable href="new-model#/155"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="489:35-489:46" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/156"/> </arguments> </initExpression> <type xsi:type="ocl:BooleanType" location="488:47-488:54"/> </feature> <context_ location="488:8-488:24"> <context_ xsi:type="ocl:OclModelElement" location="488:16-488:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/154"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="492:1-496:16"> + <commentsBefore>-- Test if the Node is an instance Specification</commentsBefore> + <commentsAfter>-- Test on the kind of 'basic'association for class diagram</commentsAfter> <definition location="492:8-496:15"> <feature xsi:type="ocl:Attribute" location="492:31-496:15" name="isTypeInstanceSpecification"> <initExpression xsi:type="ocl:IfExp" location="493:10-496:15"> <thenExpression xsi:type="ocl:OperatorCallExp" location="494:23-494:61" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="494:23-494:42" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="494:23-494:27"> - <referredVariable href="temp#/55"/> + <referredVariable href="new-model#/160"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="494:45-494:61" name="class"> <source xsi:type="ocl:VariableExp" location="494:45-494:55"> - <referredVariable href="temp#/56"/> + <referredVariable href="new-model#/161"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="493:13-493:64" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="493:13-493:25" name="element"> <source xsi:type="ocl:VariableExp" location="493:13-493:17"> - <referredVariable href="temp#/54"/> + <referredVariable href="new-model#/158"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="493:38-493:63" name="InstanceSpecification"> - <model href="temp#/1"/> + <model href="new-model#/159"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="495:23-495:28"/> @@ -1758,12 +1862,14 @@ </feature> <context_ location="492:8-492:24"> <context_ xsi:type="ocl:OclModelElement" location="492:16-492:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/157"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="499:1-506:16"> + <commentsBefore>-- Test on the kind of 'basic'association for class diagram</commentsBefore> + <commentsAfter>-- Test on the kind of 'extended' association for a class diagram</commentsAfter> <definition location="499:8-506:15"> <feature xsi:type="ocl:Attribute" location="499:31-506:15" name="isBasicClassDiagramAssociation"> <initExpression xsi:type="ocl:IfExp" location="500:10-506:15"> @@ -1773,7 +1879,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="502:39-502:61" name="memberEnd"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="502:39-502:51" name="element"> <source xsi:type="ocl:VariableExp" location="502:39-502:43"> - <referredVariable href="temp#/61"/> + <referredVariable href="new-model#/168"/> </source> </source> </source> @@ -1783,11 +1889,11 @@ <condition xsi:type="ocl:OperationCallExp" location="501:26-501:67" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="501:26-501:38" name="element"> <source xsi:type="ocl:VariableExp" location="501:26-501:30"> - <referredVariable href="temp#/60"/> + <referredVariable href="new-model#/166"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="501:51-501:66" name="Association"> - <model href="temp#/1"/> + <model href="new-model#/167"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="503:39-503:44"/> @@ -1796,7 +1902,7 @@ <source xsi:type="ocl:OperatorCallExp" location="500:13-500:25" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="500:13-500:22" name="type"> <source xsi:type="ocl:VariableExp" location="500:13-500:17"> - <referredVariable href="temp#/57"/> + <referredVariable href="new-model#/163"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="500:23-500:25" stringSymbol=""/> @@ -1804,12 +1910,12 @@ <arguments xsi:type="ocl:OperatorCallExp" location="500:30-500:68" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="500:30-500:49" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="500:30-500:34"> - <referredVariable href="temp#/58"/> + <referredVariable href="new-model#/164"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="500:52-500:68" name="class"> <source xsi:type="ocl:VariableExp" location="500:52-500:62"> - <referredVariable href="temp#/59"/> + <referredVariable href="new-model#/165"/> </source> </arguments> </arguments> @@ -1820,12 +1926,14 @@ </feature> <context_ location="499:8-499:24"> <context_ xsi:type="ocl:OclModelElement" location="499:16-499:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/162"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="509:1-517:16"> + <commentsBefore>-- Test on the kind of 'extended' association for a class diagram</commentsBefore> + <commentsAfter>-- Indicates whether the class or the interface has no operation</commentsAfter> <definition location="509:8-517:15"> <feature xsi:type="ocl:Attribute" location="509:31-517:15" name="isComplexClassDiagramAssociation"> <initExpression xsi:type="ocl:IfExp" location="510:10-517:15"> @@ -1834,21 +1942,21 @@ <condition xsi:type="ocl:OperationCallExp" location="512:29-512:73" operationName="oclIsKindOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="512:29-512:41" name="element"> <source xsi:type="ocl:VariableExp" location="512:29-512:33"> - <referredVariable href="temp#/65"/> + <referredVariable href="new-model#/173"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="512:54-512:72" name="Generalization"> - <model href="temp#/1"/> + <model href="new-model#/174"/> </arguments> </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="514:39-514:79" operationName="oclIsKindOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="514:39-514:51" name="element"> <source xsi:type="ocl:VariableExp" location="514:39-514:43"> - <referredVariable href="temp#/66"/> + <referredVariable href="new-model#/175"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="514:64-514:78" name="Dependency"> - <model href="temp#/1"/> + <model href="new-model#/176"/> </arguments> </elseExpression> </thenExpression> @@ -1856,7 +1964,7 @@ <source xsi:type="ocl:OperatorCallExp" location="510:13-510:25" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="510:13-510:22" name="type"> <source xsi:type="ocl:VariableExp" location="510:13-510:17"> - <referredVariable href="temp#/62"/> + <referredVariable href="new-model#/170"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="510:23-510:25" stringSymbol=""/> @@ -1864,12 +1972,12 @@ <arguments xsi:type="ocl:OperatorCallExp" location="510:30-510:68" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="510:30-510:49" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="510:30-510:34"> - <referredVariable href="temp#/63"/> + <referredVariable href="new-model#/171"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="510:52-510:68" name="class"> <source xsi:type="ocl:VariableExp" location="510:52-510:62"> - <referredVariable href="temp#/64"/> + <referredVariable href="new-model#/172"/> </source> </arguments> </arguments> @@ -1880,12 +1988,14 @@ </feature> <context_ location="509:8-509:24"> <context_ xsi:type="ocl:OclModelElement" location="509:16-509:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/169"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="520:1-524:16"> + <commentsBefore>-- Indicates whether the class or the interface has no operation</commentsBefore> + <commentsAfter>-- Indicates whether the class or the interface has no attribute</commentsAfter> <definition location="520:8-524:15"> <feature xsi:type="ocl:Attribute" location="520:37-524:15" name="hasNoOperation"> <initExpression xsi:type="ocl:IfExp" location="521:10-524:15"> @@ -1893,14 +2003,14 @@ <condition xsi:type="ocl:OperationCallExp" location="521:13-521:49" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="521:13-521:32" name="ownedOperation"> <source xsi:type="ocl:VariableExp" location="521:13-521:17"> - <referredVariable href="temp#/67"/> + <referredVariable href="new-model#/178"/> </source> </source> </condition> <elseExpression xsi:type="ocl:OperationCallExp" location="523:23-523:52" operationName="isEmpty"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="523:23-523:42" name="ownedOperation"> <source xsi:type="ocl:VariableExp" location="523:23-523:27"> - <referredVariable href="temp#/68"/> + <referredVariable href="new-model#/179"/> </source> </source> </elseExpression> @@ -1909,12 +2019,14 @@ </feature> <context_ location="520:8-520:30"> <context_ xsi:type="ocl:OclModelElement" location="520:16-520:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/177"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="527:1-534:16"> + <commentsBefore>-- Indicates whether the class or the interface has no attribute</commentsBefore> + <commentsAfter>-- Indicates whether the class or the interface has features or not</commentsAfter> <definition location="527:8-534:15"> <feature xsi:type="ocl:Attribute" location="527:37-534:15" name="hasNoAttribute"> <initExpression xsi:type="ocl:IfExp" location="528:10-534:15"> @@ -1922,7 +2034,7 @@ <condition xsi:type="ocl:OperationCallExp" location="528:13-528:49" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="528:13-528:32" name="ownedAttribute"> <source xsi:type="ocl:VariableExp" location="528:13-528:17"> - <referredVariable href="temp#/69"/> + <referredVariable href="new-model#/181"/> </source> </source> </condition> @@ -1931,7 +2043,7 @@ <condition xsi:type="ocl:OperationCallExp" location="530:26-530:55" operationName="isEmpty"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="530:26-530:45" name="ownedAttribute"> <source xsi:type="ocl:VariableExp" location="530:26-530:30"> - <referredVariable href="temp#/70"/> + <referredVariable href="new-model#/182"/> </source> </source> </condition> @@ -1939,7 +2051,7 @@ <source xsi:type="ocl:IteratorExp" location="532:39-532:94" name="reject"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="532:39-532:58" name="ownedAttribute"> <source xsi:type="ocl:VariableExp" location="532:39-532:43"> - <referredVariable href="temp#/71"/> + <referredVariable href="new-model#/183"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="532:71-532:93" operationName="not"> @@ -1956,23 +2068,24 @@ </feature> <context_ location="527:8-527:30"> <context_ xsi:type="ocl:OclModelElement" location="527:16-527:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/180"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="537:1-538:54"> + <commentsBefore>-- Indicates whether the class or the interface has features or not</commentsBefore> <definition location="537:8-538:53"> <feature xsi:type="ocl:Attribute" location="537:37-538:53" name="hasNoFeature"> <initExpression xsi:type="ocl:OperatorCallExp" location="538:10-538:53" operationName="and"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="538:10-538:29" name="hasNoAttribute"> <source xsi:type="ocl:VariableExp" location="538:10-538:14"> - <referredVariable href="temp#/72"/> + <referredVariable href="new-model#/185"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="538:34-538:53" name="hasNoOperation"> <source xsi:type="ocl:VariableExp" location="538:34-538:38"> - <referredVariable href="temp#/73"/> + <referredVariable href="new-model#/186"/> </source> </arguments> </initExpression> @@ -1980,7 +2093,7 @@ </feature> <context_ location="537:8-537:30"> <context_ xsi:type="ocl:OclModelElement" location="537:16-537:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/184"/> </context_> </context_> </definition> @@ -1993,18 +2106,18 @@ <condition xsi:type="ocl:OperatorCallExp" location="541:14-541:79" operationName="or"> <source xsi:type="ocl:OperationCallExp" location="541:14-541:45" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="541:14-541:18"> - <referredVariable href="temp#/74"/> + <referredVariable href="new-model#/188"/> </source> <arguments xsi:type="ocl:OclModelElement" location="541:31-541:44" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/189"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="541:49-541:79" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="541:49-541:53"> - <referredVariable href="temp#/75"/> + <referredVariable href="new-model#/190"/> </source> <arguments xsi:type="ocl:OclModelElement" location="541:66-541:78" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/191"/> </arguments> </arguments> </condition> @@ -2014,7 +2127,7 @@ </feature> <context_ location="540:8-540:30"> <context_ xsi:type="ocl:OclModelElement" location="540:16-540:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/187"/> </context_> </context_> </definition> @@ -2027,18 +2140,18 @@ <condition xsi:type="ocl:OperatorCallExp" location="547:14-547:79" operationName="or"> <source xsi:type="ocl:OperationCallExp" location="547:14-547:45" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="547:14-547:18"> - <referredVariable href="temp#/76"/> + <referredVariable href="new-model#/193"/> </source> <arguments xsi:type="ocl:OclModelElement" location="547:31-547:44" name="Interface"> - <model href="temp#/1"/> + <model href="new-model#/194"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="547:49-547:79" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="547:49-547:53"> - <referredVariable href="temp#/77"/> + <referredVariable href="new-model#/195"/> </source> <arguments xsi:type="ocl:OclModelElement" location="547:66-547:78" name="DataType"> - <model href="temp#/1"/> + <model href="new-model#/196"/> </arguments> </arguments> </condition> @@ -2048,7 +2161,7 @@ </feature> <context_ location="546:8-546:30"> <context_ xsi:type="ocl:OclModelElement" location="546:16-546:30" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/192"/> </context_> </context_> </definition> @@ -2060,10 +2173,10 @@ <thenExpression xsi:type="ocl:BooleanExp" location="554:15-554:19" booleanSymbol="true"/> <condition xsi:type="ocl:OperationCallExp" location="553:13-553:44" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="553:13-553:17"> - <referredVariable href="temp#/78"/> + <referredVariable href="new-model#/198"/> </source> <arguments xsi:type="ocl:OclModelElement" location="553:30-553:43" name="Operation"> - <model href="temp#/1"/> + <model href="new-model#/199"/> </arguments> </condition> <elseExpression xsi:type="ocl:IfExp" location="556:18-563:23"> @@ -2072,14 +2185,14 @@ <condition xsi:type="ocl:OperationCallExp" location="558:29-558:62" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="558:29-558:45" name="association"> <source xsi:type="ocl:VariableExp" location="558:29-558:33"> - <referredVariable href="temp#/80"/> + <referredVariable href="new-model#/202"/> </source> </source> </condition> <elseExpression xsi:type="ocl:OperatorCallExp" location="560:39-560:60" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="560:39-560:55" name="association"> <source xsi:type="ocl:VariableExp" location="560:39-560:43"> - <referredVariable href="temp#/81"/> + <referredVariable href="new-model#/203"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="560:58-560:60" stringSymbol=""/> @@ -2087,10 +2200,10 @@ </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="556:21-556:51" operationName="oclIsKindOf"> <source xsi:type="ocl:VariableExp" location="556:21-556:25"> - <referredVariable href="temp#/79"/> + <referredVariable href="new-model#/200"/> </source> <arguments xsi:type="ocl:OclModelElement" location="556:38-556:50" name="Property"> - <model href="temp#/1"/> + <model href="new-model#/201"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="562:23-562:28"/> @@ -2100,17 +2213,18 @@ </feature> <context_ location="552:8-552:27"> <context_ xsi:type="ocl:OclModelElement" location="552:16-552:27" name="Feature"> - <model href="temp#/1"/> + <model href="new-model#/197"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="566:1-570:16"> + <commentsAfter>-- Returns a reference to the parent element</commentsAfter> <definition location="566:8-570:15"> <feature xsi:type="ocl:Operation" location="566:34-570:15" name="belongsToDrawableClassifier"> <parameters location="566:62-566:83" varName="parent" variableExp="//@elements.51/@definition/@feature/@body/@condition/@source/@source //@elements.51/@definition/@feature/@body/@thenExpression/@source/@body/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="566:69-566:83" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/205"/> </type> </parameters> <returnType xsi:type="ocl:BooleanType" location="566:87-566:94"/> @@ -2119,7 +2233,7 @@ <source xsi:type="ocl:IteratorExp" location="568:23-568:80" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="568:23-568:42" name="allNodes"> <source xsi:type="ocl:VariableExp" location="568:23-568:33"> - <referredVariable href="temp#/82"/> + <referredVariable href="new-model#/206"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="568:58-568:79" operationName="="> @@ -2141,70 +2255,80 @@ </feature> <context_ location="566:8-566:27"> <context_ xsi:type="ocl:OclModelElement" location="566:16-566:27" name="Feature"> - <model href="temp#/1"/> + <model href="new-model#/204"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="573:1-580:8"> + <commentsBefore>-- Returns a reference to the parent element</commentsBefore> + <commentsAfter>-- ***** USECASE DIAGRAM SECTION *****</commentsAfter> + <commentsAfter>-- This section covers the transformations for : Actor, Usecase and associations like implement, extend, include, generalization...</commentsAfter> + <commentsAfter>-- For the moment, the bendpoints are not handled.</commentsAfter> + <commentsAfter>-- Process for type Actor or UseCase</commentsAfter> <definition location="573:8-580:7"> <feature xsi:type="ocl:Attribute" location="573:34-580:7" name="getParent"> <initExpression xsi:type="ocl:IfExp" location="574:5-580:7"> <thenExpression xsi:type="ocl:IfExp" location="575:8-578:11"> <thenExpression xsi:type="ocl:OperationCallExp" location="576:12-576:40" operationName="refImmediateComposite"> <source xsi:type="ocl:VariableExp" location="576:12-576:16"> - <referredVariable href="temp#/86"/> + <referredVariable href="new-model#/214"/> </source> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="575:11-575:38" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="575:11-575:21" name="class"> <source xsi:type="ocl:VariableExp" location="575:11-575:15"> - <referredVariable href="temp#/85"/> + <referredVariable href="new-model#/213"/> </source> </source> </condition> <elseExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="577:12-577:22" name="class"> <source xsi:type="ocl:VariableExp" location="577:12-577:16"> - <referredVariable href="temp#/87"/> + <referredVariable href="new-model#/215"/> </source> </elseExpression> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="574:8-574:73" operationName="or"> <source xsi:type="ocl:OperationCallExp" location="574:8-574:39" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="574:8-574:12"> - <referredVariable href="temp#/83"/> + <referredVariable href="new-model#/209"/> </source> <arguments xsi:type="ocl:OclModelElement" location="574:25-574:38" name="Operation"> - <model href="temp#/1"/> + <model href="new-model#/210"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="574:43-574:73" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="574:43-574:47"> - <referredVariable href="temp#/84"/> + <referredVariable href="new-model#/211"/> </source> <arguments xsi:type="ocl:OclModelElement" location="574:60-574:72" name="Property"> - <model href="temp#/1"/> + <model href="new-model#/212"/> </arguments> </arguments> </condition> <elseExpression xsi:type="ocl:OclUndefinedExp" location="579:8-579:20"/> </initExpression> <type xsi:type="ocl:OclModelElement" location="573:46-573:60" name="Classifier"> - <model href="temp#/1"/> + <model href="new-model#/208"/> </type> </feature> <context_ location="573:8-573:27"> <context_ xsi:type="ocl:OclModelElement" location="573:16-573:27" name="Feature"> - <model href="temp#/1"/> + <model href="new-model#/207"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="587:1-608:2" name="umlUsecaseElement"> + <commentsBefore>-- ***** USECASE DIAGRAM SECTION *****</commentsBefore> + <commentsBefore>-- This section covers the transformations for : Actor, Usecase and associations like implement, extend, include, generalization...</commentsBefore> + <commentsBefore>-- For the moment, the bendpoints are not handled.</commentsBefore> + <commentsBefore>-- Process for type Actor or UseCase</commentsBefore> + <commentsAfter>-- Abstract definition of an association in a Usecase diagram</commentsAfter> <outPattern location="590:10-607:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="591:18-596:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="591:23-591:35" name="GraphNode"> - <model href="temp#/0"/> + <model href="new-model#/217"/> </type> <bindings location="592:20-592:145" propertyName="position"> <value xsi:type="ocl:OperatorCallExp" location="592:32-592:145" operationName="+"> @@ -2249,12 +2373,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="598:18-598:47" varName="graphConn" variableExp="//@elements.53/@outPattern/@elements.0/@bindings.2/@value"> <type xsi:type="ocl:OclModelElement" location="598:30-598:47" name="GraphConnector"> - <model href="temp#/0"/> + <model href="new-model#/218"/> </type> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="600:18-603:19" varName="sem" variableExp="//@elements.53/@outPattern/@elements.0/@bindings.3/@value"> <type xsi:type="ocl:OclModelElement" location="600:24-600:49" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/219"/> </type> <bindings location="601:26-601:40" propertyName="element"> <value xsi:type="ocl:VariableExp" location="601:37-601:40" referredVariable="//@elements.53/@outPattern/@elements.3"/> @@ -2262,14 +2386,14 @@ <bindings location="602:26-602:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="602:42-602:60" name="default"> <source xsi:type="ocl:VariableExp" location="602:42-602:52"> - <referredVariable href="temp#/88"/> + <referredVariable href="new-model#/220"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="605:18-607:19" varName="ref" variableExp="//@elements.53/@outPattern/@elements.2/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="605:24-605:34" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/221"/> </type> <bindings location="606:26-606:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="606:34-606:55" name="idelement"> @@ -2283,7 +2407,7 @@ <inPattern location="588:10-589:55"> <elements xsi:type="atl:SimpleInPatternElement" location="589:18-589:32" varName="emx" variableExp="//@elements.53/@inPattern/@filter/@source //@elements.53/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source/@source //@elements.53/@outPattern/@elements.0/@bindings.0/@value/@arguments.0/@source/@source/@source/@source/@source //@elements.53/@outPattern/@elements.3/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="589:24-589:32" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/216"/> </type> </elements> <filter xsi:type="ocl:NavigationOrAttributeCallExp" location="589:34-589:54" name="isUseCaseElement"> @@ -2292,10 +2416,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="611:1-628:2" name="umlUsecaseAssociation" children="//@elements.55 //@elements.56 //@elements.57" isAbstract="true"> + <commentsBefore>-- Abstract definition of an association in a Usecase diagram</commentsBefore> + <commentsAfter>-- Processing of 'basic' usecase Association</commentsAfter> <outPattern location="614:10-627:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="615:18-618:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="615:23-615:35" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/223"/> </type> <bindings location="616:26-616:46" propertyName="semanticModel"> <value xsi:type="ocl:VariableExp" location="616:43-616:46" referredVariable="//@elements.54/@outPattern/@elements.1"/> @@ -2304,7 +2430,7 @@ <value xsi:type="ocl:SequenceExp" location="617:36-617:141"> <elements xsi:type="ocl:OperationCallExp" location="617:46-617:92" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="617:46-617:56"> - <referredVariable href="temp#/89"/> + <referredVariable href="new-model#/224"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="617:69-617:79" name="source"> <source xsi:type="ocl:VariableExp" location="617:69-617:72" referredVariable="//@elements.54/@inPattern/@elements.0"/> @@ -2313,7 +2439,7 @@ </elements> <elements xsi:type="ocl:OperationCallExp" location="617:94-617:140" operationName="resolveTemp"> <source xsi:type="ocl:VariableExp" location="617:94-617:104"> - <referredVariable href="temp#/90"/> + <referredVariable href="new-model#/225"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="617:117-617:127" name="target"> <source xsi:type="ocl:VariableExp" location="617:117-617:120" referredVariable="//@elements.54/@inPattern/@elements.0"/> @@ -2325,7 +2451,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="620:18-623:19" varName="sem" variableExp="//@elements.54/@outPattern/@elements.0/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="620:24-620:49" name="EMFSemanticModelBridge"> - <model href="temp#/0"/> + <model href="new-model#/226"/> </type> <bindings location="621:26-621:40" propertyName="element"> <value xsi:type="ocl:VariableExp" location="621:37-621:40" referredVariable="//@elements.54/@outPattern/@elements.2"/> @@ -2333,14 +2459,14 @@ <bindings location="622:26-622:60" propertyName="presentation"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="622:42-622:60" name="default"> <source xsi:type="ocl:VariableExp" location="622:42-622:52"> - <referredVariable href="temp#/91"/> + <referredVariable href="new-model#/227"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="625:18-627:19" varName="ref" variableExp="//@elements.54/@outPattern/@elements.1/@bindings.0/@value"> <type xsi:type="ocl:OclModelElement" location="625:24-625:34" name="Element"> - <model href="temp#/0"/> + <model href="new-model#/228"/> </type> <bindings location="626:26-626:55" propertyName="href"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="626:34-626:55" name="idelement"> @@ -2354,16 +2480,18 @@ <inPattern location="612:10-613:32"> <elements xsi:type="atl:SimpleInPatternElement" location="613:18-613:32" varName="emx" variableExp="//@elements.54/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@arguments.0/@source //@elements.54/@outPattern/@elements.0/@bindings.1/@value/@elements.1/@arguments.0/@source //@elements.54/@outPattern/@elements.2/@bindings.0/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="613:24-613:32" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/222"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="631:1-634:2" name="umlBasicUsecaseAssociation" superRule="//@elements.54"> + <commentsBefore>-- Processing of 'basic' usecase Association</commentsBefore> + <commentsAfter>-- Processing of 'include' associations for usecase</commentsAfter> <inPattern location="632:10-633:95"> <elements xsi:type="atl:SimpleInPatternElement" location="633:18-633:32" varName="emx" variableExp="//@elements.55/@inPattern/@filter/@source/@source //@elements.55/@inPattern/@filter/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="633:24-633:32" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/229"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="633:34-633:94" operationName="and"> @@ -2377,10 +2505,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="637:1-648:2" name="umlIncludeUsecaseAssociation" superRule="//@elements.54"> + <commentsBefore>-- Processing of 'include' associations for usecase</commentsBefore> + <commentsAfter>-- Processing of 'extend' associations for usecase</commentsAfter> <outPattern location="640:10-647:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="641:18-643:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="641:23-641:35" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/231"/> </type> <bindings location="642:26-642:54" propertyName="contained"> <value xsi:type="ocl:SequenceExp" location="642:39-642:54"> @@ -2390,12 +2520,12 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="645:18-647:19" varName="edge" variableExp="//@elements.56/@outPattern/@elements.0/@bindings.0/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="645:25-645:44" name="EdgeObjectOffset"> - <model href="temp#/0"/> + <model href="new-model#/232"/> </type> <bindings location="646:26-646:51" propertyName="id"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="646:32-646:51" name="nameEdge"> <source xsi:type="ocl:VariableExp" location="646:32-646:42"> - <referredVariable href="temp#/92"/> + <referredVariable href="new-model#/233"/> </source> </value> </bindings> @@ -2404,7 +2534,7 @@ <inPattern location="638:10-639:97"> <elements xsi:type="atl:SimpleInPatternElement" location="639:18-639:32" varName="emx" variableExp="//@elements.56/@inPattern/@filter/@source/@source //@elements.56/@inPattern/@filter/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="639:24-639:32" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/230"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="639:34-639:96" operationName="and"> @@ -2418,10 +2548,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="651:1-666:2" name="umlExtendUsecaseAssociation" superRule="//@elements.54"> + <commentsBefore>-- Processing of 'extend' associations for usecase</commentsBefore> + <commentsAfter>-- Tests if the element belongs to a UseCase diagam</commentsAfter> <outPattern location="654:10-665:19"> <elements xsi:type="atl:SimpleOutPatternElement" location="655:18-657:19" varName="di"> <type xsi:type="ocl:OclModelElement" location="655:23-655:35" name="GraphEdge"> - <model href="temp#/0"/> + <model href="new-model#/235"/> </type> <bindings location="656:26-656:62" propertyName="contained"> <value xsi:type="ocl:SequenceExp" location="656:39-656:62"> @@ -2432,24 +2564,24 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="659:18-661:19" varName="edge1" variableExp="//@elements.57/@outPattern/@elements.0/@bindings.0/@value/@elements.0"> <type xsi:type="ocl:OclModelElement" location="659:26-659:45" name="EdgeObjectOffset"> - <model href="temp#/0"/> + <model href="new-model#/236"/> </type> <bindings location="660:26-660:51" propertyName="id"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="660:32-660:51" name="nameEdge"> <source xsi:type="ocl:VariableExp" location="660:32-660:42"> - <referredVariable href="temp#/93"/> + <referredVariable href="new-model#/237"/> </source> </value> </bindings> </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="663:18-665:19" varName="edge2" variableExp="//@elements.57/@outPattern/@elements.0/@bindings.0/@value/@elements.1"> <type xsi:type="ocl:OclModelElement" location="663:26-663:41" name="EdgeObjectUV"> - <model href="temp#/0"/> + <model href="new-model#/238"/> </type> <bindings location="664:26-664:56" propertyName="id"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="664:32-664:56" name="extensionEdge"> <source xsi:type="ocl:VariableExp" location="664:32-664:42"> - <referredVariable href="temp#/94"/> + <referredVariable href="new-model#/239"/> </source> </value> </bindings> @@ -2458,7 +2590,7 @@ <inPattern location="652:10-653:137"> <elements xsi:type="atl:SimpleInPatternElement" location="653:18-653:32" varName="emx" variableExp="//@elements.57/@inPattern/@filter/@source/@source/@source //@elements.57/@inPattern/@filter/@source/@arguments.0/@source/@source/@source //@elements.57/@inPattern/@filter/@arguments.0/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="653:24-653:32" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/234"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="653:34-653:136" operationName="and"> @@ -2485,30 +2617,32 @@ </inPattern> </elements> <elements xsi:type="atl:Helper" location="669:1-673:16"> + <commentsBefore>-- Tests if the element belongs to a UseCase diagam</commentsBefore> + <commentsAfter>-- Tests if the current element is a UseCase element</commentsAfter> <definition location="669:8-673:15"> <feature xsi:type="ocl:Attribute" location="669:31-673:15" name="isUseCaseElement"> <initExpression xsi:type="ocl:IfExp" location="670:10-673:15"> <thenExpression xsi:type="ocl:OperatorCallExp" location="671:23-671:63" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="671:23-671:42" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="671:23-671:27"> - <referredVariable href="temp#/97"/> + <referredVariable href="new-model#/243"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="671:45-671:63" name="usecase"> <source xsi:type="ocl:VariableExp" location="671:45-671:55"> - <referredVariable href="temp#/98"/> + <referredVariable href="new-model#/244"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="670:13-670:43" operationName="or"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="670:13-670:25" name="isActor"> <source xsi:type="ocl:VariableExp" location="670:13-670:17"> - <referredVariable href="temp#/95"/> + <referredVariable href="new-model#/241"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="670:29-670:43" name="isUseCase"> <source xsi:type="ocl:VariableExp" location="670:29-670:33"> - <referredVariable href="temp#/96"/> + <referredVariable href="new-model#/242"/> </source> </arguments> </condition> @@ -2518,68 +2652,74 @@ </feature> <context_ location="669:8-669:24"> <context_ xsi:type="ocl:OclModelElement" location="669:16-669:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/240"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="676:1-677:48"> + <commentsBefore>-- Tests if the current element is a UseCase element</commentsBefore> + <commentsAfter>-- Tests if the current element is an Actor element</commentsAfter> <definition location="676:8-677:47"> <feature xsi:type="ocl:Attribute" location="676:31-677:47" name="isUseCase"> <initExpression xsi:type="ocl:OperationCallExp" location="677:10-677:47" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="677:10-677:22" name="element"> <source xsi:type="ocl:VariableExp" location="677:10-677:14"> - <referredVariable href="temp#/99"/> + <referredVariable href="new-model#/246"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="677:35-677:46" name="UseCase"> - <model href="temp#/1"/> + <model href="new-model#/247"/> </arguments> </initExpression> <type xsi:type="ocl:BooleanType" location="676:43-676:50"/> </feature> <context_ location="676:8-676:24"> <context_ xsi:type="ocl:OclModelElement" location="676:16-676:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/245"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="680:1-681:46"> + <commentsBefore>-- Tests if the current element is an Actor element</commentsBefore> + <commentsAfter>-- Test the standard association for usecase</commentsAfter> <definition location="680:8-681:45"> <feature xsi:type="ocl:Attribute" location="680:31-681:45" name="isActor"> <initExpression xsi:type="ocl:OperationCallExp" location="681:10-681:45" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="681:10-681:22" name="element"> <source xsi:type="ocl:VariableExp" location="681:10-681:14"> - <referredVariable href="temp#/100"/> + <referredVariable href="new-model#/249"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="681:35-681:44" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/250"/> </arguments> </initExpression> <type xsi:type="ocl:BooleanType" location="680:41-680:48"/> </feature> <context_ location="680:8-680:24"> <context_ xsi:type="ocl:OclModelElement" location="680:16-680:24" name="Node"> - <model href="temp#/1"/> + <model href="new-model#/248"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="684:1-688:16"> + <commentsBefore>-- Test the standard association for usecase</commentsBefore> + <commentsAfter>-- Test the extend association for a usecase diagram</commentsAfter> <definition location="684:8-688:15"> <feature xsi:type="ocl:Attribute" location="684:31-688:15" name="isBasicUsecaseAssociation"> <initExpression xsi:type="ocl:IfExp" location="685:10-688:15"> <thenExpression xsi:type="ocl:OperatorCallExp" location="686:23-686:63" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="686:23-686:42" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="686:23-686:27"> - <referredVariable href="temp#/103"/> + <referredVariable href="new-model#/256"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="686:45-686:63" name="usecase"> <source xsi:type="ocl:VariableExp" location="686:45-686:55"> - <referredVariable href="temp#/104"/> + <referredVariable href="new-model#/257"/> </source> </arguments> </thenExpression> @@ -2587,21 +2727,21 @@ <source xsi:type="ocl:OperationCallExp" location="685:13-685:54" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="685:13-685:25" name="element"> <source xsi:type="ocl:VariableExp" location="685:13-685:17"> - <referredVariable href="temp#/101"/> + <referredVariable href="new-model#/252"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="685:38-685:53" name="Association"> - <model href="temp#/1"/> + <model href="new-model#/253"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="685:58-685:102" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="685:58-685:70" name="element"> <source xsi:type="ocl:VariableExp" location="685:58-685:62"> - <referredVariable href="temp#/102"/> + <referredVariable href="new-model#/254"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="685:83-685:101" name="Generalization"> - <model href="temp#/1"/> + <model href="new-model#/255"/> </arguments> </arguments> </condition> @@ -2611,35 +2751,37 @@ </feature> <context_ location="684:8-684:24"> <context_ xsi:type="ocl:OclModelElement" location="684:16-684:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/251"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="691:1-695:16"> + <commentsBefore>-- Test the extend association for a usecase diagram</commentsBefore> + <commentsAfter>-- Test the include association for a usecase diagram</commentsAfter> <definition location="691:8-695:15"> <feature xsi:type="ocl:Attribute" location="691:31-695:15" name="isExtendUsecaseAssociation"> <initExpression xsi:type="ocl:IfExp" location="692:10-695:15"> <thenExpression xsi:type="ocl:OperatorCallExp" location="693:23-693:63" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="693:23-693:42" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="693:23-693:27"> - <referredVariable href="temp#/106"/> + <referredVariable href="new-model#/261"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="693:45-693:63" name="usecase"> <source xsi:type="ocl:VariableExp" location="693:45-693:55"> - <referredVariable href="temp#/107"/> + <referredVariable href="new-model#/262"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="692:13-692:49" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="692:13-692:25" name="element"> <source xsi:type="ocl:VariableExp" location="692:13-692:17"> - <referredVariable href="temp#/105"/> + <referredVariable href="new-model#/259"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="692:38-692:48" name="Extend"> - <model href="temp#/1"/> + <model href="new-model#/260"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="694:23-694:28"/> @@ -2648,35 +2790,37 @@ </feature> <context_ location="691:8-691:24"> <context_ xsi:type="ocl:OclModelElement" location="691:16-691:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/258"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="698:1-702:16"> + <commentsBefore>-- Test the include association for a usecase diagram</commentsBefore> + <commentsAfter>-- Test on the source and the target of a special assocaition of a class diagram</commentsAfter> <definition location="698:8-702:15"> <feature xsi:type="ocl:Attribute" location="698:31-702:15" name="isIncludeUsecaseAssociation"> <initExpression xsi:type="ocl:IfExp" location="699:10-702:15"> <thenExpression xsi:type="ocl:OperatorCallExp" location="700:23-700:63" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="700:23-700:42" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="700:23-700:27"> - <referredVariable href="temp#/109"/> + <referredVariable href="new-model#/266"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="700:45-700:63" name="usecase"> <source xsi:type="ocl:VariableExp" location="700:45-700:55"> - <referredVariable href="temp#/110"/> + <referredVariable href="new-model#/267"/> </source> </arguments> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="699:13-699:50" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="699:13-699:25" name="element"> <source xsi:type="ocl:VariableExp" location="699:13-699:17"> - <referredVariable href="temp#/108"/> + <referredVariable href="new-model#/264"/> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="699:38-699:49" name="Include"> - <model href="temp#/1"/> + <model href="new-model#/265"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="701:23-701:28"/> @@ -2685,12 +2829,13 @@ </feature> <context_ location="698:8-698:24"> <context_ xsi:type="ocl:OclModelElement" location="698:16-698:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/263"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="705:1-716:16"> + <commentsBefore>-- Test on the source and the target of a special assocaition of a class diagram</commentsBefore> <definition location="705:8-716:15"> <feature xsi:type="ocl:Attribute" location="705:31-716:15" name="isValidSourceAndTarget"> <initExpression xsi:type="ocl:IfExp" location="706:10-716:15"> @@ -2701,24 +2846,24 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="708:40-708:59" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="708:40-708:51" name="source"> <source xsi:type="ocl:VariableExp" location="708:40-708:44"> - <referredVariable href="temp#/115"/> + <referredVariable href="new-model#/273"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="708:72-708:81" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/274"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="708:86-708:130" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="708:86-708:105" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="708:86-708:97" name="source"> <source xsi:type="ocl:VariableExp" location="708:86-708:90"> - <referredVariable href="temp#/116"/> + <referredVariable href="new-model#/275"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="708:118-708:129" name="UseCase"> - <model href="temp#/1"/> + <model href="new-model#/276"/> </arguments> </arguments> </source> @@ -2727,24 +2872,24 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="709:39-709:58" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="709:39-709:50" name="target"> <source xsi:type="ocl:VariableExp" location="709:39-709:43"> - <referredVariable href="temp#/117"/> + <referredVariable href="new-model#/277"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="709:71-709:80" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/278"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="709:85-709:129" operationName="oclIsTypeOf"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="709:85-709:104" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="709:85-709:96" name="target"> <source xsi:type="ocl:VariableExp" location="709:85-709:89"> - <referredVariable href="temp#/118"/> + <referredVariable href="new-model#/279"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="709:117-709:128" name="UseCase"> - <model href="temp#/1"/> + <model href="new-model#/280"/> </arguments> </arguments> </arguments> @@ -2752,12 +2897,12 @@ <condition xsi:type="ocl:OperatorCallExp" location="707:26-707:66" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="707:26-707:45" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="707:26-707:30"> - <referredVariable href="temp#/113"/> + <referredVariable href="new-model#/271"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="707:48-707:66" name="usecase"> <source xsi:type="ocl:VariableExp" location="707:48-707:58"> - <referredVariable href="temp#/114"/> + <referredVariable href="new-model#/272"/> </source> </arguments> </condition> @@ -2768,12 +2913,12 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="711:59-711:78" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="711:59-711:70" name="source"> <source xsi:type="ocl:VariableExp" location="711:59-711:63"> - <referredVariable href="temp#/121"/> + <referredVariable href="new-model#/283"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="711:91-711:100" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/284"/> </arguments> </source> </source> @@ -2782,12 +2927,12 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="711:110-711:129" name="element"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="711:110-711:121" name="target"> <source xsi:type="ocl:VariableExp" location="711:110-711:114"> - <referredVariable href="temp#/122"/> + <referredVariable href="new-model#/285"/> </source> </source> </source> <arguments xsi:type="ocl:OclModelElement" location="711:142-711:151" name="Actor"> - <model href="temp#/1"/> + <model href="new-model#/286"/> </arguments> </source> </arguments> @@ -2795,12 +2940,12 @@ <condition xsi:type="ocl:OperatorCallExp" location="710:42-710:80" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="710:42-710:61" name="getDiagramType"> <source xsi:type="ocl:VariableExp" location="710:42-710:46"> - <referredVariable href="temp#/119"/> + <referredVariable href="new-model#/281"/> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="710:64-710:80" name="class"> <source xsi:type="ocl:VariableExp" location="710:64-710:74"> - <referredVariable href="temp#/120"/> + <referredVariable href="new-model#/282"/> </source> </arguments> </condition> @@ -2812,7 +2957,7 @@ <source xsi:type="ocl:OperationCallExp" location="706:17-706:45" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="706:17-706:28" name="source"> <source xsi:type="ocl:VariableExp" location="706:17-706:21"> - <referredVariable href="temp#/111"/> + <referredVariable href="new-model#/269"/> </source> </source> </source> @@ -2821,7 +2966,7 @@ <source xsi:type="ocl:OperationCallExp" location="706:54-706:82" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="706:54-706:65" name="target"> <source xsi:type="ocl:VariableExp" location="706:54-706:58"> - <referredVariable href="temp#/112"/> + <referredVariable href="new-model#/270"/> </source> </source> </source> @@ -2833,7 +2978,7 @@ </feature> <context_ location="705:8-705:24"> <context_ xsi:type="ocl:OclModelElement" location="705:16-705:24" name="Edge"> - <model href="temp#/1"/> + <model href="new-model#/268"/> </context_> </context_> </definition> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Relational2UML/Relational2UML.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Relational2UML/Relational2UML.atl.xmi index 16053a7c..8a986796 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Relational2UML/Relational2UML.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Relational2UML/Relational2UML.atl.xmi @@ -1,20 +1,26 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="5:1-98:2" name="Relational2UML2"> + <commentsBefore>-- @atlcompiler atl2006</commentsBefore> + <commentsBefore>-- @nsURI UML=http://www.eclipse.org/uml2/2.1.0/UML</commentsBefore> + <commentsBefore>-- @path Relational=/Relational2UML2/metamodels/relational.ecore</commentsBefore> <inModels location="6:23-6:38" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <inModels location="6:40-6:49" name="PRO"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/2"/> </inModels> <outModels location="6:8-6:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="12:1-12:60"> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> <definition location="12:8-12:59"> <feature xsi:type="ocl:Attribute" location="12:14-12:59" name="stringType"> <initExpression xsi:type="ocl:OclUndefinedExp" location="12:47-12:59"/> <type xsi:type="ocl:OclModelElement" location="12:27-12:44" name="PrimitiveType"> - <model href="temp#/0"/> + <model href="new-model#/3"/> </type> </feature> </definition> @@ -24,7 +30,7 @@ <feature xsi:type="ocl:Attribute" location="13:14-13:60" name="integerType"> <initExpression xsi:type="ocl:OclUndefinedExp" location="13:48-13:60"/> <type xsi:type="ocl:OclModelElement" location="13:28-13:45" name="PrimitiveType"> - <model href="temp#/0"/> + <model href="new-model#/4"/> </type> </feature> </definition> @@ -33,18 +39,18 @@ <definition location="15:8-24:7"> <feature xsi:type="ocl:Operation" location="15:40-24:7" name="computeType"> <returnType xsi:type="ocl:OclModelElement" location="15:56-15:73" name="PrimitiveType"> - <model href="temp#/0"/> + <model href="new-model#/6"/> </returnType> <body xsi:type="ocl:IfExp" location="16:2-24:7"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="17:3-17:24" name="stringType"> <source xsi:type="ocl:VariableExp" location="17:3-17:13"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/8"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="16:5-16:25" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="16:5-16:14" name="type"> <source xsi:type="ocl:VariableExp" location="16:5-16:9"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/7"/> </source> </source> <arguments xsi:type="ocl:EnumLiteralExp" location="16:17-16:25" name="VARCHAR"/> @@ -52,20 +58,20 @@ <elseExpression xsi:type="ocl:IfExp" location="19:3-23:8"> <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="20:4-20:26" name="integerType"> <source xsi:type="ocl:VariableExp" location="20:4-20:14"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/10"/> </source> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="19:6-19:26" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="19:6-19:15" name="type"> <source xsi:type="ocl:VariableExp" location="19:6-19:10"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/9"/> </source> </source> <arguments xsi:type="ocl:EnumLiteralExp" location="19:18-19:26" name="NUMERIC"/> </condition> <elseExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="22:7-22:29" name="integerType"> <source xsi:type="ocl:VariableExp" location="22:7-22:17"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/11"/> </source> </elseExpression> </elseExpression> @@ -73,25 +79,28 @@ </feature> <context_ location="15:8-15:33"> <context_ xsi:type="ocl:OclModelElement" location="15:16-15:33" name="Column"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="26:1-27:80"> + <commentsAfter>-------------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------------------</commentsAfter> <definition location="26:8-27:79"> <feature xsi:type="ocl:Operation" location="26:14-27:79" name="getStereotype"> <parameters location="26:28-26:41" varName="name" variableExp="//@elements.3/@definition/@feature/@body/@source/@body/@arguments.0"> <type xsi:type="ocl:StringType" location="26:35-26:41"/> </parameters> <returnType xsi:type="ocl:OclModelElement" location="26:45-26:59" name="Stereotype"> - <model href="temp#/0"/> + <model href="new-model#/12"/> </returnType> <body xsi:type="ocl:CollectionOperationCallExp" location="27:5-27:79" operationName="first"> <source xsi:type="ocl:IteratorExp" location="27:5-27:70" name="select"> <source xsi:type="ocl:OperationCallExp" location="27:5-27:43" operationName="allInstancesFrom"> <source xsi:type="ocl:OclModelElement" location="27:5-27:19" name="Stereotype"> - <model href="temp#/0"/> + <model href="new-model#/13"/> </source> <arguments xsi:type="ocl:StringExp" location="27:37-27:42" stringSymbol="PRO"/> </source> @@ -108,10 +117,13 @@ </definition> </elements> <elements xsi:type="atl:MatchedRule" location="34:1-48:2" name="Column2Property"> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> <outPattern location="37:2-43:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="38:3-43:4" varName="out" variableExp="//@elements.4/@actionBlock/@statements.0/@expression/@source"> <type xsi:type="ocl:OclModelElement" location="38:9-38:21" name="Property"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> <bindings location="39:4-39:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="39:12-39:18" name="name"> @@ -124,9 +136,11 @@ </value> </bindings> <bindings location="42:4-42:33" propertyName="type"> + <commentsAfter>-- p.computeType()</commentsAfter> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="42:12-42:33" name="stringType"> + <commentsAfter>-- p.computeType()</commentsAfter> <source xsi:type="ocl:VariableExp" location="42:12-42:22"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/16"/> </source> </value> </bindings> @@ -134,11 +148,12 @@ </outPattern> <actionBlock location="44:2-47:3"> <statements xsi:type="atl:ExpressionStat" location="45:5-45:61"> + <commentsAfter>--	 out.setValue(out.getAppliedStereotypes()->first(),'isPrimaryKey',true);</commentsAfter> <expression xsi:type="ocl:OperationCallExp" location="45:5-45:60" operationName="applyStereotype"> <source xsi:type="ocl:VariableExp" location="45:5-45:8" referredVariable="//@elements.4/@outPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="45:25-45:59" operationName="getStereotype"> <source xsi:type="ocl:VariableExp" location="45:25-45:35"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/17"/> </source> <arguments xsi:type="ocl:StringExp" location="45:50-45:58" stringSymbol="Column"/> </arguments> @@ -148,7 +163,7 @@ <inPattern location="35:2-36:24"> <elements xsi:type="atl:SimpleInPatternElement" location="36:3-36:24" varName="p" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.4/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="36:7-36:24" name="Column"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </type> </elements> </inPattern> @@ -157,7 +172,7 @@ <outPattern location="54:2-64:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="55:3-58:4" varName="out" variableExp="//@elements.5/@actionBlock/@statements.2/@expression/@source //@elements.5/@actionBlock/@statements.3/@expression/@source"> <type xsi:type="ocl:OclModelElement" location="55:9-55:18" name="Model"> - <model href="temp#/0"/> + <model href="new-model#/19"/> </type> <bindings location="56:4-56:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="56:12-56:18" name="name"> @@ -178,7 +193,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="59:3-61:4" varName="integer" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.1/@value/@source/@elements.1 //@elements.5/@actionBlock/@statements.1/@value"> <type xsi:type="ocl:OclModelElement" location="59:13-59:30" name="PrimitiveType"> - <model href="temp#/0"/> + <model href="new-model#/20"/> </type> <bindings location="60:4-60:21" propertyName="name"> <value xsi:type="ocl:StringExp" location="60:12-60:21" stringSymbol="Integer"/> @@ -186,7 +201,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="62:3-64:4" varName="string" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.1/@value/@source/@elements.2 //@elements.5/@actionBlock/@statements.0/@value"> <type xsi:type="ocl:OclModelElement" location="62:12-62:29" name="PrimitiveType"> - <model href="temp#/0"/> + <model href="new-model#/21"/> </type> <bindings location="63:4-63:20" propertyName="name"> <value xsi:type="ocl:StringExp" location="63:12-63:20" stringSymbol="String"/> @@ -197,7 +212,7 @@ <statements xsi:type="atl:BindingStat" location="66:3-66:35"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="66:3-66:24" name="stringType"> <source xsi:type="ocl:VariableExp" location="66:3-66:13"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/22"/> </source> </source> <value xsi:type="ocl:VariableExp" location="66:28-66:34" referredVariable="//@elements.5/@outPattern/@elements.2"/> @@ -205,7 +220,7 @@ <statements xsi:type="atl:BindingStat" location="67:6-67:40"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="67:6-67:28" name="integerType"> <source xsi:type="ocl:VariableExp" location="67:6-67:16"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/23"/> </source> </source> <value xsi:type="ocl:VariableExp" location="67:32-67:39" referredVariable="//@elements.5/@outPattern/@elements.1"/> @@ -217,7 +232,7 @@ <source xsi:type="ocl:IteratorExp" location="69:23-69:93" name="select"> <source xsi:type="ocl:OperationCallExp" location="69:23-69:58" operationName="allInstancesFrom"> <source xsi:type="ocl:OclModelElement" location="69:23-69:34" name="Profile"> - <model href="temp#/0"/> + <model href="new-model#/24"/> </source> <arguments xsi:type="ocl:StringExp" location="69:52-69:57" stringSymbol="PRO"/> </source> @@ -237,7 +252,7 @@ <source xsi:type="ocl:VariableExp" location="70:6-70:9" referredVariable="//@elements.5/@outPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="70:26-70:62" operationName="getStereotype"> <source xsi:type="ocl:VariableExp" location="70:26-70:36"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/25"/> </source> <arguments xsi:type="ocl:StringExp" location="70:51-70:61" stringSymbol="Database"/> </arguments> @@ -247,7 +262,7 @@ <inPattern location="52:2-53:26"> <elements xsi:type="atl:SimpleInPatternElement" location="53:3-53:26" varName="d" variableExp="//@elements.5/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.1/@value/@source/@elements.0/@source"> <type xsi:type="ocl:OclModelElement" location="53:7-53:26" name="Database"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </type> </elements> </inPattern> @@ -256,7 +271,7 @@ <outPattern location="77:2-81:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="78:3-81:4" varName="out" variableExp="//@elements.6/@actionBlock/@statements.0/@expression/@source"> <type xsi:type="ocl:OclModelElement" location="78:9-78:18" name="Class"> - <model href="temp#/0"/> + <model href="new-model#/27"/> </type> <bindings location="79:4-79:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="79:12-79:18" name="name"> @@ -276,7 +291,7 @@ <source xsi:type="ocl:VariableExp" location="83:5-83:8" referredVariable="//@elements.6/@outPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="83:25-83:58" operationName="getStereotype"> <source xsi:type="ocl:VariableExp" location="83:25-83:35"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/28"/> </source> <arguments xsi:type="ocl:StringExp" location="83:50-83:57" stringSymbol="Table"/> </arguments> @@ -286,7 +301,7 @@ <inPattern location="75:2-76:23"> <elements xsi:type="atl:SimpleInPatternElement" location="76:3-76:23" varName="t" variableExp="//@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="76:7-76:23" name="Table"> - <model href="temp#/1"/> + <model href="new-model#/26"/> </type> </elements> </inPattern> @@ -295,7 +310,7 @@ <outPattern location="90:2-94:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="91:3-94:4" varName="out" variableExp="//@elements.7/@actionBlock/@statements.0/@expression/@source"> <type xsi:type="ocl:OclModelElement" location="91:9-91:20" name="Package"> - <model href="temp#/0"/> + <model href="new-model#/30"/> </type> <bindings location="92:4-92:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="92:12-92:18" name="name"> @@ -315,7 +330,7 @@ <source xsi:type="ocl:VariableExp" location="96:4-96:7" referredVariable="//@elements.7/@outPattern/@elements.0"/> <arguments xsi:type="ocl:OperationCallExp" location="96:24-96:58" operationName="getStereotype"> <source xsi:type="ocl:VariableExp" location="96:24-96:34"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/31"/> </source> <arguments xsi:type="ocl:StringExp" location="96:49-96:57" stringSymbol="Schema"/> </arguments> @@ -325,7 +340,7 @@ <inPattern location="88:2-89:24"> <elements xsi:type="atl:SimpleInPatternElement" location="89:3-89:24" varName="s" variableExp="//@elements.7/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.7/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="89:7-89:24" name="Schema"> - <model href="temp#/1"/> + <model href="new-model#/29"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/Sildex2Sam/Sildex2Sam.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/Sildex2Sam/Sildex2Sam.atl.xmi index 6f271f18..f1424c23 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/Sildex2Sam/Sildex2Sam.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/Sildex2Sam/Sildex2Sam.atl.xmi @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="2:1-549:2" name="Sild2Sam"> + <commentsBefore>--@atlcompiler atl2006</commentsBefore> <inModels location="3:23-3:34" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="3:8-3:17" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="6:1-6:39"> + <commentsBefore>-- ===== HELPER ATTRIBUTES ===== -- </commentsBefore> <definition location="6:8-6:38"> <feature xsi:type="ocl:Attribute" location="6:14-6:38" name="event"> <initExpression xsi:type="ocl:StringExp" location="6:31-6:38" stringSymbol="event"/> @@ -55,6 +57,7 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="12:1-12:49"> + <commentsAfter>--Helper converting a string into an integer</commentsAfter> <definition location="12:8-12:48"> <feature xsi:type="ocl:Attribute" location="12:13-12:48" name="divergent"> <initExpression xsi:type="ocl:StringExp" location="12:33-12:48" stringSymbol="DivergentComb"/> @@ -63,6 +66,8 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="15:1-33:16"> + <commentsBefore>--Helper converting a string into an integer</commentsBefore> + <commentsAfter>-- Helper returning the position of a character or size+1 if the character is not found</commentsAfter> <definition location="15:8-33:15"> <feature xsi:type="ocl:Operation" location="15:28-33:15" name="toInteger"> <returnType xsi:type="ocl:IntegerType" location="15:42-15:49"/> @@ -71,7 +76,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="16:5-16:20" operationName="="> <source xsi:type="ocl:OperationCallExp" location="16:5-16:16" operationName="size"> <source xsi:type="ocl:VariableExp" location="16:5-16:9"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/2"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="16:19-16:20" integerSymbol="0"/> @@ -81,7 +86,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="20:10-20:11" integerSymbol="1"/> <condition xsi:type="ocl:OperatorCallExp" location="19:12-19:22" operationName="="> <source xsi:type="ocl:VariableExp" location="19:12-19:16"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/4"/> </source> <arguments xsi:type="ocl:StringExp" location="19:19-19:22" stringSymbol="1"/> </condition> @@ -89,7 +94,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="21:29-21:30" integerSymbol="2"/> <condition xsi:type="ocl:OperatorCallExp" location="21:13-21:23" operationName="="> <source xsi:type="ocl:VariableExp" location="21:13-21:17"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/5"/> </source> <arguments xsi:type="ocl:StringExp" location="21:20-21:23" stringSymbol="2"/> </condition> @@ -97,7 +102,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="22:29-22:30" integerSymbol="3"/> <condition xsi:type="ocl:OperatorCallExp" location="22:13-22:23" operationName="="> <source xsi:type="ocl:VariableExp" location="22:13-22:17"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/6"/> </source> <arguments xsi:type="ocl:StringExp" location="22:20-22:23" stringSymbol="3"/> </condition> @@ -105,7 +110,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="23:29-23:30" integerSymbol="4"/> <condition xsi:type="ocl:OperatorCallExp" location="23:13-23:23" operationName="="> <source xsi:type="ocl:VariableExp" location="23:13-23:17"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/7"/> </source> <arguments xsi:type="ocl:StringExp" location="23:20-23:23" stringSymbol="4"/> </condition> @@ -113,7 +118,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="24:29-24:30" integerSymbol="5"/> <condition xsi:type="ocl:OperatorCallExp" location="24:13-24:23" operationName="="> <source xsi:type="ocl:VariableExp" location="24:13-24:17"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/8"/> </source> <arguments xsi:type="ocl:StringExp" location="24:20-24:23" stringSymbol="5"/> </condition> @@ -121,7 +126,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="25:29-25:30" integerSymbol="6"/> <condition xsi:type="ocl:OperatorCallExp" location="25:13-25:23" operationName="="> <source xsi:type="ocl:VariableExp" location="25:13-25:17"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/9"/> </source> <arguments xsi:type="ocl:StringExp" location="25:20-25:23" stringSymbol="6"/> </condition> @@ -129,7 +134,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="26:29-26:30" integerSymbol="7"/> <condition xsi:type="ocl:OperatorCallExp" location="26:13-26:23" operationName="="> <source xsi:type="ocl:VariableExp" location="26:13-26:17"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/10"/> </source> <arguments xsi:type="ocl:StringExp" location="26:20-26:23" stringSymbol="7"/> </condition> @@ -137,7 +142,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="27:29-27:30" integerSymbol="8"/> <condition xsi:type="ocl:OperatorCallExp" location="27:13-27:23" operationName="="> <source xsi:type="ocl:VariableExp" location="27:13-27:17"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/11"/> </source> <arguments xsi:type="ocl:StringExp" location="27:20-27:23" stringSymbol="8"/> </condition> @@ -145,7 +150,7 @@ <thenExpression xsi:type="ocl:IntegerExp" location="28:29-28:30" integerSymbol="9"/> <condition xsi:type="ocl:OperatorCallExp" location="28:13-28:23" operationName="="> <source xsi:type="ocl:VariableExp" location="28:13-28:17"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/12"/> </source> <arguments xsi:type="ocl:StringExp" location="28:20-28:23" stringSymbol="9"/> </condition> @@ -162,7 +167,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="18:11-18:26" operationName="="> <source xsi:type="ocl:OperationCallExp" location="18:11-18:22" operationName="size"> <source xsi:type="ocl:VariableExp" location="18:11-18:15"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/3"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="18:25-18:26" integerSymbol="1"/> @@ -172,13 +177,13 @@ <source xsi:type="ocl:OperationCallExp" location="32:5-32:48" operationName="toInteger"> <source xsi:type="ocl:OperationCallExp" location="32:5-32:36" operationName="substring"> <source xsi:type="ocl:VariableExp" location="32:5-32:9"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/13"/> </source> <arguments xsi:type="ocl:IntegerExp" location="32:20-32:21" integerSymbol="1"/> <arguments xsi:type="ocl:OperatorCallExp" location="32:22-32:35" operationName="-"> <source xsi:type="ocl:OperationCallExp" location="32:22-32:33" operationName="size"> <source xsi:type="ocl:VariableExp" location="32:22-32:26"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/14"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="32:34-32:35" integerSymbol="1"/> @@ -190,16 +195,16 @@ <arguments xsi:type="ocl:OperationCallExp" location="32:54-32:105" operationName="toInteger"> <source xsi:type="ocl:OperationCallExp" location="32:54-32:93" operationName="substring"> <source xsi:type="ocl:VariableExp" location="32:54-32:58"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/15"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="32:69-32:80" operationName="size"> <source xsi:type="ocl:VariableExp" location="32:69-32:73"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/16"/> </source> </arguments> <arguments xsi:type="ocl:OperationCallExp" location="32:81-32:92" operationName="size"> <source xsi:type="ocl:VariableExp" location="32:81-32:85"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/17"/> </source> </arguments> </source> @@ -214,6 +219,8 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="36:1-43:8"> + <commentsBefore>-- Helper returning the position of a character or size+1 if the character is not found</commentsBefore> + <commentsAfter>-- Helper returning the given string but free of space</commentsAfter> <definition location="36:8-43:7"> <feature xsi:type="ocl:Operation" location="36:29-43:7" name="indexOf"> <parameters location="36:37-36:50" varName="char" variableExp="//@elements.8/@definition/@feature/@body/@elseExpression/@condition/@arguments.0 //@elements.8/@definition/@feature/@body/@elseExpression/@elseExpression/@arguments.0/@arguments.0"> @@ -225,7 +232,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="37:5-37:20" operationName="="> <source xsi:type="ocl:OperationCallExp" location="37:5-37:16" operationName="size"> <source xsi:type="ocl:VariableExp" location="37:5-37:9"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/18"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="37:19-37:20" integerSymbol="0"/> @@ -235,7 +242,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="39:6-39:32" operationName="="> <source xsi:type="ocl:OperationCallExp" location="39:6-39:25" operationName="substring"> <source xsi:type="ocl:VariableExp" location="39:6-39:10"> - <referredVariable href="temp#/19"/> + <referredVariable href="new-model#/19"/> </source> <arguments xsi:type="ocl:IntegerExp" location="39:21-39:22" integerSymbol="1"/> <arguments xsi:type="ocl:IntegerExp" location="39:23-39:24" integerSymbol="1"/> @@ -247,12 +254,12 @@ <arguments xsi:type="ocl:OperationCallExp" location="41:8-41:51" operationName="indexOf"> <source xsi:type="ocl:OperationCallExp" location="41:8-41:37" operationName="substring"> <source xsi:type="ocl:VariableExp" location="41:8-41:12"> - <referredVariable href="temp#/20"/> + <referredVariable href="new-model#/20"/> </source> <arguments xsi:type="ocl:IntegerExp" location="41:23-41:24" integerSymbol="2"/> <arguments xsi:type="ocl:OperationCallExp" location="41:25-41:36" operationName="size"> <source xsi:type="ocl:VariableExp" location="41:25-41:29"> - <referredVariable href="temp#/21"/> + <referredVariable href="new-model#/21"/> </source> </arguments> </source> @@ -268,17 +275,18 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="46:1-51:20"> + <commentsBefore>-- Helper returning the given string but free of space</commentsBefore> <definition location="46:8-51:19"> <feature xsi:type="ocl:Operation" location="46:28-51:19" name="trim"> <returnType xsi:type="ocl:StringType" location="46:37-46:43"/> <body xsi:type="ocl:IfExp" location="47:2-51:19"> <thenExpression xsi:type="ocl:VariableExp" location="47:26-47:30"> - <referredVariable href="temp#/23"/> + <referredVariable href="new-model#/23"/> </thenExpression> <condition xsi:type="ocl:OperatorCallExp" location="47:5-47:20" operationName="="> <source xsi:type="ocl:OperationCallExp" location="47:5-47:16" operationName="size"> <source xsi:type="ocl:VariableExp" location="47:5-47:9"> - <referredVariable href="temp#/22"/> + <referredVariable href="new-model#/22"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="47:19-47:20" integerSymbol="0"/> @@ -287,12 +295,12 @@ <thenExpression xsi:type="ocl:OperationCallExp" location="48:41-48:77" operationName="trim"> <source xsi:type="ocl:OperationCallExp" location="48:41-48:70" operationName="substring"> <source xsi:type="ocl:VariableExp" location="48:41-48:45"> - <referredVariable href="temp#/25"/> + <referredVariable href="new-model#/25"/> </source> <arguments xsi:type="ocl:IntegerExp" location="48:56-48:57" integerSymbol="2"/> <arguments xsi:type="ocl:OperationCallExp" location="48:58-48:69" operationName="size"> <source xsi:type="ocl:VariableExp" location="48:58-48:62"> - <referredVariable href="temp#/26"/> + <referredVariable href="new-model#/26"/> </source> </arguments> </source> @@ -300,7 +308,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="48:10-48:35" operationName="="> <source xsi:type="ocl:OperationCallExp" location="48:10-48:29" operationName="substring"> <source xsi:type="ocl:VariableExp" location="48:10-48:14"> - <referredVariable href="temp#/24"/> + <referredVariable href="new-model#/24"/> </source> <arguments xsi:type="ocl:IntegerExp" location="48:25-48:26" integerSymbol="1"/> <arguments xsi:type="ocl:IntegerExp" location="48:27-48:28" integerSymbol="1"/> @@ -311,13 +319,13 @@ <thenExpression xsi:type="ocl:OperationCallExp" location="49:61-49:99" operationName="trim"> <source xsi:type="ocl:OperationCallExp" location="49:61-49:92" operationName="substring"> <source xsi:type="ocl:VariableExp" location="49:61-49:65"> - <referredVariable href="temp#/30"/> + <referredVariable href="new-model#/30"/> </source> <arguments xsi:type="ocl:IntegerExp" location="49:76-49:77" integerSymbol="1"/> <arguments xsi:type="ocl:OperatorCallExp" location="49:78-49:91" operationName="-"> <source xsi:type="ocl:OperationCallExp" location="49:78-49:89" operationName="size"> <source xsi:type="ocl:VariableExp" location="49:78-49:82"> - <referredVariable href="temp#/31"/> + <referredVariable href="new-model#/31"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="49:90-49:91" integerSymbol="1"/> @@ -327,23 +335,23 @@ <condition xsi:type="ocl:OperatorCallExp" location="49:10-49:55" operationName="="> <source xsi:type="ocl:OperationCallExp" location="49:10-49:49" operationName="substring"> <source xsi:type="ocl:VariableExp" location="49:10-49:14"> - <referredVariable href="temp#/27"/> + <referredVariable href="new-model#/27"/> </source> <arguments xsi:type="ocl:OperationCallExp" location="49:25-49:36" operationName="size"> <source xsi:type="ocl:VariableExp" location="49:25-49:29"> - <referredVariable href="temp#/28"/> + <referredVariable href="new-model#/28"/> </source> </arguments> <arguments xsi:type="ocl:OperationCallExp" location="49:37-49:48" operationName="size"> <source xsi:type="ocl:VariableExp" location="49:37-49:41"> - <referredVariable href="temp#/29"/> + <referredVariable href="new-model#/29"/> </source> </arguments> </source> <arguments xsi:type="ocl:StringExp" location="49:52-49:55" stringSymbol=" "/> </condition> <elseExpression xsi:type="ocl:VariableExp" location="50:7-50:11"> - <referredVariable href="temp#/32"/> + <referredVariable href="new-model#/32"/> </elseExpression> </elseExpression> </elseExpression> @@ -362,7 +370,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="54:2-54:19" name="ref"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="54:2-54:15" name="Modelref"> <source xsi:type="ocl:VariableExp" location="54:2-54:6"> - <referredVariable href="temp#/33"/> + <referredVariable href="new-model#/34"/> </source> </source> </source> @@ -370,12 +378,14 @@ </feature> <context_ location="53:8-53:28"> <context_ xsi:type="ocl:OclModelElement" location="53:16-53:28" name="Block"> - <model href="temp#/1"/> + <model href="new-model#/33"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="56:1-57:23"> + <commentsAfter>--Un élément model se transforme en System que si la class est "Model" et </commentsAfter> + <commentsAfter>--qu'il n'est pas contenu par un model de class "Automate" ?????.</commentsAfter> <definition location="56:8-57:22"> <feature xsi:type="ocl:Operation" location="56:40-57:22" name="getConnectionNamePort"> <returnType xsi:type="ocl:StringType" location="56:66-56:72"/> @@ -383,7 +393,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="57:2-57:17" name="port"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="57:2-57:12" name="Start"> <source xsi:type="ocl:VariableExp" location="57:2-57:6"> - <referredVariable href="temp#/34"/> + <referredVariable href="new-model#/36"/> </source> </source> </source> @@ -391,12 +401,14 @@ </feature> <context_ location="56:8-56:33"> <context_ xsi:type="ocl:OclModelElement" location="56:16-56:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/35"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="61:1-66:8"> + <commentsBefore>--Un élément model se transforme en System que si la class est "Model" et </commentsBefore> + <commentsBefore>--qu'il n'est pas contenu par un model de class "Automate" ?????.</commentsBefore> <definition location="61:8-66:7"> <feature xsi:type="ocl:Operation" location="61:34-66:7" name="model2systemTransf"> <returnType xsi:type="ocl:BooleanType" location="61:57-61:64"/> @@ -405,13 +417,13 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="62:2-62:18" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="62:2-62:12" name="Class"> <source xsi:type="ocl:VariableExp" location="62:2-62:6"> - <referredVariable href="temp#/35"/> + <referredVariable href="new-model#/38"/> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="62:21-62:37" name="model"> <source xsi:type="ocl:VariableExp" location="62:21-62:31"> - <referredVariable href="temp#/36"/> + <referredVariable href="new-model#/39"/> </source> </arguments> </source> @@ -419,7 +431,7 @@ <thenExpression xsi:type="ocl:BooleanExp" location="64:9-64:13" booleanSymbol="true"/> <condition xsi:type="ocl:OperationCallExp" location="63:5-63:22" operationName="firstModel"> <source xsi:type="ocl:VariableExp" location="63:5-63:9"> - <referredVariable href="temp#/37"/> + <referredVariable href="new-model#/40"/> </source> </condition> <elseExpression xsi:type="ocl:OperatorCallExp" location="65:9-65:61" operationName="<>"> @@ -427,14 +439,14 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="65:9-65:31" name="Class"> <source xsi:type="ocl:OperationCallExp" location="65:9-65:25" operationName="container"> <source xsi:type="ocl:VariableExp" location="65:9-65:13"> - <referredVariable href="temp#/38"/> + <referredVariable href="new-model#/41"/> </source> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="65:41-65:61" name="automaton"> <source xsi:type="ocl:VariableExp" location="65:41-65:51"> - <referredVariable href="temp#/39"/> + <referredVariable href="new-model#/42"/> </source> </arguments> </elseExpression> @@ -443,12 +455,14 @@ </feature> <context_ location="61:8-61:28"> <context_ xsi:type="ocl:OclModelElement" location="61:16-61:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/37"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="68:1-69:57"> + <commentsAfter>--Un élément connection se transforme en flow (quelque soit le type) </commentsAfter> + <commentsAfter>--uniquement s'il n'est pas contenu par un model de class "Automaton"</commentsAfter> <definition location="68:8-69:56"> <feature xsi:type="ocl:Operation" location="68:35-69:56" name="firstModel"> <returnType xsi:type="ocl:BooleanType" location="68:50-68:57"/> @@ -459,7 +473,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="69:2-69:20" name="Model"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="69:2-69:14" name="Package"> <source xsi:type="ocl:VariableExp" location="69:2-69:6"> - <referredVariable href="temp#/40"/> + <referredVariable href="new-model#/44"/> </source> </source> </source> @@ -468,19 +482,22 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="69:49-69:56" name="id"> <source xsi:type="ocl:VariableExp" location="69:49-69:53"> - <referredVariable href="temp#/41"/> + <referredVariable href="new-model#/45"/> </source> </arguments> </body> </feature> <context_ location="68:8-68:28"> <context_ xsi:type="ocl:OclModelElement" location="68:16-68:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/43"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="73:1-74:49"> + <commentsBefore>--Un élément connection se transforme en flow (quelque soit le type) </commentsBefore> + <commentsBefore>--uniquement s'il n'est pas contenu par un model de class "Automaton"</commentsBefore> + <commentsAfter>--Transf. Connection to DataFlow</commentsAfter> <definition location="73:8-74:48"> <feature xsi:type="ocl:Operation" location="73:39-74:48" name="connection2FlowTransf"> <returnType xsi:type="ocl:BooleanType" location="73:64-73:71"/> @@ -489,26 +506,28 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="74:2-74:18" name="Class"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="74:2-74:12" name="Model"> <source xsi:type="ocl:VariableExp" location="74:2-74:6"> - <referredVariable href="temp#/42"/> + <referredVariable href="new-model#/47"/> </source> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="74:28-74:48" name="automaton"> <source xsi:type="ocl:VariableExp" location="74:28-74:38"> - <referredVariable href="temp#/43"/> + <referredVariable href="new-model#/48"/> </source> </arguments> </body> </feature> <context_ location="73:8-73:33"> <context_ xsi:type="ocl:OclModelElement" location="73:16-73:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/46"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="77:1-78:49"> + <commentsBefore>--Transf. Connection to DataFlow</commentsBefore> + <commentsAfter>--Transf. Connection to ControlFlow</commentsAfter> <definition location="77:8-78:48"> <feature xsi:type="ocl:Operation" location="77:40-78:48" name="connection2DataFlowTransf"> <returnType xsi:type="ocl:BooleanType" location="77:70-77:77"/> @@ -518,7 +537,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="78:2-78:17" name="port"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="78:2-78:12" name="Start"> <source xsi:type="ocl:VariableExp" location="78:2-78:6"> - <referredVariable href="temp#/44"/> + <referredVariable href="new-model#/50"/> </source> </source> </source> @@ -526,19 +545,21 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="78:32-78:48" name="event"> <source xsi:type="ocl:VariableExp" location="78:32-78:42"> - <referredVariable href="temp#/45"/> + <referredVariable href="new-model#/51"/> </source> </arguments> </body> </feature> <context_ location="77:8-77:33"> <context_ xsi:type="ocl:OclModelElement" location="77:16-77:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/49"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="81:1-82:48"> + <commentsBefore>--Transf. Connection to ControlFlow</commentsBefore> + <commentsAfter>--Transf. Port to InDataPort</commentsAfter> <definition location="81:8-82:47"> <feature xsi:type="ocl:Operation" location="81:40-82:47" name="connection2ControlFlowTransf"> <returnType xsi:type="ocl:BooleanType" location="81:73-81:80"/> @@ -548,7 +569,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="82:2-82:17" name="port"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="82:2-82:12" name="Start"> <source xsi:type="ocl:VariableExp" location="82:2-82:6"> - <referredVariable href="temp#/46"/> + <referredVariable href="new-model#/53"/> </source> </source> </source> @@ -556,19 +577,21 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="82:31-82:47" name="event"> <source xsi:type="ocl:VariableExp" location="82:31-82:41"> - <referredVariable href="temp#/47"/> + <referredVariable href="new-model#/54"/> </source> </arguments> </body> </feature> <context_ location="81:8-81:33"> <context_ xsi:type="ocl:OclModelElement" location="81:16-81:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/52"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="85:1-86:71"> + <commentsBefore>--Transf. Port to InDataPort</commentsBefore> + <commentsAfter>--Transf. Port to OutDataPort</commentsAfter> <definition location="85:8-86:70"> <feature xsi:type="ocl:Operation" location="85:34-86:70" name="port2InDataPortTransf"> <returnType xsi:type="ocl:BooleanType" location="85:59-85:66"/> @@ -577,7 +600,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="86:2-86:22" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="86:2-86:16" name="Direction"> <source xsi:type="ocl:VariableExp" location="86:2-86:6"> - <referredVariable href="temp#/48"/> + <referredVariable href="new-model#/56"/> </source> </source> </source> @@ -587,13 +610,13 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="86:35-86:50" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="86:35-86:44" name="Type"> <source xsi:type="ocl:VariableExp" location="86:35-86:39"> - <referredVariable href="temp#/49"/> + <referredVariable href="new-model#/57"/> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="86:54-86:70" name="event"> <source xsi:type="ocl:VariableExp" location="86:54-86:64"> - <referredVariable href="temp#/50"/> + <referredVariable href="new-model#/58"/> </source> </arguments> </arguments> @@ -601,12 +624,14 @@ </feature> <context_ location="85:8-85:27"> <context_ xsi:type="ocl:OclModelElement" location="85:16-85:27" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/55"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="89:1-90:72"> + <commentsBefore>--Transf. Port to OutDataPort</commentsBefore> + <commentsAfter>--Transf. Port to InControlPort</commentsAfter> <definition location="89:8-90:71"> <feature xsi:type="ocl:Operation" location="89:34-90:71" name="port2OutDataPortTransf"> <returnType xsi:type="ocl:BooleanType" location="89:60-89:67"/> @@ -615,7 +640,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="90:2-90:22" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="90:2-90:16" name="Direction"> <source xsi:type="ocl:VariableExp" location="90:2-90:6"> - <referredVariable href="temp#/51"/> + <referredVariable href="new-model#/60"/> </source> </source> </source> @@ -625,13 +650,13 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="90:36-90:51" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="90:36-90:45" name="Type"> <source xsi:type="ocl:VariableExp" location="90:36-90:40"> - <referredVariable href="temp#/52"/> + <referredVariable href="new-model#/61"/> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="90:55-90:71" name="event"> <source xsi:type="ocl:VariableExp" location="90:55-90:65"> - <referredVariable href="temp#/53"/> + <referredVariable href="new-model#/62"/> </source> </arguments> </arguments> @@ -639,12 +664,14 @@ </feature> <context_ location="89:8-89:27"> <context_ xsi:type="ocl:OclModelElement" location="89:16-89:27" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/59"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="93:1-94:70"> + <commentsBefore>--Transf. Port to InControlPort</commentsBefore> + <commentsAfter>--Transf. Port to OutControlPort</commentsAfter> <definition location="93:8-94:69"> <feature xsi:type="ocl:Operation" location="93:34-94:69" name="port2InControlPortTransf"> <returnType xsi:type="ocl:BooleanType" location="93:62-93:69"/> @@ -653,7 +680,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="94:2-94:22" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="94:2-94:16" name="Direction"> <source xsi:type="ocl:VariableExp" location="94:2-94:6"> - <referredVariable href="temp#/54"/> + <referredVariable href="new-model#/64"/> </source> </source> </source> @@ -663,13 +690,13 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="94:35-94:50" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="94:35-94:44" name="Type"> <source xsi:type="ocl:VariableExp" location="94:35-94:39"> - <referredVariable href="temp#/55"/> + <referredVariable href="new-model#/65"/> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="94:53-94:69" name="event"> <source xsi:type="ocl:VariableExp" location="94:53-94:63"> - <referredVariable href="temp#/56"/> + <referredVariable href="new-model#/66"/> </source> </arguments> </arguments> @@ -677,12 +704,15 @@ </feature> <context_ location="93:8-93:27"> <context_ xsi:type="ocl:OclModelElement" location="93:16-93:27" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/63"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="97:1-98:71"> + <commentsBefore>--Transf. Port to OutControlPort</commentsBefore> + <commentsAfter>--Un élément model se transforme en objet Automaton si la class de model </commentsAfter> + <commentsAfter>--est "Automaton".</commentsAfter> <definition location="97:8-98:70"> <feature xsi:type="ocl:Operation" location="97:34-98:70" name="port2OutControlPortTransf"> <returnType xsi:type="ocl:BooleanType" location="97:63-97:70"/> @@ -691,7 +721,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="98:2-98:22" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="98:2-98:16" name="Direction"> <source xsi:type="ocl:VariableExp" location="98:2-98:6"> - <referredVariable href="temp#/57"/> + <referredVariable href="new-model#/68"/> </source> </source> </source> @@ -701,13 +731,13 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="98:36-98:51" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="98:36-98:45" name="Type"> <source xsi:type="ocl:VariableExp" location="98:36-98:40"> - <referredVariable href="temp#/58"/> + <referredVariable href="new-model#/69"/> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="98:54-98:70" name="event"> <source xsi:type="ocl:VariableExp" location="98:54-98:64"> - <referredVariable href="temp#/59"/> + <referredVariable href="new-model#/70"/> </source> </arguments> </arguments> @@ -715,12 +745,17 @@ </feature> <context_ location="97:8-97:27"> <context_ xsi:type="ocl:OclModelElement" location="97:16-97:27" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/67"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="102:1-103:42"> + <commentsBefore>--Un élément model se transforme en objet Automaton si la class de model </commentsBefore> + <commentsBefore>--est "Automaton".</commentsBefore> + <commentsAfter>--Un élément model se transforme en objet InitialState si l'élément block </commentsAfter> + <commentsAfter>--qui référence le model est dans un model de class "Automaton" et que </commentsAfter> + <commentsAfter>--l'attribut IsInitial du modelRef du block est mis à "true".</commentsAfter> <definition location="102:8-103:41"> <feature xsi:type="ocl:Operation" location="102:34-103:41" name="model2automatonTransf"> <returnType xsi:type="ocl:BooleanType" location="102:60-102:67"/> @@ -728,25 +763,32 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="103:2-103:18" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="103:2-103:12" name="Class"> <source xsi:type="ocl:VariableExp" location="103:2-103:6"> - <referredVariable href="temp#/60"/> + <referredVariable href="new-model#/72"/> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="103:21-103:41" name="automaton"> <source xsi:type="ocl:VariableExp" location="103:21-103:31"> - <referredVariable href="temp#/61"/> + <referredVariable href="new-model#/73"/> </source> </arguments> </body> </feature> <context_ location="102:8-102:28"> <context_ xsi:type="ocl:OclModelElement" location="102:16-102:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/71"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="108:1-110:207"> + <commentsBefore>--Un élément model se transforme en objet InitialState si l'élément block </commentsBefore> + <commentsBefore>--qui référence le model est dans un model de class "Automaton" et que </commentsBefore> + <commentsBefore>--l'attribut IsInitial du modelRef du block est mis à "true".</commentsBefore> + <commentsAfter>--Un élément model se transforme en objet State si l'élément block qui </commentsAfter> + <commentsAfter>--référence le model est dans un model de class "Automaton" et s'il n'est </commentsAfter> + <commentsAfter>--ni MacroState, ni InitialState (dans la garde, tester les conditions </commentsAfter> + <commentsAfter>--inverses pour s'assurer de l'exclusion des cas).</commentsAfter> <definition location="108:8-110:206"> <feature xsi:type="ocl:Operation" location="108:34-110:206" name="model2initalstateTransf"> <returnType xsi:type="ocl:BooleanType" location="108:62-108:69"/> @@ -756,7 +798,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="109:7-109:25" name="Model"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="109:7-109:19" name="Package"> <source xsi:type="ocl:VariableExp" location="109:7-109:11"> - <referredVariable href="temp#/62"/> + <referredVariable href="new-model#/75"/> </source> </source> </source> @@ -779,7 +821,7 @@ </source> </source> <arguments xsi:type="ocl:VariableExp" location="110:49-110:53"> - <referredVariable href="temp#/63"/> + <referredVariable href="new-model#/76"/> </arguments> </body> <iterators location="110:28-110:29" varName="z" variableExp="//@elements.22/@definition/@feature/@body/@source/@source/@body/@arguments.0/@source/@source/@source/@source/@body/@source/@source/@source"/> @@ -827,12 +869,19 @@ </feature> <context_ location="108:8-108:28"> <context_ xsi:type="ocl:OclModelElement" location="108:16-108:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/74"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="116:1-117:144"> + <commentsBefore>--Un élément model se transforme en objet State si l'élément block qui </commentsBefore> + <commentsBefore>--référence le model est dans un model de class "Automaton" et s'il n'est </commentsBefore> + <commentsBefore>--ni MacroState, ni InitialState (dans la garde, tester les conditions </commentsBefore> + <commentsBefore>--inverses pour s'assurer de l'exclusion des cas).</commentsBefore> + <commentsAfter>--Un élément model se transforme en objet MacroState si l'élément block </commentsAfter> + <commentsAfter>--qui référence le model est dans un model de class "Automaton" et que</commentsAfter> + <commentsAfter>--le block "contient grahiquement" un autre block (position du block contenu dans le rectangle que forme le block/macrostate)</commentsAfter> <definition location="116:8-117:143"> <feature xsi:type="ocl:Operation" location="116:34-117:143" name="model2stateTransf"> <returnType xsi:type="ocl:BooleanType" location="116:56-116:63"/> @@ -842,7 +891,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="117:6-117:24" name="Model"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="117:6-117:18" name="Package"> <source xsi:type="ocl:VariableExp" location="117:6-117:10"> - <referredVariable href="temp#/64"/> + <referredVariable href="new-model#/78"/> </source> </source> </source> @@ -866,7 +915,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="117:110-117:117" name="id"> <source xsi:type="ocl:VariableExp" location="117:110-117:114"> - <referredVariable href="temp#/65"/> + <referredVariable href="new-model#/79"/> </source> </arguments> </body> @@ -882,12 +931,16 @@ </feature> <context_ location="116:8-116:28"> <context_ xsi:type="ocl:OclModelElement" location="116:16-116:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/77"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="122:1-126:44"> + <commentsBefore>--Un élément model se transforme en objet MacroState si l'élément block </commentsBefore> + <commentsBefore>--qui référence le model est dans un model de class "Automaton" et que</commentsBefore> + <commentsBefore>--le block "contient grahiquement" un autre block (position du block contenu dans le rectangle que forme le block/macrostate)</commentsBefore> + <commentsAfter>-- Helper indicating if the state corresponding to the model is included in a macro state or not</commentsAfter> <definition location="122:8-126:43"> <feature xsi:type="ocl:Operation" location="122:35-126:43" name="model2macrostateTransf"> <returnType xsi:type="ocl:BooleanType" location="122:62-122:69"/> @@ -897,7 +950,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="123:6-123:24" name="Model"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="123:6-123:18" name="Package"> <source xsi:type="ocl:VariableExp" location="123:6-123:10"> - <referredVariable href="temp#/66"/> + <referredVariable href="new-model#/81"/> </source> </source> </source> @@ -922,7 +975,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="123:111-123:118" name="id"> <source xsi:type="ocl:VariableExp" location="123:111-123:115"> - <referredVariable href="temp#/67"/> + <referredVariable href="new-model#/82"/> </source> </arguments> </source> @@ -933,6 +986,7 @@ <source xsi:type="ocl:VariableExp" location="123:127-123:128" referredVariable="//@elements.24/@definition/@feature/@body/@source/@source/@iterators.0"/> </source> <body xsi:type="ocl:OperatorCallExp" location="123:147-124:20" operationName="and"> + <commentsAfter>--(c.Position.x > b.Position.x and c.Position.x < (b.Position.x+b.Extent.x) and c.Position.y > b.Position.y and c.Position.y < (b.Position.y+b.Extent.y))</commentsAfter> <source xsi:type="ocl:OperatorCallExp" location="123:147-123:159" operationName="<>"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="123:147-123:151" name="id"> <source xsi:type="ocl:VariableExp" location="123:147-123:148" referredVariable="//@elements.24/@definition/@feature/@body/@source/@source/@body/@arguments.0/@source/@source/@body/@arguments.0/@source/@source/@iterators.0"/> @@ -942,6 +996,7 @@ </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="124:3-124:20" operationName="isIncludedBy"> + <commentsAfter>--(c.Position.x > b.Position.x and c.Position.x < (b.Position.x+b.Extent.x) and c.Position.y > b.Position.y and c.Position.y < (b.Position.y+b.Extent.y))</commentsAfter> <source xsi:type="ocl:VariableExp" location="124:3-124:4" referredVariable="//@elements.24/@definition/@feature/@body/@source/@source/@body/@arguments.0/@source/@source/@body/@arguments.0/@source/@source/@iterators.0"/> <arguments xsi:type="ocl:VariableExp" location="124:18-124:19" referredVariable="//@elements.24/@definition/@feature/@body/@source/@source/@body/@arguments.0/@source/@source/@iterators.0"/> </arguments> @@ -963,22 +1018,25 @@ </feature> <context_ location="122:8-122:28"> <context_ xsi:type="ocl:OclModelElement" location="122:16-122:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/80"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="129:1-133:31"> + <commentsBefore>-- Helper indicating if the state corresponding to the model is included in a macro state or not</commentsBefore> + <commentsAfter>-- This helper indicates if the block is included by the parameter block</commentsAfter> <definition location="129:8-133:30"> <feature xsi:type="ocl:Operation" location="129:35-133:30" name="isStateIncluded"> <returnType xsi:type="ocl:BooleanType" location="129:55-129:62"/> <body xsi:type="ocl:OperatorCallExp" location="131:2-133:30" operationName="not"> + <commentsBefore>-- self.Package.Model->select(a | not(a.Block->select(b| b.Modelref.ref.id = self.id)->isEmpty()))->asSequence()->first().Class.value = 'Automaton' and</commentsBefore> <source xsi:type="ocl:CollectionOperationCallExp" location="131:6-133:29" operationName="isEmpty"> <source xsi:type="ocl:IteratorExp" location="131:6-133:18" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="131:6-131:24" name="Model"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="131:6-131:18" name="Package"> <source xsi:type="ocl:VariableExp" location="131:6-131:10"> - <referredVariable href="temp#/68"/> + <referredVariable href="new-model#/84"/> </source> </source> </source> @@ -999,7 +1057,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="131:80-131:87" name="id"> <source xsi:type="ocl:VariableExp" location="131:80-131:84"> - <referredVariable href="temp#/69"/> + <referredVariable href="new-model#/85"/> </source> </arguments> </source> @@ -1039,17 +1097,19 @@ </feature> <context_ location="129:8-129:28"> <context_ xsi:type="ocl:OclModelElement" location="129:16-129:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/83"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="136:1-137:188"> + <commentsBefore>-- This helper indicates if the block is included by the parameter block</commentsBefore> + <commentsAfter>-- This helper retrieves the model containing the block referencing current model</commentsAfter> <definition location="136:8-137:187"> <feature xsi:type="ocl:Operation" location="136:35-137:187" name="isIncludedBy"> <parameters location="136:48-136:68" varName="macro" variableExp="//@elements.26/@definition/@feature/@body/@source/@source/@source/@arguments.0/@source/@source //@elements.26/@definition/@feature/@body/@source/@source/@arguments.0/@arguments.0/@source/@source/@source //@elements.26/@definition/@feature/@body/@source/@source/@arguments.0/@arguments.0/@arguments.0/@source/@source //@elements.26/@definition/@feature/@body/@source/@arguments.0/@arguments.0/@source/@source //@elements.26/@definition/@feature/@body/@arguments.0/@arguments.0/@source/@source/@source //@elements.26/@definition/@feature/@body/@arguments.0/@arguments.0/@arguments.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="136:56-136:68" name="Block"> - <model href="temp#/1"/> + <model href="new-model#/87"/> </type> </parameters> <returnType xsi:type="ocl:BooleanType" location="136:72-136:79"/> @@ -1060,7 +1120,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:2-137:17" name="x"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:2-137:15" name="Position"> <source xsi:type="ocl:VariableExp" location="137:2-137:6"> - <referredVariable href="temp#/70"/> + <referredVariable href="new-model#/88"/> </source> </source> </source> @@ -1074,7 +1134,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:41-137:56" name="x"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:41-137:54" name="Position"> <source xsi:type="ocl:VariableExp" location="137:41-137:45"> - <referredVariable href="temp#/71"/> + <referredVariable href="new-model#/89"/> </source> </source> </source> @@ -1096,7 +1156,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:97-137:112" name="y"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:97-137:110" name="Position"> <source xsi:type="ocl:VariableExp" location="137:97-137:101"> - <referredVariable href="temp#/72"/> + <referredVariable href="new-model#/90"/> </source> </source> </source> @@ -1111,7 +1171,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:136-137:151" name="y"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="137:136-137:149" name="Position"> <source xsi:type="ocl:VariableExp" location="137:136-137:140"> - <referredVariable href="temp#/73"/> + <referredVariable href="new-model#/91"/> </source> </source> </source> @@ -1132,24 +1192,28 @@ </feature> <context_ location="136:8-136:28"> <context_ xsi:type="ocl:OclModelElement" location="136:16-136:28" name="Block"> - <model href="temp#/1"/> + <model href="new-model#/86"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="140:1-146:8"> + <commentsBefore>-- This helper retrieves the model containing the block referencing current model</commentsBefore> + <commentsAfter>--Un élément connection se transforme en objet Transition s'il est contenu </commentsAfter> + <commentsAfter>--dans un model dont la class est "Automaton".</commentsAfter> <definition location="140:8-146:7"> <feature xsi:type="ocl:Operation" location="140:35-146:7" name="container"> <returnType xsi:type="ocl:OclModelElement" location="140:49-140:61" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/93"/> </returnType> <body xsi:type="ocl:IfExp" location="141:2-146:7"> <thenExpression xsi:type="ocl:CollectionOperationCallExp" location="142:3-142:23" operationName="first"> + <commentsAfter>-- this returns null, in case we are on the root element</commentsAfter> <source xsi:type="ocl:SequenceExp" location="142:3-142:14"/> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="141:5-141:22" operationName="firstModel"> <source xsi:type="ocl:VariableExp" location="141:5-141:9"> - <referredVariable href="temp#/74"/> + <referredVariable href="new-model#/94"/> </source> </condition> <elseExpression xsi:type="ocl:CollectionOperationCallExp" location="144:3-145:40" operationName="first"> @@ -1158,7 +1222,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="144:3-144:21" name="Model"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="144:3-144:15" name="Package"> <source xsi:type="ocl:VariableExp" location="144:3-144:7"> - <referredVariable href="temp#/75"/> + <referredVariable href="new-model#/95"/> </source> </source> </source> @@ -1175,7 +1239,7 @@ </source> </source> <arguments xsi:type="ocl:VariableExp" location="144:74-144:78"> - <referredVariable href="temp#/76"/> + <referredVariable href="new-model#/96"/> </arguments> </body> <iterators location="144:55-144:56" varName="y" variableExp="//@elements.27/@definition/@feature/@body/@elseExpression/@source/@source/@body/@source/@source/@body/@source/@source/@source"/> @@ -1190,12 +1254,14 @@ </feature> <context_ location="140:8-140:28"> <context_ xsi:type="ocl:OclModelElement" location="140:16-140:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/92"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="150:1-151:48"> + <commentsBefore>--Un élément connection se transforme en objet Transition s'il est contenu </commentsBefore> + <commentsBefore>--dans un model dont la class est "Automaton".</commentsBefore> <definition location="150:8-151:47"> <feature xsi:type="ocl:Operation" location="150:39-151:47" name="connection2transitionTransf"> <returnType xsi:type="ocl:BooleanType" location="150:70-150:77"/> @@ -1204,26 +1270,27 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="151:2-151:18" name="Class"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="151:2-151:12" name="Model"> <source xsi:type="ocl:VariableExp" location="151:2-151:6"> - <referredVariable href="temp#/77"/> + <referredVariable href="new-model#/98"/> </source> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="151:27-151:47" name="automaton"> <source xsi:type="ocl:VariableExp" location="151:27-151:37"> - <referredVariable href="temp#/78"/> + <referredVariable href="new-model#/99"/> </source> </arguments> </body> </feature> <context_ location="150:8-150:33"> <context_ xsi:type="ocl:OclModelElement" location="150:16-150:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/97"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="153:1-159:8"> + <commentsAfter>--Property->select(x | x.name = 'connectionName')->asSequence()->first().value.substring(e.Property->select(x | x.name = 'connectionName')->asSequence()->first().value.indexOf('?')+1,e.Property->select(x | x.name = 'connectionName')->asSequence()->first().value.indexOf('!')-1)</commentsAfter> <definition location="153:8-159:7"> <feature xsi:type="ocl:Operation" location="153:35-159:7" name="model2datastoreTransf"> <returnType xsi:type="ocl:BooleanType" location="153:61-153:68"/> @@ -1234,7 +1301,7 @@ <source xsi:type="ocl:OperationCallExp" location="155:6-155:22" operationName="size"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="155:6-155:15" name="name"> <source xsi:type="ocl:VariableExp" location="155:6-155:10"> - <referredVariable href="temp#/81"/> + <referredVariable href="new-model#/103"/> </source> </source> </source> @@ -1244,7 +1311,7 @@ <source xsi:type="ocl:OperationCallExp" location="156:8-156:33" operationName="substring"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="156:8-156:17" name="name"> <source xsi:type="ocl:VariableExp" location="156:8-156:12"> - <referredVariable href="temp#/82"/> + <referredVariable href="new-model#/104"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="156:28-156:29" integerSymbol="1"/> @@ -1257,13 +1324,13 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="154:5-154:21" name="value"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="154:5-154:15" name="Class"> <source xsi:type="ocl:VariableExp" location="154:5-154:9"> - <referredVariable href="temp#/79"/> + <referredVariable href="new-model#/101"/> </source> </source> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="154:24-154:40" name="model"> <source xsi:type="ocl:VariableExp" location="154:24-154:34"> - <referredVariable href="temp#/80"/> + <referredVariable href="new-model#/102"/> </source> </arguments> </condition> @@ -1272,12 +1339,14 @@ </feature> <context_ location="153:8-153:28"> <context_ xsi:type="ocl:OclModelElement" location="153:16-153:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/100"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="162:1-167:8"> + <commentsBefore>--Property->select(x | x.name = 'connectionName')->asSequence()->first().value.substring(e.Property->select(x | x.name = 'connectionName')->asSequence()->first().value.indexOf('?')+1,e.Property->select(x | x.name = 'connectionName')->asSequence()->first().value.indexOf('!')-1)</commentsBefore> + <commentsAfter>--Property->select(x | x.name = thisModule.connection)->asSequence()->first().value.substring(e.Property->select(x | x.name = thisModule.connection)->asSequence()->first().value.indexOf('!')+1,e.Property->select(x | x.name = thisModule.connection)->asSequence()->first().value.size())</commentsAfter> <definition location="162:8-167:7"> <feature xsi:type="ocl:Operation" location="162:40-167:7" name="conditionExtraction"> <returnType xsi:type="ocl:StringType" location="162:64-162:70"/> @@ -1289,7 +1358,7 @@ <source xsi:type="ocl:IteratorExp" location="164:3-164:60" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="164:3-164:16" name="Property"> <source xsi:type="ocl:VariableExp" location="164:3-164:7"> - <referredVariable href="temp#/87"/> + <referredVariable href="new-model#/110"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="164:29-164:59" operationName="="> @@ -1298,7 +1367,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="164:38-164:59" name="connection"> <source xsi:type="ocl:VariableExp" location="164:38-164:48"> - <referredVariable href="temp#/88"/> + <referredVariable href="new-model#/111"/> </source> </arguments> </body> @@ -1315,7 +1384,7 @@ <source xsi:type="ocl:IteratorExp" location="164:100-164:157" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="164:100-164:113" name="Property"> <source xsi:type="ocl:VariableExp" location="164:100-164:104"> - <referredVariable href="temp#/89"/> + <referredVariable href="new-model#/112"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="164:126-164:156" operationName="="> @@ -1324,7 +1393,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="164:135-164:156" name="connection"> <source xsi:type="ocl:VariableExp" location="164:135-164:145"> - <referredVariable href="temp#/90"/> + <referredVariable href="new-model#/113"/> </source> </arguments> </body> @@ -1344,7 +1413,7 @@ <source xsi:type="ocl:IteratorExp" location="164:202-164:259" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="164:202-164:215" name="Property"> <source xsi:type="ocl:VariableExp" location="164:202-164:206"> - <referredVariable href="temp#/91"/> + <referredVariable href="new-model#/114"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="164:228-164:258" operationName="="> @@ -1353,7 +1422,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="164:237-164:258" name="connection"> <source xsi:type="ocl:VariableExp" location="164:237-164:247"> - <referredVariable href="temp#/92"/> + <referredVariable href="new-model#/115"/> </source> </arguments> </body> @@ -1373,7 +1442,7 @@ <source xsi:type="ocl:IteratorExp" location="163:5-163:62" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="163:5-163:18" name="Property"> <source xsi:type="ocl:VariableExp" location="163:5-163:9"> - <referredVariable href="temp#/83"/> + <referredVariable href="new-model#/106"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="163:31-163:61" operationName="="> @@ -1382,7 +1451,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="163:40-163:61" name="connection"> <source xsi:type="ocl:VariableExp" location="163:40-163:50"> - <referredVariable href="temp#/84"/> + <referredVariable href="new-model#/107"/> </source> </arguments> </body> @@ -1403,7 +1472,7 @@ <source xsi:type="ocl:IteratorExp" location="163:111-163:163" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="163:111-163:124" name="Property"> <source xsi:type="ocl:VariableExp" location="163:111-163:115"> - <referredVariable href="temp#/85"/> + <referredVariable href="new-model#/108"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="163:137-163:162" operationName="="> @@ -1426,7 +1495,7 @@ <source xsi:type="ocl:IteratorExp" location="163:208-163:260" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="163:208-163:221" name="Property"> <source xsi:type="ocl:VariableExp" location="163:208-163:212"> - <referredVariable href="temp#/86"/> + <referredVariable href="new-model#/109"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="163:234-163:259" operationName="="> @@ -1450,7 +1519,7 @@ <source xsi:type="ocl:IteratorExp" location="166:3-166:60" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="166:3-166:16" name="Property"> <source xsi:type="ocl:VariableExp" location="166:3-166:7"> - <referredVariable href="temp#/93"/> + <referredVariable href="new-model#/116"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="166:29-166:59" operationName="="> @@ -1459,7 +1528,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="166:38-166:59" name="connection"> <source xsi:type="ocl:VariableExp" location="166:38-166:48"> - <referredVariable href="temp#/94"/> + <referredVariable href="new-model#/117"/> </source> </arguments> </body> @@ -1476,7 +1545,7 @@ <source xsi:type="ocl:IteratorExp" location="166:100-166:157" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="166:100-166:113" name="Property"> <source xsi:type="ocl:VariableExp" location="166:100-166:104"> - <referredVariable href="temp#/95"/> + <referredVariable href="new-model#/118"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="166:126-166:156" operationName="="> @@ -1485,7 +1554,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="166:135-166:156" name="connection"> <source xsi:type="ocl:VariableExp" location="166:135-166:145"> - <referredVariable href="temp#/96"/> + <referredVariable href="new-model#/119"/> </source> </arguments> </body> @@ -1506,7 +1575,7 @@ <source xsi:type="ocl:IteratorExp" location="166:202-166:259" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="166:202-166:215" name="Property"> <source xsi:type="ocl:VariableExp" location="166:202-166:206"> - <referredVariable href="temp#/97"/> + <referredVariable href="new-model#/120"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="166:228-166:258" operationName="="> @@ -1515,7 +1584,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="166:237-166:258" name="connection"> <source xsi:type="ocl:VariableExp" location="166:237-166:247"> - <referredVariable href="temp#/98"/> + <referredVariable href="new-model#/121"/> </source> </arguments> </body> @@ -1533,12 +1602,14 @@ </feature> <context_ location="162:8-162:33"> <context_ xsi:type="ocl:OclModelElement" location="162:16-162:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/105"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="170:1-175:8"> + <commentsBefore>--Property->select(x | x.name = thisModule.connection)->asSequence()->first().value.substring(e.Property->select(x | x.name = thisModule.connection)->asSequence()->first().value.indexOf('!')+1,e.Property->select(x | x.name = thisModule.connection)->asSequence()->first().value.size())</commentsBefore> + <commentsAfter>-- This helper returns a set, but should not contain more than one element.</commentsAfter> <definition location="170:8-175:7"> <feature xsi:type="ocl:Operation" location="170:40-175:7" name="emissionExtraction"> <returnType xsi:type="ocl:StringType" location="170:63-170:69"/> @@ -1553,7 +1624,7 @@ <source xsi:type="ocl:IteratorExp" location="171:5-171:62" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="171:5-171:18" name="Property"> <source xsi:type="ocl:VariableExp" location="171:5-171:9"> - <referredVariable href="temp#/99"/> + <referredVariable href="new-model#/123"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="171:31-171:61" operationName="="> @@ -1562,7 +1633,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="171:40-171:61" name="connection"> <source xsi:type="ocl:VariableExp" location="171:40-171:50"> - <referredVariable href="temp#/100"/> + <referredVariable href="new-model#/124"/> </source> </arguments> </body> @@ -1583,7 +1654,7 @@ <source xsi:type="ocl:IteratorExp" location="171:111-171:168" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="171:111-171:124" name="Property"> <source xsi:type="ocl:VariableExp" location="171:111-171:115"> - <referredVariable href="temp#/101"/> + <referredVariable href="new-model#/125"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="171:137-171:167" operationName="="> @@ -1592,7 +1663,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="171:146-171:167" name="connection"> <source xsi:type="ocl:VariableExp" location="171:146-171:156"> - <referredVariable href="temp#/102"/> + <referredVariable href="new-model#/126"/> </source> </arguments> </body> @@ -1610,7 +1681,7 @@ <source xsi:type="ocl:IteratorExp" location="171:213-171:270" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="171:213-171:226" name="Property"> <source xsi:type="ocl:VariableExp" location="171:213-171:217"> - <referredVariable href="temp#/103"/> + <referredVariable href="new-model#/127"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="171:239-171:269" operationName="="> @@ -1619,7 +1690,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="171:248-171:269" name="connection"> <source xsi:type="ocl:VariableExp" location="171:248-171:258"> - <referredVariable href="temp#/104"/> + <referredVariable href="new-model#/128"/> </source> </arguments> </body> @@ -1638,7 +1709,7 @@ <source xsi:type="ocl:IteratorExp" location="174:3-174:60" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="174:3-174:16" name="Property"> <source xsi:type="ocl:VariableExp" location="174:3-174:7"> - <referredVariable href="temp#/105"/> + <referredVariable href="new-model#/129"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="174:29-174:59" operationName="="> @@ -1647,7 +1718,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="174:38-174:59" name="connection"> <source xsi:type="ocl:VariableExp" location="174:38-174:48"> - <referredVariable href="temp#/106"/> + <referredVariable href="new-model#/130"/> </source> </arguments> </body> @@ -1664,7 +1735,7 @@ <source xsi:type="ocl:IteratorExp" location="174:100-174:157" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="174:100-174:113" name="Property"> <source xsi:type="ocl:VariableExp" location="174:100-174:104"> - <referredVariable href="temp#/107"/> + <referredVariable href="new-model#/131"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="174:126-174:156" operationName="="> @@ -1673,7 +1744,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="174:135-174:156" name="connection"> <source xsi:type="ocl:VariableExp" location="174:135-174:145"> - <referredVariable href="temp#/108"/> + <referredVariable href="new-model#/132"/> </source> </arguments> </body> @@ -1693,7 +1764,7 @@ <source xsi:type="ocl:IteratorExp" location="174:202-174:259" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="174:202-174:215" name="Property"> <source xsi:type="ocl:VariableExp" location="174:202-174:206"> - <referredVariable href="temp#/109"/> + <referredVariable href="new-model#/133"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="174:228-174:258" operationName="="> @@ -1702,7 +1773,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="174:237-174:258" name="connection"> <source xsi:type="ocl:VariableExp" location="174:237-174:247"> - <referredVariable href="temp#/110"/> + <referredVariable href="new-model#/134"/> </source> </arguments> </body> @@ -1717,23 +1788,25 @@ </feature> <context_ location="170:8-170:33"> <context_ xsi:type="ocl:OclModelElement" location="170:16-170:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/122"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="178:1-179:92"> + <commentsBefore>-- This helper returns a set, but should not contain more than one element.</commentsBefore> + <commentsAfter>-- This helper indicates wheter or not a port is contained a multiport.</commentsAfter> <definition location="178:8-179:91"> <feature xsi:type="ocl:Operation" location="178:34-179:91" name="containingMports"> <returnType xsi:type="ocl:SetType" location="178:55-178:72"> <elementType xsi:type="ocl:OclModelElement" location="178:59-178:71" name="Mport"> - <model href="temp#/1"/> + <model href="new-model#/136"/> </elementType> </returnType> <body xsi:type="ocl:IteratorExp" location="179:2-179:91" name="select"> <source xsi:type="ocl:CollectionOperationCallExp" location="179:2-179:30" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="179:2-179:14" name="Mport"> - <model href="temp#/1"/> + <model href="new-model#/137"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="179:43-179:90" operationName=">"> @@ -1747,7 +1820,7 @@ <source xsi:type="ocl:VariableExp" location="179:65-179:66" referredVariable="//@elements.32/@definition/@feature/@body/@body/@source/@source/@iterators.0"/> </source> <arguments xsi:type="ocl:VariableExp" location="179:73-179:77"> - <referredVariable href="temp#/111"/> + <referredVariable href="new-model#/138"/> </arguments> </body> <iterators location="179:61-179:62" varName="r" variableExp="//@elements.32/@definition/@feature/@body/@body/@source/@source/@body/@source/@source"/> @@ -1760,12 +1833,14 @@ </feature> <context_ location="178:8-178:27"> <context_ xsi:type="ocl:OclModelElement" location="178:16-178:27" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/135"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="182:1-183:42"> + <commentsBefore>-- This helper indicates wheter or not a port is contained a multiport.</commentsBefore> + <commentsAfter>-- Check if the Model is a Library</commentsAfter> <definition location="182:8-183:41"> <feature xsi:type="ocl:Operation" location="182:34-183:41" name="isMportContained"> <returnType xsi:type="ocl:BooleanType" location="182:55-182:62"/> @@ -1773,7 +1848,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="183:6-183:40" operationName="isEmpty"> <source xsi:type="ocl:OperationCallExp" location="183:6-183:29" operationName="containingMports"> <source xsi:type="ocl:VariableExp" location="183:6-183:10"> - <referredVariable href="temp#/112"/> + <referredVariable href="new-model#/140"/> </source> </source> </source> @@ -1781,12 +1856,13 @@ </feature> <context_ location="182:8-182:27"> <context_ xsi:type="ocl:OclModelElement" location="182:16-182:27" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/139"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="186:1-194:8"> + <commentsBefore>-- Check if the Model is a Library</commentsBefore> <definition location="186:8-194:7"> <feature xsi:type="ocl:Operation" location="186:35-194:7" name="isLibraryDefined"> <returnType xsi:type="ocl:BooleanType" location="186:56-186:63"/> @@ -1797,7 +1873,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="188:6-188:23" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="188:6-188:18" name="Library"> <source xsi:type="ocl:VariableExp" location="188:6-188:10"> - <referredVariable href="temp#/114"/> + <referredVariable href="new-model#/143"/> </source> </source> </source> @@ -1809,7 +1885,7 @@ <source xsi:type="ocl:OperationCallExp" location="187:9-187:38" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="187:9-187:21" name="Library"> <source xsi:type="ocl:VariableExp" location="187:9-187:13"> - <referredVariable href="temp#/113"/> + <referredVariable href="new-model#/142"/> </source> </source> </source> @@ -1819,7 +1895,7 @@ </feature> <context_ location="186:8-186:28"> <context_ xsi:type="ocl:OclModelElement" location="186:16-186:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/141"/> </context_> </context_> </definition> @@ -1828,15 +1904,15 @@ <definition location="196:8-200:7"> <feature xsi:type="ocl:Operation" location="196:35-200:7" name="modelLibrary"> <returnType xsi:type="ocl:OclModelElement" location="196:52-196:64" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/145"/> </returnType> <body xsi:type="ocl:IfExp" location="197:2-200:7"> <thenExpression xsi:type="ocl:VariableExp" location="198:3-198:7"> - <referredVariable href="temp#/116"/> + <referredVariable href="new-model#/147"/> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="197:5-197:28" operationName="isLibraryDefined"> <source xsi:type="ocl:VariableExp" location="197:5-197:9"> - <referredVariable href="temp#/115"/> + <referredVariable href="new-model#/146"/> </source> </condition> <elseExpression xsi:type="ocl:CollectionOperationCallExp" location="199:7-199:26" operationName="first"> @@ -1846,12 +1922,13 @@ </feature> <context_ location="196:8-196:28"> <context_ xsi:type="ocl:OclModelElement" location="196:16-196:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/144"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="202:1-206:8"> + <commentsAfter>-- Helper for extracting comment when it exists</commentsAfter> <definition location="202:8-206:7"> <feature xsi:type="ocl:Operation" location="202:35-206:7" name="libraryName"> <returnType xsi:type="ocl:StringType" location="202:51-202:57"/> @@ -1859,13 +1936,13 @@ <thenExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="204:3-204:20" name="name"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="204:3-204:15" name="Library"> <source xsi:type="ocl:VariableExp" location="204:3-204:7"> - <referredVariable href="temp#/118"/> + <referredVariable href="new-model#/150"/> </source> </source> </thenExpression> <condition xsi:type="ocl:OperationCallExp" location="203:5-203:28" operationName="isLibraryDefined"> <source xsi:type="ocl:VariableExp" location="203:5-203:9"> - <referredVariable href="temp#/117"/> + <referredVariable href="new-model#/149"/> </source> </condition> <elseExpression xsi:type="ocl:StringExp" location="205:7-205:9" stringSymbol=""/> @@ -1873,12 +1950,14 @@ </feature> <context_ location="202:8-202:28"> <context_ xsi:type="ocl:OclModelElement" location="202:16-202:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/148"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="209:1-216:8"> + <commentsBefore>-- Helper for extracting comment when it exists</commentsBefore> + <commentsAfter>-- Helper for extracting comment when it exists</commentsAfter> <definition location="209:8-216:7"> <feature xsi:type="ocl:Operation" location="209:34-216:7" name="getComment"> <returnType xsi:type="ocl:StringType" location="209:49-209:55"/> @@ -1889,7 +1968,7 @@ <source xsi:type="ocl:IteratorExp" location="212:11-212:65" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="212:11-212:24" name="Property"> <source xsi:type="ocl:VariableExp" location="212:11-212:15"> - <referredVariable href="temp#/122"/> + <referredVariable href="new-model#/155"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="212:37-212:64" operationName="="> @@ -1898,7 +1977,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="212:46-212:64" name="comment"> <source xsi:type="ocl:VariableExp" location="212:46-212:56"> - <referredVariable href="temp#/123"/> + <referredVariable href="new-model#/156"/> </source> </arguments> </body> @@ -1911,7 +1990,7 @@ <source xsi:type="ocl:IteratorExp" location="211:15-211:69" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="211:15-211:28" name="Property"> <source xsi:type="ocl:VariableExp" location="211:15-211:19"> - <referredVariable href="temp#/120"/> + <referredVariable href="new-model#/153"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="211:41-211:68" operationName="="> @@ -1920,7 +1999,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="211:50-211:68" name="comment"> <source xsi:type="ocl:VariableExp" location="211:50-211:60"> - <referredVariable href="temp#/121"/> + <referredVariable href="new-model#/154"/> </source> </arguments> </body> @@ -1934,7 +2013,7 @@ <source xsi:type="ocl:OperationCallExp" location="210:9-210:39" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="210:9-210:22" name="Property"> <source xsi:type="ocl:VariableExp" location="210:9-210:13"> - <referredVariable href="temp#/119"/> + <referredVariable href="new-model#/152"/> </source> </source> </source> @@ -1944,12 +2023,14 @@ </feature> <context_ location="209:8-209:27"> <context_ xsi:type="ocl:OclModelElement" location="209:16-209:27" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/151"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="219:1-226:8"> + <commentsBefore>-- Helper for extracting comment when it exists</commentsBefore> + <commentsAfter>-- Helper for extracting comment when it exists</commentsAfter> <definition location="219:8-226:7"> <feature xsi:type="ocl:Operation" location="219:40-226:7" name="getComment"> <returnType xsi:type="ocl:StringType" location="219:55-219:61"/> @@ -1960,7 +2041,7 @@ <source xsi:type="ocl:IteratorExp" location="222:11-222:65" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="222:11-222:24" name="Property"> <source xsi:type="ocl:VariableExp" location="222:11-222:15"> - <referredVariable href="temp#/127"/> + <referredVariable href="new-model#/161"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="222:37-222:64" operationName="="> @@ -1969,7 +2050,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="222:46-222:64" name="comment"> <source xsi:type="ocl:VariableExp" location="222:46-222:56"> - <referredVariable href="temp#/128"/> + <referredVariable href="new-model#/162"/> </source> </arguments> </body> @@ -1982,7 +2063,7 @@ <source xsi:type="ocl:IteratorExp" location="221:15-221:69" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="221:15-221:28" name="Property"> <source xsi:type="ocl:VariableExp" location="221:15-221:19"> - <referredVariable href="temp#/125"/> + <referredVariable href="new-model#/159"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="221:41-221:68" operationName="="> @@ -1991,7 +2072,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="221:50-221:68" name="comment"> <source xsi:type="ocl:VariableExp" location="221:50-221:60"> - <referredVariable href="temp#/126"/> + <referredVariable href="new-model#/160"/> </source> </arguments> </body> @@ -2005,7 +2086,7 @@ <source xsi:type="ocl:OperationCallExp" location="220:9-220:39" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="220:9-220:22" name="Property"> <source xsi:type="ocl:VariableExp" location="220:9-220:13"> - <referredVariable href="temp#/124"/> + <referredVariable href="new-model#/158"/> </source> </source> </source> @@ -2015,12 +2096,14 @@ </feature> <context_ location="219:8-219:33"> <context_ xsi:type="ocl:OclModelElement" location="219:16-219:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/157"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="229:1-236:8"> + <commentsBefore>-- Helper for extracting comment when it exists</commentsBefore> + <commentsAfter>-- Helper for extracting the priority</commentsAfter> <definition location="229:8-236:7"> <feature xsi:type="ocl:Operation" location="229:35-236:7" name="getComment"> <returnType xsi:type="ocl:StringType" location="229:50-229:56"/> @@ -2031,7 +2114,7 @@ <source xsi:type="ocl:IteratorExp" location="232:11-232:65" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="232:11-232:24" name="Property"> <source xsi:type="ocl:VariableExp" location="232:11-232:15"> - <referredVariable href="temp#/132"/> + <referredVariable href="new-model#/167"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="232:37-232:64" operationName="="> @@ -2040,7 +2123,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="232:46-232:64" name="comment"> <source xsi:type="ocl:VariableExp" location="232:46-232:56"> - <referredVariable href="temp#/133"/> + <referredVariable href="new-model#/168"/> </source> </arguments> </body> @@ -2053,7 +2136,7 @@ <source xsi:type="ocl:IteratorExp" location="231:15-231:69" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="231:15-231:28" name="Property"> <source xsi:type="ocl:VariableExp" location="231:15-231:19"> - <referredVariable href="temp#/130"/> + <referredVariable href="new-model#/165"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="231:41-231:68" operationName="="> @@ -2062,7 +2145,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="231:50-231:68" name="comment"> <source xsi:type="ocl:VariableExp" location="231:50-231:60"> - <referredVariable href="temp#/131"/> + <referredVariable href="new-model#/166"/> </source> </arguments> </body> @@ -2076,7 +2159,7 @@ <source xsi:type="ocl:OperationCallExp" location="230:9-230:39" operationName="oclIsUndefined"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="230:9-230:22" name="Property"> <source xsi:type="ocl:VariableExp" location="230:9-230:13"> - <referredVariable href="temp#/129"/> + <referredVariable href="new-model#/164"/> </source> </source> </source> @@ -2086,12 +2169,14 @@ </feature> <context_ location="229:8-229:28"> <context_ xsi:type="ocl:OclModelElement" location="229:16-229:28" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/163"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="239:1-243:8"> + <commentsBefore>-- Helper for extracting the priority</commentsBefore> + <commentsAfter>-- package to Model</commentsAfter> <definition location="239:8-243:7"> <feature xsi:type="ocl:Operation" location="239:40-243:7" name="getPriority"> <returnType xsi:type="ocl:IntegerType" location="239:57-239:64"/> @@ -2103,7 +2188,7 @@ <source xsi:type="ocl:IteratorExp" location="241:8-241:65" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="241:8-241:21" name="Property"> <source xsi:type="ocl:VariableExp" location="241:8-241:12"> - <referredVariable href="temp#/136"/> + <referredVariable href="new-model#/172"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="241:34-241:64" operationName="="> @@ -2112,7 +2197,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="241:43-241:64" name="connection"> <source xsi:type="ocl:VariableExp" location="241:43-241:53"> - <referredVariable href="temp#/137"/> + <referredVariable href="new-model#/173"/> </source> </arguments> </body> @@ -2128,7 +2213,7 @@ <source xsi:type="ocl:IteratorExp" location="241:94-241:151" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="241:94-241:107" name="Property"> <source xsi:type="ocl:VariableExp" location="241:94-241:98"> - <referredVariable href="temp#/138"/> + <referredVariable href="new-model#/174"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="241:120-241:150" operationName="="> @@ -2137,7 +2222,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="241:129-241:150" name="connection"> <source xsi:type="ocl:VariableExp" location="241:129-241:139"> - <referredVariable href="temp#/139"/> + <referredVariable href="new-model#/175"/> </source> </arguments> </body> @@ -2156,7 +2241,7 @@ <source xsi:type="ocl:IteratorExp" location="240:9-240:66" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="240:9-240:22" name="Property"> <source xsi:type="ocl:VariableExp" location="240:9-240:13"> - <referredVariable href="temp#/134"/> + <referredVariable href="new-model#/170"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="240:35-240:65" operationName="="> @@ -2165,7 +2250,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="240:44-240:65" name="connection"> <source xsi:type="ocl:VariableExp" location="240:44-240:54"> - <referredVariable href="temp#/135"/> + <referredVariable href="new-model#/171"/> </source> </arguments> </body> @@ -2178,32 +2263,36 @@ </feature> <context_ location="239:8-239:33"> <context_ xsi:type="ocl:OclModelElement" location="239:16-239:33" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/169"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="246:1-249:2" name="Package2Model"> + <commentsBefore>-- package to Model</commentsBefore> + <commentsAfter>-- Abstract rule defining Model to System</commentsAfter> <outPattern location="248:2-248:20"> <elements xsi:type="atl:SimpleOutPatternElement" location="248:5-248:20" varName="out"> <type xsi:type="ocl:OclModelElement" location="248:11-248:20" name="Model"> - <model href="temp#/0"/> + <model href="new-model#/177"/> </type> </elements> </outPattern> <inPattern location="247:2-247:25"> <elements xsi:type="atl:SimpleInPatternElement" location="247:7-247:25" varName="p"> <type xsi:type="ocl:OclModelElement" location="247:11-247:25" name="Package"> - <model href="temp#/1"/> + <model href="new-model#/176"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="252:1-260:2" name="Model2System" children="//@elements.43 //@elements.44" isAbstract="true"> + <commentsBefore>-- Abstract rule defining Model to System</commentsBefore> + <commentsAfter>-- First Model to System</commentsAfter> <outPattern location="254:2-259:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="254:5-259:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="254:11-254:21" name="System"> - <model href="temp#/0"/> + <model href="new-model#/179"/> </type> <bindings location="255:3-255:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="255:11-255:17" name="name"> @@ -2230,16 +2319,18 @@ <inPattern location="253:2-253:23"> <elements xsi:type="atl:SimpleInPatternElement" location="253:7-253:23" varName="e" variableExp="//@elements.42/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.42/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.42/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.42/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="253:11-253:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/178"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="263:1-268:2" name="FirstModel2System" superRule="//@elements.42"> + <commentsBefore>-- First Model to System</commentsBefore> + <commentsAfter>-- Other Model to System</commentsAfter> <outPattern location="265:2-267:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="265:5-267:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="265:11-265:21" name="System"> - <model href="temp#/0"/> + <model href="new-model#/182"/> </type> <bindings location="266:3-266:27" propertyName="parentModel"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="266:18-266:27" name="Package"> @@ -2251,7 +2342,7 @@ <inPattern location="264:2-264:77"> <elements xsi:type="atl:SimpleInPatternElement" location="264:7-264:23" varName="e" variableExp="//@elements.43/@inPattern/@filter/@source/@source/@source/@source //@elements.43/@inPattern/@filter/@arguments.0/@source //@elements.43/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="264:11-264:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/180"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="264:25-264:76" operationName="and"> @@ -2263,7 +2354,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="264:41-264:57" name="model"> <source xsi:type="ocl:VariableExp" location="264:41-264:51"> - <referredVariable href="temp#/140"/> + <referredVariable href="new-model#/181"/> </source> </arguments> </source> @@ -2274,10 +2365,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="271:1-276:2" name="OtherModel2System" superRule="//@elements.42"> + <commentsBefore>-- Other Model to System</commentsBefore> + <commentsAfter>-- Abstract rule defining Connection to DataFlow</commentsAfter> <outPattern location="273:2-275:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="273:5-275:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="273:11-273:21" name="System"> - <model href="temp#/0"/> + <model href="new-model#/184"/> </type> <bindings location="274:3-274:133" propertyName="parentSystem"> <value xsi:type="ocl:CollectionOperationCallExp" location="274:19-274:133" operationName="first"> @@ -2320,7 +2413,7 @@ <inPattern location="272:2-272:105"> <elements xsi:type="atl:SimpleInPatternElement" location="272:7-272:23" varName="e" variableExp="//@elements.44/@inPattern/@filter/@source/@source/@source/@source //@elements.44/@inPattern/@filter/@source/@arguments.0/@source //@elements.44/@inPattern/@filter/@arguments.0/@source/@source //@elements.44/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source //@elements.44/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@body/@source/@source/@body/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="272:11-272:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/183"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="272:25-272:104" operationName="and"> @@ -2343,10 +2436,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="279:1-286:2" name="Conn2Flow" children="//@elements.46 //@elements.47" isAbstract="true"> + <commentsBefore>-- Abstract rule defining Connection to DataFlow</commentsBefore> <outPattern location="281:2-285:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="281:5-285:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="281:11-281:19" name="Flow"> - <model href="temp#/0"/> + <model href="new-model#/186"/> </type> <bindings location="282:3-282:26" propertyName="parentSystem"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="282:19-282:26" name="Model"> @@ -2368,7 +2462,7 @@ <inPattern location="280:2-280:97"> <elements xsi:type="atl:SimpleInPatternElement" location="280:7-280:28" varName="e" variableExp="//@elements.45/@inPattern/@filter/@source/@source //@elements.45/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.45/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.45/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.45/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="280:11-280:28" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/185"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="280:30-280:96" operationName="and"> @@ -2389,7 +2483,7 @@ <outPattern location="290:2-293:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="290:5-293:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="290:11-290:23" name="DataFlow"> - <model href="temp#/0"/> + <model href="new-model#/188"/> </type> <bindings location="291:3-291:25" propertyName="source"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="291:13-291:25" name="port"> @@ -2412,7 +2506,7 @@ <inPattern location="289:2-289:60"> <elements xsi:type="atl:SimpleInPatternElement" location="289:7-289:28" varName="e" variableExp="//@elements.46/@inPattern/@filter/@source //@elements.46/@outPattern/@elements.0/@bindings.0/@value/@source/@source //@elements.46/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="289:11-289:28" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/187"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="289:30-289:59" operationName="connection2DataFlowTransf"> @@ -2421,10 +2515,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="296:1-302:2" name="Conn2ControlFlow" superRule="//@elements.45"> + <commentsAfter>--Model to Automaton</commentsAfter> <outPattern location="298:2-301:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="298:5-301:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="298:11-298:26" name="ControlFlow"> - <model href="temp#/0"/> + <model href="new-model#/190"/> </type> <bindings location="299:3-299:25" propertyName="source"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="299:13-299:25" name="port"> @@ -2447,7 +2542,7 @@ <inPattern location="297:2-297:63"> <elements xsi:type="atl:SimpleInPatternElement" location="297:7-297:28" varName="e" variableExp="//@elements.47/@inPattern/@filter/@source //@elements.47/@outPattern/@elements.0/@bindings.0/@value/@source/@source //@elements.47/@outPattern/@elements.0/@bindings.1/@value/@elements.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="297:11-297:28" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/189"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="297:30-297:62" operationName="connection2ControlFlowTransf"> @@ -2456,10 +2551,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="305:1-313:2" name="Model2Automaton" children="//@elements.49 //@elements.50" isAbstract="true"> + <commentsBefore>--Model to Automaton</commentsBefore> <outPattern location="307:2-312:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="307:5-312:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="307:11-307:24" name="Automaton"> - <model href="temp#/0"/> + <model href="new-model#/192"/> </type> <bindings location="308:3-308:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="308:11-308:17" name="name"> @@ -2520,7 +2616,7 @@ <inPattern location="306:2-306:52"> <elements xsi:type="atl:SimpleInPatternElement" location="306:7-306:23" varName="e" variableExp="//@elements.48/@inPattern/@filter/@source //@elements.48/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.48/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.48/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@source //@elements.48/@outPattern/@elements.0/@bindings.2/@value/@body/@source/@source/@source/@source/@source //@elements.48/@outPattern/@elements.0/@bindings.3/@value/@source"> <type xsi:type="ocl:OclModelElement" location="306:11-306:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/191"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="306:25-306:50" operationName="model2automatonTransf"> @@ -2532,7 +2628,7 @@ <outPattern location="317:2-319:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="317:5-319:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="317:11-317:24" name="Automaton"> - <model href="temp#/0"/> + <model href="new-model#/194"/> </type> <bindings location="318:3-318:27" propertyName="parentModel"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="318:18-318:27" name="Package"> @@ -2544,7 +2640,7 @@ <inPattern location="316:2-316:40"> <elements xsi:type="atl:SimpleInPatternElement" location="316:7-316:23" varName="e" variableExp="//@elements.49/@inPattern/@filter/@source //@elements.49/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="316:11-316:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/193"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="316:25-316:39" operationName="firstModel"> @@ -2553,10 +2649,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="322:1-327:2" name="OtherModel2Automaton" superRule="//@elements.48"> + <commentsAfter>-- Connection to Transition</commentsAfter> <outPattern location="324:2-326:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="324:5-326:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="324:11-324:24" name="Automaton"> - <model href="temp#/0"/> + <model href="new-model#/196"/> </type> <bindings location="325:3-325:133" propertyName="parentSystem"> <value xsi:type="ocl:CollectionOperationCallExp" location="325:19-325:133" operationName="first"> @@ -2599,7 +2696,7 @@ <inPattern location="323:2-323:44"> <elements xsi:type="atl:SimpleInPatternElement" location="323:7-323:23" varName="e" variableExp="//@elements.50/@inPattern/@filter/@source/@source //@elements.50/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source //@elements.50/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@body/@source/@source/@body/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="323:11-323:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/195"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="323:25-323:43" operationName="not"> @@ -2610,10 +2707,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="330:1-341:2" name="Conn2Transition"> + <commentsBefore>-- Connection to Transition</commentsBefore> + <commentsAfter>--Model to Composition</commentsAfter> <outPattern location="332:2-340:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="332:5-340:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="332:11-332:25" name="Transition"> - <model href="temp#/0"/> + <model href="new-model#/198"/> </type> <bindings location="333:3-333:29" propertyName="parentAutomaton"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="333:22-333:29" name="Model"> @@ -2667,7 +2766,7 @@ <inPattern location="331:2-331:62"> <elements xsi:type="atl:SimpleInPatternElement" location="331:7-331:28" varName="e" variableExp="//@elements.51/@inPattern/@filter/@source //@elements.51/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.51/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source //@elements.51/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@source //@elements.51/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.51/@outPattern/@elements.0/@bindings.4/@value/@source/@source //@elements.51/@outPattern/@elements.0/@bindings.5/@value/@source/@source //@elements.51/@outPattern/@elements.0/@bindings.6/@value/@source"> <type xsi:type="ocl:OclModelElement" location="331:11-331:28" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/197"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="331:30-331:61" operationName="connection2transitionTransf"> @@ -2676,10 +2775,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="344:1-349:2" name="Composition"> + <commentsBefore>--Model to Composition</commentsBefore> + <commentsAfter>--Model to Decomposition</commentsAfter> <outPattern location="346:2-348:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="346:5-348:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="346:11-346:26" name="Composition"> - <model href="temp#/0"/> + <model href="new-model#/201"/> </type> <bindings location="347:3-347:133" propertyName="parentSystem"> <value xsi:type="ocl:CollectionOperationCallExp" location="347:19-347:133" operationName="first"> @@ -2722,7 +2823,7 @@ <inPattern location="345:2-345:63"> <elements xsi:type="atl:SimpleInPatternElement" location="345:7-345:23" varName="e" variableExp="//@elements.52/@inPattern/@filter/@source/@source/@source //@elements.52/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source //@elements.52/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@body/@source/@source/@body/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="345:11-345:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/199"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="345:25-345:62" operationName="="> @@ -2733,17 +2834,18 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="345:41-345:62" name="convergent"> <source xsi:type="ocl:VariableExp" location="345:41-345:51"> - <referredVariable href="temp#/141"/> + <referredVariable href="new-model#/200"/> </source> </arguments> </filter> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="351:1-356:2" name="Decomposition"> + <commentsBefore>--Model to Decomposition</commentsBefore> <outPattern location="353:2-355:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="353:5-355:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="353:11-353:28" name="Decomposition"> - <model href="temp#/0"/> + <model href="new-model#/204"/> </type> <bindings location="354:3-354:133" propertyName="parentSystem"> <value xsi:type="ocl:CollectionOperationCallExp" location="354:19-354:133" operationName="first"> @@ -2786,7 +2888,7 @@ <inPattern location="352:2-352:62"> <elements xsi:type="atl:SimpleInPatternElement" location="352:7-352:23" varName="e" variableExp="//@elements.53/@inPattern/@filter/@source/@source/@source //@elements.53/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source //@elements.53/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@body/@source/@source/@body/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="352:11-352:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/202"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="352:25-352:61" operationName="="> @@ -2797,7 +2899,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="352:41-352:61" name="divergent"> <source xsi:type="ocl:VariableExp" location="352:41-352:51"> - <referredVariable href="temp#/142"/> + <referredVariable href="new-model#/203"/> </source> </arguments> </filter> @@ -2807,7 +2909,7 @@ <outPattern location="360:2-363:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="360:5-363:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="360:11-360:27" name="InitialState"> - <model href="temp#/0"/> + <model href="new-model#/206"/> </type> <bindings location="361:3-361:90" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="361:11-361:90" name="name"> @@ -2843,7 +2945,7 @@ <inPattern location="359:2-359:53"> <elements xsi:type="atl:SimpleInPatternElement" location="359:7-359:23" varName="e" variableExp="//@elements.54/@inPattern/@filter/@source //@elements.54/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source //@elements.54/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@body/@arguments.0 //@elements.54/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="359:11-359:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/205"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="359:25-359:52" operationName="model2initalstateTransf"> @@ -2855,7 +2957,7 @@ <outPattern location="368:2-371:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="368:5-371:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="368:11-368:20" name="State"> - <model href="temp#/0"/> + <model href="new-model#/208"/> </type> <bindings location="369:3-369:90" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="369:11-369:90" name="name"> @@ -2891,7 +2993,7 @@ <inPattern location="367:2-367:118"> <elements xsi:type="atl:SimpleInPatternElement" location="367:7-367:23" varName="e" variableExp="//@elements.55/@inPattern/@filter/@source/@source/@source //@elements.55/@inPattern/@filter/@source/@arguments.0/@source/@source //@elements.55/@inPattern/@filter/@arguments.0/@source/@source //@elements.55/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source/@source/@source //@elements.55/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@body/@arguments.0 //@elements.55/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="367:11-367:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/207"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="367:25-367:117" operationName="and"> @@ -2917,7 +3019,7 @@ <outPattern location="380:2-385:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="380:5-385:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="380:11-380:25" name="MacroState"> - <model href="temp#/0"/> + <model href="new-model#/212"/> </type> <bindings location="381:3-381:26" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="381:11-381:26" name="name"> @@ -2987,7 +3089,7 @@ </outPattern> <variables location="377:3-377:44" varName="container" variableExp="//@elements.56/@variables.1/@initExpression/@source/@source/@source/@source //@elements.56/@outPattern/@elements.0/@bindings.2/@value/@body/@source/@source/@source/@source //@elements.56/@outPattern/@elements.0/@bindings.2/@value/@body/@source/@source/@body/@arguments.0/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="377:15-377:27" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/210"/> </type> <initExpression xsi:type="ocl:OperationCallExp" location="377:30-377:43" operationName="container"> <source xsi:type="ocl:VariableExp" location="377:30-377:31" referredVariable="//@elements.56/@inPattern/@elements.0"/> @@ -2995,7 +3097,7 @@ </variables> <variables location="378:3-378:100" varName="macroblock" variableExp="//@elements.56/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.56/@outPattern/@elements.0/@bindings.2/@value/@body/@source/@source/@body/@source/@source/@arguments.0 //@elements.56/@outPattern/@elements.0/@bindings.2/@value/@body/@source/@source/@body/@arguments.0/@source/@body/@arguments.0/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="378:16-378:28" name="Block"> - <model href="temp#/1"/> + <model href="new-model#/211"/> </type> <initExpression xsi:type="ocl:CollectionOperationCallExp" location="378:31-378:99" operationName="first"> <source xsi:type="ocl:CollectionOperationCallExp" location="378:31-378:90" operationName="asSequence"> @@ -3019,7 +3121,7 @@ <inPattern location="375:2-375:52"> <elements xsi:type="atl:SimpleInPatternElement" location="375:7-375:23" varName="e" variableExp="//@elements.56/@inPattern/@filter/@source //@elements.56/@variables.0/@initExpression/@source //@elements.56/@variables.1/@initExpression/@source/@source/@body/@arguments.0 //@elements.56/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.56/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="375:11-375:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/209"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="375:25-375:51" operationName="model2macrostateTransf"> @@ -3028,10 +3130,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="388:1-395:2" name="Model2DataStore"> + <commentsAfter>-- Abstract rule defining Port to Port</commentsAfter> <outPattern location="390:2-394:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="390:5-394:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="390:11-390:24" name="DataStore"> - <model href="temp#/0"/> + <model href="new-model#/214"/> </type> <bindings location="391:3-391:32" propertyName="parentSystem"> <value xsi:type="ocl:OperationCallExp" location="391:19-391:32" operationName="container"> @@ -3053,7 +3156,7 @@ <inPattern location="389:2-389:74"> <elements xsi:type="atl:SimpleInPatternElement" location="389:7-389:23" varName="e" variableExp="//@elements.57/@inPattern/@filter/@source/@source/@source //@elements.57/@inPattern/@filter/@arguments.0/@source //@elements.57/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.57/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.57/@outPattern/@elements.0/@bindings.2/@value/@source"> <type xsi:type="ocl:OclModelElement" location="389:11-389:23" name="Model"> - <model href="temp#/1"/> + <model href="new-model#/213"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="389:25-389:73" operationName="and"> @@ -3069,10 +3172,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="398:1-407:2" name="Port2Port" children="//@elements.59 //@elements.60 //@elements.61 //@elements.62" isAbstract="true"> + <commentsBefore>-- Abstract rule defining Port to Port</commentsBefore> <outPattern location="400:2-406:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="400:5-406:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="400:11-400:20" name="IPort"> - <model href="temp#/0"/> + <model href="new-model#/216"/> </type> <bindings location="401:3-401:26" propertyName="parentSystem"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="401:19-401:26" name="Model"> @@ -3090,7 +3194,7 @@ <source xsi:type="ocl:IteratorExp" location="403:14-403:82" name="select"> <source xsi:type="ocl:OperationCallExp" location="403:14-403:46" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="403:14-403:31" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/217"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="403:59-403:81" operationName="="> @@ -3116,7 +3220,7 @@ <source xsi:type="ocl:IteratorExp" location="404:13-404:80" name="select"> <source xsi:type="ocl:OperationCallExp" location="404:13-404:45" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="404:13-404:30" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/218"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="404:58-404:79" operationName="="> @@ -3146,7 +3250,7 @@ <inPattern location="399:2-399:82"> <elements xsi:type="atl:SimpleInPatternElement" location="399:7-399:22" varName="e" variableExp="//@elements.58/@inPattern/@filter/@source/@source/@source //@elements.58/@inPattern/@filter/@arguments.0/@source/@source //@elements.58/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.58/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.58/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@body/@arguments.0/@source //@elements.58/@outPattern/@elements.0/@bindings.3/@value/@source/@source/@body/@arguments.0/@source //@elements.58/@outPattern/@elements.0/@bindings.4/@value/@source"> <type xsi:type="ocl:OclModelElement" location="399:11-399:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/215"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="399:24-399:81" operationName="and"> @@ -3167,14 +3271,14 @@ <outPattern location="411:2-411:27"> <elements xsi:type="atl:SimpleOutPatternElement" location="411:5-411:27" varName="out"> <type xsi:type="ocl:OclModelElement" location="411:11-411:25" name="InDataPort"> - <model href="temp#/0"/> + <model href="new-model#/220"/> </type> </elements> </outPattern> <inPattern location="410:2-410:90"> <elements xsi:type="atl:SimpleInPatternElement" location="410:7-410:22" varName="e" variableExp="//@elements.59/@inPattern/@filter/@source/@source //@elements.59/@inPattern/@filter/@arguments.0/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="410:11-410:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/219"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="410:24-410:89" operationName="and"> @@ -3195,14 +3299,14 @@ <outPattern location="416:2-416:28"> <elements xsi:type="atl:SimpleOutPatternElement" location="416:5-416:28" varName="out"> <type xsi:type="ocl:OclModelElement" location="416:11-416:26" name="OutDataPort"> - <model href="temp#/0"/> + <model href="new-model#/222"/> </type> </elements> </outPattern> <inPattern location="415:2-415:91"> <elements xsi:type="atl:SimpleInPatternElement" location="415:7-415:22" varName="e" variableExp="//@elements.60/@inPattern/@filter/@source/@source //@elements.60/@inPattern/@filter/@arguments.0/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="415:11-415:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/221"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="415:24-415:90" operationName="and"> @@ -3223,14 +3327,14 @@ <outPattern location="421:2-421:30"> <elements xsi:type="atl:SimpleOutPatternElement" location="421:5-421:30" varName="out"> <type xsi:type="ocl:OclModelElement" location="421:11-421:28" name="InControlPort"> - <model href="temp#/0"/> + <model href="new-model#/224"/> </type> </elements> </outPattern> <inPattern location="420:2-420:53"> <elements xsi:type="atl:SimpleInPatternElement" location="420:7-420:22" varName="e" variableExp="//@elements.61/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="420:11-420:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/223"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="420:24-420:52" operationName="port2InControlPortTransf"> @@ -3239,17 +3343,18 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="424:1-427:2" name="Port2OutControlPort" superRule="//@elements.58"> + <commentsAfter>-- Handle MultiPort</commentsAfter> <outPattern location="426:2-426:31"> <elements xsi:type="atl:SimpleOutPatternElement" location="426:5-426:31" varName="out"> <type xsi:type="ocl:OclModelElement" location="426:11-426:29" name="OutControlPort"> - <model href="temp#/0"/> + <model href="new-model#/226"/> </type> </elements> </outPattern> <inPattern location="425:2-425:54"> <elements xsi:type="atl:SimpleInPatternElement" location="425:7-425:22" varName="e" variableExp="//@elements.62/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="425:11-425:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/225"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="425:24-425:53" operationName="port2OutControlPortTransf"> @@ -3258,10 +3363,12 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="430:1-437:2" name="MultiPort"> + <commentsBefore>-- Handle MultiPort</commentsBefore> + <commentsAfter>-- Abstract rule for transforming Port </commentsAfter> <outPattern location="432:2-436:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="432:5-436:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="432:11-432:24" name="MultiPort"> - <model href="temp#/0"/> + <model href="new-model#/228"/> </type> <bindings location="433:3-433:20" propertyName="parent"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="433:13-433:20" name="Model"> @@ -3289,16 +3396,17 @@ <inPattern location="431:2-431:23"> <elements xsi:type="atl:SimpleInPatternElement" location="431:7-431:23" varName="e" variableExp="//@elements.63/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.63/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.63/@outPattern/@elements.0/@bindings.2/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="431:11-431:23" name="Mport"> - <model href="temp#/1"/> + <model href="new-model#/227"/> </type> </elements> </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="440:1-445:2" name="SyncPort2Port" children="//@elements.65 //@elements.66" isAbstract="true"> + <commentsBefore>-- Abstract rule for transforming Port </commentsBefore> <outPattern location="442:2-444:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="442:5-444:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="442:11-442:19" name="Port"> - <model href="temp#/0"/> + <model href="new-model#/232"/> </type> <bindings location="443:3-443:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="443:11-443:17" name="name"> @@ -3310,7 +3418,7 @@ <inPattern location="441:2-441:114"> <elements xsi:type="atl:SimpleInPatternElement" location="441:7-441:22" varName="e" variableExp="//@elements.64/@inPattern/@filter/@source/@source/@source/@source/@source //@elements.64/@inPattern/@filter/@arguments.0/@source/@source/@source/@source //@elements.64/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="441:11-441:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/229"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="441:24-441:113" operationName="or"> @@ -3324,7 +3432,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="441:46-441:66" name="divergent"> <source xsi:type="ocl:VariableExp" location="441:46-441:56"> - <referredVariable href="temp#/143"/> + <referredVariable href="new-model#/230"/> </source> </arguments> </source> @@ -3338,7 +3446,7 @@ </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="441:92-441:113" name="convergent"> <source xsi:type="ocl:VariableExp" location="441:92-441:102"> - <referredVariable href="temp#/144"/> + <referredVariable href="new-model#/231"/> </source> </arguments> </arguments> @@ -3349,7 +3457,7 @@ <outPattern location="449:2-452:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="449:5-452:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="449:11-449:25" name="InDataPort"> - <model href="temp#/0"/> + <model href="new-model#/234"/> </type> <bindings location="450:3-450:24" propertyName="parentSync"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="450:17-450:24" name="Model"> @@ -3362,7 +3470,7 @@ <source xsi:type="ocl:IteratorExp" location="451:13-451:80" name="select"> <source xsi:type="ocl:OperationCallExp" location="451:13-451:45" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="451:13-451:30" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/235"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="451:58-451:79" operationName="="> @@ -3387,7 +3495,7 @@ <inPattern location="448:2-448:50"> <elements xsi:type="atl:SimpleInPatternElement" location="448:7-448:22" varName="e" variableExp="//@elements.65/@inPattern/@filter/@source //@elements.65/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.65/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@body/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="448:11-448:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/233"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="448:24-448:49" operationName="port2InDataPortTransf"> @@ -3396,10 +3504,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="454:1-460:2" name="SyncPort2OutDataPort" superRule="//@elements.64"> + <commentsAfter>-- Abstract rule defining DataStorePort to Port</commentsAfter> <outPattern location="456:2-459:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="456:5-459:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="456:11-456:26" name="OutDataPort"> - <model href="temp#/0"/> + <model href="new-model#/237"/> </type> <bindings location="457:3-457:24" propertyName="parentSync"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="457:17-457:24" name="Model"> @@ -3412,7 +3521,7 @@ <source xsi:type="ocl:IteratorExp" location="458:14-458:82" name="select"> <source xsi:type="ocl:OperationCallExp" location="458:14-458:46" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="458:14-458:31" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/238"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="458:59-458:81" operationName="="> @@ -3437,7 +3546,7 @@ <inPattern location="455:2-455:51"> <elements xsi:type="atl:SimpleInPatternElement" location="455:7-455:22" varName="e" variableExp="//@elements.66/@inPattern/@filter/@source //@elements.66/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.66/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@body/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="455:11-455:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/236"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="455:24-455:50" operationName="port2OutDataPortTransf"> @@ -3446,10 +3555,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="463:1-468:2" name="DataStorePort2Port" children="//@elements.68 //@elements.69" isAbstract="true"> + <commentsBefore>-- Abstract rule defining DataStorePort to Port</commentsBefore> <outPattern location="465:2-467:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="465:5-467:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="465:11-465:25" name="InDataPort"> - <model href="temp#/0"/> + <model href="new-model#/240"/> </type> <bindings location="466:3-466:17" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="466:11-466:17" name="name"> @@ -3461,7 +3571,7 @@ <inPattern location="464:2-464:89"> <elements xsi:type="atl:SimpleInPatternElement" location="464:7-464:22" varName="e" variableExp="//@elements.67/@inPattern/@filter/@source/@source/@source //@elements.67/@inPattern/@filter/@arguments.0/@source/@source //@elements.67/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="464:11-464:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/239"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="464:24-464:88" operationName="and"> @@ -3482,7 +3592,7 @@ <outPattern location="472:2-475:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="472:5-475:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="472:11-472:25" name="InDataPort"> - <model href="temp#/0"/> + <model href="new-model#/242"/> </type> <bindings location="473:3-473:29" propertyName="parentDataStore"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="473:22-473:29" name="Model"> @@ -3495,7 +3605,7 @@ <source xsi:type="ocl:IteratorExp" location="474:13-474:80" name="select"> <source xsi:type="ocl:OperationCallExp" location="474:13-474:45" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="474:13-474:30" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/243"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="474:58-474:79" operationName="="> @@ -3520,7 +3630,7 @@ <inPattern location="471:2-471:50"> <elements xsi:type="atl:SimpleInPatternElement" location="471:7-471:22" varName="e" variableExp="//@elements.68/@inPattern/@filter/@source //@elements.68/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.68/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@body/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="471:11-471:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/241"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="471:24-471:49" operationName="port2InDataPortTransf"> @@ -3529,10 +3639,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="478:1-484:2" name="DataStorePort2OutDataPort" superRule="//@elements.67"> + <commentsAfter>-- Abstract rule to transform Sildex Ports in SAM ports</commentsAfter> <outPattern location="480:2-483:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="480:5-483:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="480:11-480:26" name="OutDataPort"> - <model href="temp#/0"/> + <model href="new-model#/245"/> </type> <bindings location="481:3-481:29" propertyName="parentDataStore"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="481:22-481:29" name="Model"> @@ -3545,7 +3656,7 @@ <source xsi:type="ocl:IteratorExp" location="482:14-482:82" name="select"> <source xsi:type="ocl:OperationCallExp" location="482:14-482:46" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="482:14-482:31" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/246"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="482:59-482:81" operationName="="> @@ -3570,7 +3681,7 @@ <inPattern location="479:2-479:51"> <elements xsi:type="atl:SimpleInPatternElement" location="479:7-479:22" varName="e" variableExp="//@elements.69/@inPattern/@filter/@source //@elements.69/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.69/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@body/@arguments.0/@source"> <type xsi:type="ocl:OclModelElement" location="479:11-479:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/244"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="479:24-479:50" operationName="port2OutDataPortTransf"> @@ -3579,10 +3690,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="487:1-496:2" name="PortsFromMultiPort" children="//@elements.71 //@elements.72 //@elements.73 //@elements.74" isAbstract="true"> + <commentsBefore>-- Abstract rule to transform Sildex Ports in SAM ports</commentsBefore> <outPattern location="489:2-495:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="489:5-495:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="489:11-489:19" name="Port"> - <model href="temp#/0"/> + <model href="new-model#/248"/> </type> <bindings location="490:3-490:65" propertyName="parentMultiPort"> <value xsi:type="ocl:CollectionOperationCallExp" location="490:22-490:65" operationName="first"> @@ -3604,7 +3716,7 @@ <source xsi:type="ocl:IteratorExp" location="492:14-492:82" name="select"> <source xsi:type="ocl:OperationCallExp" location="492:14-492:46" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="492:14-492:31" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/249"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="492:59-492:81" operationName="="> @@ -3630,7 +3742,7 @@ <source xsi:type="ocl:IteratorExp" location="493:13-493:80" name="select"> <source xsi:type="ocl:OperationCallExp" location="493:13-493:45" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="493:13-493:30" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/250"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="493:58-493:79" operationName="="> @@ -3660,7 +3772,7 @@ <inPattern location="488:2-488:45"> <elements xsi:type="atl:SimpleInPatternElement" location="488:7-488:22" varName="e" variableExp="//@elements.70/@inPattern/@filter/@source //@elements.70/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source //@elements.70/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.70/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@body/@arguments.0/@source //@elements.70/@outPattern/@elements.0/@bindings.3/@value/@source/@source/@body/@arguments.0/@source //@elements.70/@outPattern/@elements.0/@bindings.4/@value/@source"> <type xsi:type="ocl:OclModelElement" location="488:11-488:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/247"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="488:24-488:44" operationName="isMportContained"> @@ -3672,14 +3784,14 @@ <outPattern location="500:2-500:27"> <elements xsi:type="atl:SimpleOutPatternElement" location="500:5-500:27" varName="out"> <type xsi:type="ocl:OclModelElement" location="500:11-500:25" name="InDataPort"> - <model href="temp#/0"/> + <model href="new-model#/252"/> </type> </elements> </outPattern> <inPattern location="499:2-499:50"> <elements xsi:type="atl:SimpleInPatternElement" location="499:7-499:22" varName="e" variableExp="//@elements.71/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="499:11-499:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/251"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="499:24-499:49" operationName="port2InDataPortTransf"> @@ -3691,14 +3803,14 @@ <outPattern location="505:2-505:28"> <elements xsi:type="atl:SimpleOutPatternElement" location="505:5-505:28" varName="out"> <type xsi:type="ocl:OclModelElement" location="505:11-505:26" name="OutDataPort"> - <model href="temp#/0"/> + <model href="new-model#/254"/> </type> </elements> </outPattern> <inPattern location="504:2-504:51"> <elements xsi:type="atl:SimpleInPatternElement" location="504:7-504:22" varName="e" variableExp="//@elements.72/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="504:11-504:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/253"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="504:24-504:50" operationName="port2OutDataPortTransf"> @@ -3710,14 +3822,14 @@ <outPattern location="510:2-510:30"> <elements xsi:type="atl:SimpleOutPatternElement" location="510:5-510:30" varName="out"> <type xsi:type="ocl:OclModelElement" location="510:11-510:28" name="InControlPort"> - <model href="temp#/0"/> + <model href="new-model#/256"/> </type> </elements> </outPattern> <inPattern location="509:2-509:53"> <elements xsi:type="atl:SimpleInPatternElement" location="509:7-509:22" varName="e" variableExp="//@elements.73/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="509:11-509:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/255"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="509:24-509:52" operationName="port2InControlPortTransf"> @@ -3726,17 +3838,18 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="513:1-516:2" name="OutControlPortsFromMultiPort" superRule="//@elements.70"> + <commentsAfter>-- Abstract rule defining AutomatonPort to Port</commentsAfter> <outPattern location="515:2-515:31"> <elements xsi:type="atl:SimpleOutPatternElement" location="515:5-515:31" varName="out"> <type xsi:type="ocl:OclModelElement" location="515:11-515:29" name="OutControlPort"> - <model href="temp#/0"/> + <model href="new-model#/258"/> </type> </elements> </outPattern> <inPattern location="514:2-514:54"> <elements xsi:type="atl:SimpleInPatternElement" location="514:7-514:22" varName="e" variableExp="//@elements.74/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="514:11-514:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/257"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="514:24-514:53" operationName="port2OutControlPortTransf"> @@ -3745,10 +3858,11 @@ </inPattern> </elements> <elements xsi:type="atl:MatchedRule" location="520:1-529:2" name="AutomatonPort2Port" children="//@elements.76 //@elements.77 //@elements.78 //@elements.79" isAbstract="true"> + <commentsBefore>-- Abstract rule defining AutomatonPort to Port</commentsBefore> <outPattern location="522:2-528:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="522:5-528:3" varName="out"> <type xsi:type="ocl:OclModelElement" location="522:11-522:19" name="Port"> - <model href="temp#/0"/> + <model href="new-model#/260"/> </type> <bindings location="523:3-523:29" propertyName="parentAutomaton"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="523:22-523:29" name="Model"> @@ -3766,7 +3880,7 @@ <source xsi:type="ocl:IteratorExp" location="525:14-525:82" name="select"> <source xsi:type="ocl:OperationCallExp" location="525:14-525:46" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="525:14-525:31" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/261"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="525:59-525:81" operationName="="> @@ -3792,7 +3906,7 @@ <source xsi:type="ocl:IteratorExp" location="526:13-526:80" name="select"> <source xsi:type="ocl:OperationCallExp" location="526:13-526:45" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="526:13-526:30" name="Connection"> - <model href="temp#/1"/> + <model href="new-model#/262"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="526:58-526:79" operationName="="> @@ -3822,7 +3936,7 @@ <inPattern location="521:2-521:85"> <elements xsi:type="atl:SimpleInPatternElement" location="521:7-521:22" varName="e" variableExp="//@elements.75/@inPattern/@filter/@source/@source/@source //@elements.75/@inPattern/@filter/@arguments.0/@source/@source //@elements.75/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.75/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.75/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@body/@arguments.0/@source //@elements.75/@outPattern/@elements.0/@bindings.3/@value/@source/@source/@body/@arguments.0/@source //@elements.75/@outPattern/@elements.0/@bindings.4/@value/@source"> <type xsi:type="ocl:OclModelElement" location="521:11-521:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/259"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="521:24-521:84" operationName="and"> @@ -3843,14 +3957,14 @@ <outPattern location="533:2-533:27"> <elements xsi:type="atl:SimpleOutPatternElement" location="533:5-533:27" varName="out"> <type xsi:type="ocl:OclModelElement" location="533:11-533:25" name="InDataPort"> - <model href="temp#/0"/> + <model href="new-model#/264"/> </type> </elements> </outPattern> <inPattern location="532:2-532:50"> <elements xsi:type="atl:SimpleInPatternElement" location="532:7-532:22" varName="e" variableExp="//@elements.76/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="532:11-532:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/263"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="532:24-532:49" operationName="port2InDataPortTransf"> @@ -3862,14 +3976,14 @@ <outPattern location="538:2-538:28"> <elements xsi:type="atl:SimpleOutPatternElement" location="538:5-538:28" varName="out"> <type xsi:type="ocl:OclModelElement" location="538:11-538:26" name="OutDataPort"> - <model href="temp#/0"/> + <model href="new-model#/266"/> </type> </elements> </outPattern> <inPattern location="537:2-537:51"> <elements xsi:type="atl:SimpleInPatternElement" location="537:7-537:22" varName="e" variableExp="//@elements.77/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="537:11-537:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/265"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="537:24-537:50" operationName="port2OutDataPortTransf"> @@ -3881,14 +3995,14 @@ <outPattern location="543:2-543:30"> <elements xsi:type="atl:SimpleOutPatternElement" location="543:5-543:30" varName="out"> <type xsi:type="ocl:OclModelElement" location="543:11-543:28" name="InControlPort"> - <model href="temp#/0"/> + <model href="new-model#/268"/> </type> </elements> </outPattern> <inPattern location="542:2-542:53"> <elements xsi:type="atl:SimpleInPatternElement" location="542:7-542:22" varName="e" variableExp="//@elements.78/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="542:11-542:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/267"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="542:24-542:52" operationName="port2InControlPortTransf"> @@ -3900,14 +4014,14 @@ <outPattern location="548:2-548:31"> <elements xsi:type="atl:SimpleOutPatternElement" location="548:5-548:31" varName="out"> <type xsi:type="ocl:OclModelElement" location="548:11-548:29" name="OutControlPort"> - <model href="temp#/0"/> + <model href="new-model#/270"/> </type> </elements> </outPattern> <inPattern location="547:2-547:54"> <elements xsi:type="atl:SimpleInPatternElement" location="547:7-547:22" varName="e" variableExp="//@elements.79/@inPattern/@filter/@source"> <type xsi:type="ocl:OclModelElement" location="547:11-547:22" name="Port"> - <model href="temp#/1"/> + <model href="new-model#/269"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="547:24-547:53" operationName="port2OutControlPortTransf"> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/SpreadsheetMLSimplified2Trace/SpreadsheetMLSimplified2Trace.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/SpreadsheetMLSimplified2Trace/SpreadsheetMLSimplified2Trace.atl.xmi index 6fb7fc53..dec6bd8a 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/SpreadsheetMLSimplified2Trace/SpreadsheetMLSimplified2Trace.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/SpreadsheetMLSimplified2Trace/SpreadsheetMLSimplified2Trace.atl.xmi @@ -1,24 +1,35 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="5:1-106:2" name="SpreadsheetMLSimplified2Trace"> + <commentsBefore>--@atlcompiler atl2006</commentsBefore> + <commentsBefore>--@author Hugo Bruneliere (Hugo.Bruneliere <at> gmail.com)</commentsBefore> <inModels location="6:25-6:53" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="6:8-6:19" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="16:1-30:9"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper indicates if a given row is the beginning of a trace level description</commentsBefore> + <commentsBefore>-- CONTEXT: SpreadsheetMLSimplified!Row</commentsBefore> + <commentsBefore>-- RETURN: Boolean</commentsBefore> + <commentsAfter>-- This helper returns the index of the last row before the next level</commentsAfter> + <commentsAfter>-- CONTEXT: SpreadsheetMLSimplified!Row</commentsAfter> + <commentsAfter>-- RETURN: Integer</commentsAfter> <definition location="16:8-30:8"> <feature xsi:type="ocl:Attribute" location="16:49-30:8" name="isALevelDescriptionBeginning"> <initExpression xsi:type="ocl:LetExp" location="17:2-30:8"> <variable location="17:6-17:70" varName="data" variableExp="//@elements.0/@definition/@feature/@initExpression/@in_/@condition/@source/@source //@elements.0/@definition/@feature/@initExpression/@in_/@thenExpression/@condition/@source/@source //@elements.0/@definition/@feature/@initExpression/@in_/@thenExpression/@thenExpression/@condition/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="17:13-17:41" name="Data"> - <model href="temp#/1"/> + <model href="new-model#/3"/> </type> <initExpression xsi:type="ocl:NavigationOrAttributeCallExp" location="17:44-17:70" name="c_data"> <source xsi:type="ocl:CollectionOperationCallExp" location="17:44-17:63" operationName="at"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="17:44-17:56" name="r_cells"> <source xsi:type="ocl:VariableExp" location="17:44-17:48"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/4"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="17:61-17:62" integerSymbol="1"/> @@ -44,7 +55,7 @@ <source xsi:type="ocl:VariableExp" location="19:7-19:11" referredVariable="//@elements.0/@definition/@feature/@initExpression/@variable"/> </source> <arguments xsi:type="ocl:OclModelElement" location="19:30-19:65" name="StringValue"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </arguments> </condition> <elseExpression xsi:type="ocl:BooleanExp" location="26:5-26:10"/> @@ -61,26 +72,30 @@ </feature> <context_ location="16:8-16:43"> <context_ xsi:type="ocl:OclModelElement" location="16:16-16:43" name="Row"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="35:1-42:9"> + <commentsBefore>-- This helper returns the index of the last row before the next level</commentsBefore> + <commentsBefore>-- CONTEXT: SpreadsheetMLSimplified!Row</commentsBefore> + <commentsBefore>-- RETURN: Integer</commentsBefore> + <commentsAfter>-- This global variable indicates the index of the current level</commentsAfter> <definition location="35:8-42:8"> <feature xsi:type="ocl:Attribute" location="35:49-42:8" name="getIndexOfLastRowBeforeNextLevel"> <initExpression xsi:type="ocl:LetExp" location="36:2-42:8"> <variable location="36:6-37:70" varName="rows" variableExp="//@elements.1/@definition/@feature/@initExpression/@in_/@condition/@source/@source //@elements.1/@definition/@feature/@initExpression/@in_/@condition/@arguments.0/@source //@elements.1/@definition/@feature/@initExpression/@in_/@thenExpression/@source/@arguments.0/@source //@elements.1/@definition/@feature/@initExpression/@in_/@thenExpression/@source/@arguments.0/@arguments.0/@source/@source"> <type xsi:type="ocl:SequenceType" location="36:13-36:50"> <elementType xsi:type="ocl:OclModelElement" location="36:22-36:49" name="Row"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </elementType> </type> <initExpression xsi:type="ocl:IteratorExp" location="37:3-37:70" name="select"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="37:3-37:22" name="t_rows"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="37:3-37:15" name="r_table"> <source xsi:type="ocl:VariableExp" location="37:3-37:7"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/8"/> </source> </source> </source> @@ -96,7 +111,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="39:4-39:23" name="t_rows"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="39:4-39:16" name="r_table"> <source xsi:type="ocl:VariableExp" location="39:4-39:8"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/10"/> </source> </source> </source> @@ -106,7 +121,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="39:42-39:61" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="39:42-39:46" referredVariable="//@elements.1/@definition/@feature/@initExpression/@variable"/> <arguments xsi:type="ocl:VariableExp" location="39:56-39:60"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/11"/> </arguments> </source> <arguments xsi:type="ocl:IntegerExp" location="39:62-39:63" integerSymbol="1"/> @@ -119,7 +134,7 @@ <source xsi:type="ocl:CollectionOperationCallExp" location="38:6-38:25" operationName="indexOf"> <source xsi:type="ocl:VariableExp" location="38:6-38:10" referredVariable="//@elements.1/@definition/@feature/@initExpression/@variable"/> <arguments xsi:type="ocl:VariableExp" location="38:20-38:24"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/9"/> </arguments> </source> <arguments xsi:type="ocl:CollectionOperationCallExp" location="38:29-38:41" operationName="size"> @@ -130,7 +145,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="41:4-41:23" name="t_rows"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="41:4-41:16" name="r_table"> <source xsi:type="ocl:VariableExp" location="41:4-41:8"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/12"/> </source> </source> </source> @@ -138,7 +153,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="41:33-41:52" name="t_rows"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="41:33-41:45" name="r_table"> <source xsi:type="ocl:VariableExp" location="41:33-41:37"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/13"/> </source> </source> </source> @@ -146,7 +161,7 @@ <source xsi:type="ocl:NavigationOrAttributeCallExp" location="41:57-41:76" name="t_rows"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="41:57-41:69" name="r_table"> <source xsi:type="ocl:VariableExp" location="41:57-41:61"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/14"/> </source> </source> </source> @@ -159,12 +174,16 @@ </feature> <context_ location="35:8-35:43"> <context_ xsi:type="ocl:OclModelElement" location="35:16-35:43" name="Row"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="45:1-45:45"> + <commentsBefore>-- This global variable indicates the index of the current level</commentsBefore> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> <definition location="45:8-45:44"> <feature xsi:type="ocl:Attribute" location="45:13-45:44" name="currentLevelIndex"> <initExpression xsi:type="ocl:IntegerExp" location="45:43-45:44" integerSymbol="1"/> @@ -173,10 +192,13 @@ </definition> </elements> <elements xsi:type="atl:MatchedRule" location="52:1-61:2" name="Worksheet2Trace"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> <outPattern location="55:2-60:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="56:3-60:4" varName="t"> <type xsi:type="ocl:OclModelElement" location="56:7-56:18" name="Trace"> - <model href="temp#/0"/> + <model href="new-model#/16"/> </type> <bindings location="57:4-57:19" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="57:12-57:19" name="name"> @@ -198,7 +220,7 @@ </source> <body xsi:type="ocl:OperationCallExp" location="59:23-59:50" operationName="CreateLevel"> <source xsi:type="ocl:VariableExp" location="59:23-59:33"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/17"/> </source> <arguments xsi:type="ocl:VariableExp" location="59:46-59:49" referredVariable="//@elements.3/@outPattern/@elements.0/@bindings.1/@value/@iterators.0"/> </body> @@ -210,7 +232,7 @@ <inPattern location="53:2-54:41"> <elements xsi:type="atl:SimpleInPatternElement" location="54:3-54:41" varName="ew" variableExp="//@elements.3/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.3/@outPattern/@elements.0/@bindings.1/@value/@source/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="54:8-54:41" name="Worksheet"> - <model href="temp#/1"/> + <model href="new-model#/15"/> </type> </elements> </inPattern> @@ -219,7 +241,7 @@ <outPattern location="66:2-71:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="67:3-71:4" varName="l"> <type xsi:type="ocl:OclModelElement" location="67:7-67:18" name="Level"> - <model href="temp#/0"/> + <model href="new-model#/19"/> </type> <bindings location="68:4-70:46" propertyName="calls"> <value xsi:type="ocl:IteratorExp" location="68:13-70:46" name="collect"> @@ -246,7 +268,7 @@ </source> <body xsi:type="ocl:OperationCallExp" location="70:21-70:45" operationName="CreateCall"> <source xsi:type="ocl:VariableExp" location="70:21-70:31"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/20"/> </source> <arguments xsi:type="ocl:VariableExp" location="70:43-70:44" referredVariable="//@elements.4/@outPattern/@elements.0/@bindings.0/@value/@iterators.0"/> </body> @@ -259,7 +281,7 @@ <statements xsi:type="atl:BindingStat" location="73:3-74:27"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="73:3-73:31" name="currentLevelIndex"> <source xsi:type="ocl:VariableExp" location="73:3-73:13"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/21"/> </source> </source> <value xsi:type="ocl:OperatorCallExp" location="73:35-74:26" operationName="+"> @@ -284,7 +306,7 @@ <inPattern location="64:2-65:35"> <elements xsi:type="atl:SimpleInPatternElement" location="65:3-65:35" varName="er" variableExp="//@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source //@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source/@arguments.0/@source/@source/@source/@source //@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source/@arguments.0/@source/@arguments.0 //@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source/@arguments.1/@source //@elements.4/@actionBlock/@statements.0/@value/@source/@source/@source/@source/@source //@elements.4/@actionBlock/@statements.0/@value/@source/@arguments.0"> <type xsi:type="ocl:OclModelElement" location="65:8-65:35" name="Row"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </type> </elements> </inPattern> @@ -293,7 +315,7 @@ <outPattern location="84:2-96:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="85:3-96:4" varName="c"> <type xsi:type="ocl:OclModelElement" location="85:7-85:17" name="Call"> - <model href="temp#/0"/> + <model href="new-model#/24"/> </type> <bindings location="86:4-87:55" propertyName="indexes"> <value xsi:type="ocl:IteratorExp" location="86:15-87:55" name="collect"> @@ -304,13 +326,13 @@ <arguments xsi:type="ocl:IntegerExp" location="86:39-86:40" integerSymbol="1"/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="86:41-86:69" name="currentLevelIndex"> <source xsi:type="ocl:VariableExp" location="86:41-86:51"> - <referredVariable href="temp#/14"/> + <referredVariable href="new-model#/25"/> </source> </arguments> </source> <body xsi:type="ocl:OperationCallExp" location="87:26-87:54" operationName="CreateIndex"> <source xsi:type="ocl:VariableExp" location="87:26-87:36"> - <referredVariable href="temp#/15"/> + <referredVariable href="new-model#/26"/> </source> <arguments xsi:type="ocl:VariableExp" location="87:49-87:53" referredVariable="//@elements.5/@outPattern/@elements.0/@bindings.0/@value/@iterators.0"/> </body> @@ -332,7 +354,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="89:39-89:69" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="89:39-89:67" name="currentLevelIndex"> <source xsi:type="ocl:VariableExp" location="89:39-89:49"> - <referredVariable href="temp#/16"/> + <referredVariable href="new-model#/27"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="89:68-89:69" integerSymbol="2"/> @@ -355,7 +377,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="90:35-90:65" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="90:35-90:63" name="currentLevelIndex"> <source xsi:type="ocl:VariableExp" location="90:35-90:45"> - <referredVariable href="temp#/17"/> + <referredVariable href="new-model#/28"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="90:64-90:65" integerSymbol="3"/> @@ -379,7 +401,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="92:23-92:53" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="92:23-92:51" name="currentLevelIndex"> <source xsi:type="ocl:VariableExp" location="92:23-92:33"> - <referredVariable href="temp#/18"/> + <referredVariable href="new-model#/29"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="92:52-92:53" integerSymbol="4"/> @@ -410,7 +432,7 @@ <arguments xsi:type="ocl:OperatorCallExp" location="82:38-82:68" operationName="+"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="82:38-82:66" name="currentLevelIndex"> <source xsi:type="ocl:VariableExp" location="82:38-82:48"> - <referredVariable href="temp#/13"/> + <referredVariable href="new-model#/23"/> </source> </source> <arguments xsi:type="ocl:IntegerExp" location="82:67-82:68" integerSymbol="1"/> @@ -423,7 +445,7 @@ <inPattern location="79:2-80:35"> <elements xsi:type="atl:SimpleInPatternElement" location="80:3-80:35" varName="er" variableExp="//@elements.5/@variables.0/@initExpression/@source/@source/@source/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.2/@value/@source/@source/@source/@source/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.3/@value/@source/@source/@source/@source/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.4/@value/@thenExpression/@source/@source/@source/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="80:8-80:35" name="Row"> - <model href="temp#/1"/> + <model href="new-model#/22"/> </type> </elements> </inPattern> @@ -432,7 +454,7 @@ <outPattern location="102:2-105:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="103:3-105:4" varName="i"> <type xsi:type="ocl:OclModelElement" location="103:7-103:18" name="Index"> - <model href="temp#/0"/> + <model href="new-model#/31"/> </type> <bindings location="104:4-104:42" propertyName="value"> <value xsi:type="ocl:OperationCallExp" location="104:13-104:42" operationName="round"> @@ -450,7 +472,7 @@ <inPattern location="100:2-101:36"> <elements xsi:type="atl:SimpleInPatternElement" location="101:3-101:36" varName="ec" variableExp="//@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source/@source/@source/@source"> <type xsi:type="ocl:OclModelElement" location="101:8-101:36" name="Cell"> - <model href="temp#/1"/> + <model href="new-model#/30"/> </type> </elements> </inPattern> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/Trace2PerformanceMetrics/Trace2PerformanceMetrics.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/Trace2PerformanceMetrics/Trace2PerformanceMetrics.atl.xmi index 2bbac2b0..276968eb 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/Trace2PerformanceMetrics/Trace2PerformanceMetrics.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/Trace2PerformanceMetrics/Trace2PerformanceMetrics.atl.xmi @@ -1,12 +1,23 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="5:1-124:2" name="Trace2PerformanceMetrics"> + <commentsBefore>--@atlcompiler atl2006</commentsBefore> + <commentsBefore>--@author Hugo Bruneliere (Hugo.Bruneliere <at> gmail.com)</commentsBefore> <inModels location="6:28-6:38" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="6:9-6:22" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="15:1-22:4"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- This helper returns the list of the methods called at a given level </commentsBefore> + <commentsBefore>-- CONTEXT: Trace!Level</commentsBefore> + <commentsBefore>-- RETURN: Sequence(String)</commentsBefore> + <commentsAfter>-- This helper returns the overall list of the methods called</commentsAfter> + <commentsAfter>-- CONTEXT: Trace!Trace</commentsAfter> + <commentsAfter>-- RETURN: Sequence(String)</commentsAfter> <definition location="15:8-22:3"> <feature xsi:type="ocl:Operation" location="15:33-22:3" name="getMethodsList"> <returnType xsi:type="ocl:SequenceType" location="15:52-15:68"> @@ -15,7 +26,7 @@ <body xsi:type="ocl:IterateExp" location="16:2-22:3"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="16:2-16:12" name="calls"> <source xsi:type="ocl:VariableExp" location="16:2-16:6"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/3"/> </source> </source> <body xsi:type="ocl:IfExp" location="17:3-21:8"> @@ -52,12 +63,15 @@ </feature> <context_ location="15:8-15:27"> <context_ xsi:type="ocl:OclModelElement" location="15:16-15:27" name="Level"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="27:1-28:67"> + <commentsBefore>-- This helper returns the overall list of the methods called</commentsBefore> + <commentsBefore>-- CONTEXT: Trace!Trace</commentsBefore> + <commentsBefore>-- RETURN: Sequence(String)</commentsBefore> <definition location="27:8-28:66"> <feature xsi:type="ocl:Operation" location="27:33-28:66" name="getMethodsList"> <returnType xsi:type="ocl:SequenceType" location="27:52-27:68"> @@ -68,7 +82,7 @@ <source xsi:type="ocl:IteratorExp" location="28:2-28:46" name="collect"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="28:2-28:13" name="levels"> <source xsi:type="ocl:VariableExp" location="28:2-28:6"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/5"/> </source> </source> <body xsi:type="ocl:OperationCallExp" location="28:27-28:45" operationName="getMethodsList"> @@ -81,12 +95,15 @@ </feature> <context_ location="27:8-27:27"> <context_ xsi:type="ocl:OclModelElement" location="27:16-27:27" name="Trace"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="30:1-30:57"> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> <definition location="30:8-30:56"> <feature xsi:type="ocl:Attribute" location="30:13-30:56" name="methodsList"> <initExpression xsi:type="ocl:SequenceExp" location="30:46-30:56"/> @@ -97,10 +114,13 @@ </definition> </elements> <elements xsi:type="atl:MatchedRule" location="37:1-88:2" name="MetricsBuilding"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> <outPattern location="46:2-55:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="47:3-49:4" varName="mDBAccesses" variableExp="//@elements.3/@actionBlock/@statements.1/@statements.1/@source/@source //@elements.3/@actionBlock/@statements.1/@statements.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="47:17-47:31" name="Metric"> - <model href="temp#/0"/> + <model href="new-model#/7"/> </type> <bindings location="48:4-48:53" propertyName="name"> <value xsi:type="ocl:StringExp" location="48:12-48:53" stringSymbol="Average number of DB accesses by method"/> @@ -108,7 +128,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="50:3-52:4" varName="mDBRows" variableExp="//@elements.3/@actionBlock/@statements.1/@statements.2/@source/@source //@elements.3/@actionBlock/@statements.1/@statements.2/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="50:13-50:27" name="Metric"> - <model href="temp#/0"/> + <model href="new-model#/8"/> </type> <bindings location="51:4-51:57" propertyName="name"> <value xsi:type="ocl:StringExp" location="51:12-51:57" stringSymbol="Average number of DB rows handled by method"/> @@ -116,7 +136,7 @@ </elements> <elements xsi:type="atl:SimpleOutPatternElement" location="53:3-55:4" varName="mCPU" variableExp="//@elements.3/@actionBlock/@statements.1/@statements.3/@source/@source //@elements.3/@actionBlock/@statements.1/@statements.3/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="53:10-53:24" name="Metric"> - <model href="temp#/0"/> + <model href="new-model#/9"/> </type> <bindings location="54:4-54:45" propertyName="name"> <value xsi:type="ocl:StringExp" location="54:12-54:45" stringSymbol="Average CPU time used by method"/> @@ -127,7 +147,7 @@ <statements xsi:type="atl:BindingStat" location="57:3-57:48"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="57:3-57:25" name="methodsList"> <source xsi:type="ocl:VariableExp" location="57:3-57:13"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/10"/> </source> </source> <value xsi:type="ocl:OperationCallExp" location="57:29-57:47" operationName="getMethodsList"> @@ -138,7 +158,7 @@ <iterator location="58:7-58:17" varName="methodName" variableExp="//@elements.3/@actionBlock/@statements.1/@statements.0/@statements.0/@statements.0/@condition/@arguments.0 //@elements.3/@actionBlock/@statements.1/@statements.1/@value/@arguments.0/@elements.0/@arguments.0 //@elements.3/@actionBlock/@statements.1/@statements.2/@value/@arguments.0/@elements.0/@arguments.0 //@elements.3/@actionBlock/@statements.1/@statements.3/@value/@arguments.0/@elements.0/@arguments.0"/> <collection xsi:type="ocl:NavigationOrAttributeCallExp" location="58:21-58:43" name="methodsList"> <source xsi:type="ocl:VariableExp" location="58:21-58:31"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/11"/> </source> </collection> <statements xsi:type="atl:ForStat" location="60:4-69:5"> @@ -206,7 +226,7 @@ <arguments xsi:type="ocl:SequenceExp" location="70:52-73:16"> <elements xsi:type="ocl:OperationCallExp" location="71:15-72:59" operationName="CreateAverageNbOfDbAccessesMetricValue"> <source xsi:type="ocl:VariableExp" location="71:15-71:25"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/12"/> </source> <arguments xsi:type="ocl:VariableExp" location="71:65-71:75" referredVariable="//@elements.3/@actionBlock/@statements.1/@iterator"/> <arguments xsi:type="ocl:VariableExp" location="72:18-72:37" referredVariable="//@elements.3/@variables.1"/> @@ -226,7 +246,7 @@ <arguments xsi:type="ocl:SequenceExp" location="74:44-77:16"> <elements xsi:type="ocl:OperationCallExp" location="75:15-76:55" operationName="CreateAverageNbOfDbRowsMetricValue"> <source xsi:type="ocl:VariableExp" location="75:15-75:25"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/13"/> </source> <arguments xsi:type="ocl:VariableExp" location="75:61-75:71" referredVariable="//@elements.3/@actionBlock/@statements.1/@iterator"/> <arguments xsi:type="ocl:VariableExp" location="76:18-76:33" referredVariable="//@elements.3/@variables.2"/> @@ -246,7 +266,7 @@ <arguments xsi:type="ocl:SequenceExp" location="78:38-81:16"> <elements xsi:type="ocl:OperationCallExp" location="79:15-80:52" operationName="CreateAverageCPUTimeMetricValue"> <source xsi:type="ocl:VariableExp" location="79:15-79:25"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/14"/> </source> <arguments xsi:type="ocl:VariableExp" location="79:58-79:68" referredVariable="//@elements.3/@actionBlock/@statements.1/@iterator"/> <arguments xsi:type="ocl:VariableExp" location="80:18-80:30" referredVariable="//@elements.3/@variables.3"/> @@ -292,7 +312,7 @@ <inPattern location="38:2-39:18"> <elements xsi:type="atl:SimpleInPatternElement" location="39:3-39:18" varName="t" variableExp="//@elements.3/@actionBlock/@statements.0/@value/@source //@elements.3/@actionBlock/@statements.1/@statements.0/@collection/@source"> <type xsi:type="ocl:OclModelElement" location="39:7-39:18" name="Trace"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </type> </elements> </inPattern> @@ -301,7 +321,7 @@ <outPattern location="92:2-96:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="93:3-96:4" varName="mv" variableExp="//@elements.4/@actionBlock/@statements.0/@expression"> <type xsi:type="ocl:OclModelElement" location="93:8-93:34" name="IntegerMetricValue"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> <bindings location="94:4-94:21" propertyName="tag"> <value xsi:type="ocl:VariableExp" location="94:11-94:21" referredVariable="//@elements.4/@parameters.0"/> @@ -335,7 +355,7 @@ <outPattern location="104:2-108:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="105:3-108:4" varName="mv" variableExp="//@elements.5/@actionBlock/@statements.0/@expression"> <type xsi:type="ocl:OclModelElement" location="105:8-105:34" name="IntegerMetricValue"> - <model href="temp#/0"/> + <model href="new-model#/16"/> </type> <bindings location="106:4-106:21" propertyName="tag"> <value xsi:type="ocl:VariableExp" location="106:11-106:21" referredVariable="//@elements.5/@parameters.0"/> @@ -369,7 +389,7 @@ <outPattern location="116:2-120:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="117:3-120:4" varName="mv" variableExp="//@elements.6/@actionBlock/@statements.0/@expression"> <type xsi:type="ocl:OclModelElement" location="117:8-117:34" name="IntegerMetricValue"> - <model href="temp#/0"/> + <model href="new-model#/17"/> </type> <bindings location="118:4-118:21" propertyName="tag"> <value xsi:type="ocl:VariableExp" location="118:11-118:21" referredVariable="//@elements.6/@parameters.0"/> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/Trace2PerformanceMetrics/TraceSamples-Metrics.ecore b/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/Trace2PerformanceMetrics/TraceSamples-Metrics.ecore index 812a9b30..2867ed7f 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/Trace2PerformanceMetrics/TraceSamples-Metrics.ecore +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/Trace2PerformanceMetrics/TraceSamples-Metrics.ecore @@ -3,26 +3,26 @@ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="Metrics"> <Metric name="Average number of DB accesses by method"> + <values xsi:type="IntegerMetricValue" tag="Cancel" value="0"/> <values xsi:type="IntegerMetricValue" tag="Select Order" value="3"/> <values xsi:type="IntegerMetricValue" tag="Delete Order" value="0"/> <values xsi:type="IntegerMetricValue" tag="Update Order" value="0"/> - <values xsi:type="IntegerMetricValue" tag="Cancel" value="0"/> <values xsi:type="IntegerMetricValue" tag="Validate" value="1"/> <values xsi:type="IntegerMetricValue" tag="Create New Order" value="0"/> </Metric> <Metric name="Average number of DB rows handled by method"> + <values xsi:type="IntegerMetricValue" tag="Cancel" value="0"/> <values xsi:type="IntegerMetricValue" tag="Select Order" value="3761"/> <values xsi:type="IntegerMetricValue" tag="Delete Order" value="0"/> <values xsi:type="IntegerMetricValue" tag="Update Order" value="0"/> - <values xsi:type="IntegerMetricValue" tag="Cancel" value="0"/> <values xsi:type="IntegerMetricValue" tag="Validate" value="1115"/> <values xsi:type="IntegerMetricValue" tag="Create New Order" value="0"/> </Metric> <Metric name="Average CPU time used by method"> + <values xsi:type="IntegerMetricValue" tag="Cancel" value="469"/> <values xsi:type="IntegerMetricValue" tag="Select Order" value="11385"/> <values xsi:type="IntegerMetricValue" tag="Delete Order" value="4928"/> <values xsi:type="IntegerMetricValue" tag="Update Order" value="11978"/> - <values xsi:type="IntegerMetricValue" tag="Cancel" value="469"/> <values xsi:type="IntegerMetricValue" tag="Validate" value="9719"/> <values xsi:type="IntegerMetricValue" tag="Create New Order" value="8184"/> </Metric> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/UMLStateChart2PerformanceAnnotatedUMLStateChart/UMLStateChart2PerformanceAnnotatedUMLStateChart.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/UMLStateChart2PerformanceAnnotatedUMLStateChart/UMLStateChart2PerformanceAnnotatedUMLStateChart.atl.xmi index f2a040db..422d04e6 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/UMLStateChart2PerformanceAnnotatedUMLStateChart/UMLStateChart2PerformanceAnnotatedUMLStateChart.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/SpreadSheetML2PerformanceUMLStateChart/UMLStateChart2PerformanceAnnotatedUMLStateChart/UMLStateChart2PerformanceAnnotatedUMLStateChart.atl.xmi @@ -1,18 +1,23 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="5:1-95:2" name="UMLStateChart2PerformanceAnnotatedUMLStateChart"> + <commentsBefore>-- @atlcompiler atl2006</commentsBefore> + <commentsBefore>-- @author Hugo Bruneliere (Hugo.Bruneliere <at> gmail.com)</commentsBefore> <inModels location="6:24-6:33" name="IN"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/1"/> </inModels> <inModels location="6:35-6:45" name="PRO"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/2"/> </inModels> <inModels location="6:47-6:59" name="ME"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/3"/> </inModels> <outModels location="6:8-6:18" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="13:1-14:82"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> <definition location="13:8-14:81"> <feature xsi:type="ocl:Operation" location="13:13-14:81" name="isStereotypeNeeded"> <parameters location="13:32-13:54" varName="operationName" variableExp="//@elements.0/@definition/@feature/@body/@source/@body/@arguments.0"> @@ -23,7 +28,7 @@ <source xsi:type="ocl:IteratorExp" location="14:2-14:69" name="select"> <source xsi:type="ocl:OperationCallExp" location="14:2-14:36" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="14:2-14:21" name="MetricValue"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="14:49-14:68" operationName="="> @@ -53,7 +58,7 @@ <source xsi:type="ocl:IteratorExp" location="17:2-17:93" name="select"> <source xsi:type="ocl:OperationCallExp" location="17:2-17:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="17:2-17:16" name="Metric"> - <model href="temp#/1"/> + <model href="new-model#/5"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="17:44-17:92" operationName="="> @@ -94,7 +99,7 @@ <source xsi:type="ocl:IteratorExp" location="21:2-21:97" name="select"> <source xsi:type="ocl:OperationCallExp" location="21:2-21:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="21:2-21:16" name="Metric"> - <model href="temp#/1"/> + <model href="new-model#/6"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="21:44-21:96" operationName="="> @@ -135,7 +140,7 @@ <source xsi:type="ocl:IteratorExp" location="25:2-25:85" name="select"> <source xsi:type="ocl:OperationCallExp" location="25:2-25:31" operationName="allInstances"> <source xsi:type="ocl:OclModelElement" location="25:2-25:16" name="Metric"> - <model href="temp#/1"/> + <model href="new-model#/7"/> </source> </source> <body xsi:type="ocl:OperatorCallExp" location="25:44-25:84" operationName="="> @@ -162,20 +167,26 @@ </definition> </elements> <elements xsi:type="atl:Helper" location="28:1-28:75"> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------</commentsAfter> <definition location="28:8-28:74"> <feature xsi:type="ocl:Attribute" location="28:13-28:74" name="servicePerformanceStereotype"> <initExpression xsi:type="ocl:OclUndefinedExp" location="28:62-28:74"/> <type xsi:type="ocl:OclModelElement" location="28:44-28:59" name="Stereotype"> - <model href="temp#/0"/> + <model href="new-model#/8"/> </type> </feature> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="35:1-60:2" name="Model"> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------</commentsBefore> <outPattern location="37:5-53:52"> <elements xsi:type="atl:SimpleOutPatternElement" location="37:8-53:52" varName="t" variableExp="//@elements.5/@actionBlock/@statements.0/@expression/@source" sourceElement="//@elements.5/@inPattern/@elements.0"> <type xsi:type="ocl:OclModelElement" location="37:12-37:29" name="uml::Model"> - <model href="temp#/0"/> + <model href="new-model#/11"/> </type> <bindings location="38:9-38:23" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="38:17-38:23" name="name"> @@ -267,7 +278,7 @@ <source xsi:type="ocl:IteratorExp" location="55:18-55:90" name="select"> <source xsi:type="ocl:OperationCallExp" location="55:18-55:54" operationName="allInstancesFrom"> <source xsi:type="ocl:OclModelElement" location="55:18-55:30" name="Profile"> - <model href="temp#/0"/> + <model href="new-model#/12"/> </source> <arguments xsi:type="ocl:StringExp" location="55:48-55:53" stringSymbol="PRO"/> </source> @@ -285,7 +296,7 @@ <statements xsi:type="atl:BindingStat" location="56:3-58:80"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="56:3-56:42" name="servicePerformanceStereotype"> <source xsi:type="ocl:VariableExp" location="56:3-56:13"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/13"/> </source> </source> <value xsi:type="ocl:CollectionOperationCallExp" location="57:4-58:79" operationName="first"> @@ -295,7 +306,7 @@ <source xsi:type="ocl:IteratorExp" location="57:4-57:74" name="select"> <source xsi:type="ocl:OperationCallExp" location="57:4-57:40" operationName="allInstancesFrom"> <source xsi:type="ocl:OclModelElement" location="57:4-57:16" name="Profile"> - <model href="temp#/0"/> + <model href="new-model#/14"/> </source> <arguments xsi:type="ocl:StringExp" location="57:34-57:39" stringSymbol="PRO"/> </source> @@ -323,13 +334,13 @@ <inPattern location="36:5-36:68"> <elements xsi:type="atl:SimpleInPatternElement" location="36:10-36:31" varName="s" variableExp="//@elements.5/@inPattern/@filter/@arguments.0 //@elements.5/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.5/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.6/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.7/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.8/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.9/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.10/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.11/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.12/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.13/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.14/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.15/@value/@source" mapsTo="//@elements.5/@outPattern/@elements.0"> <type xsi:type="ocl:OclModelElement" location="36:14-36:31" name="uml::Model"> - <model href="temp#/0"/> + <model href="new-model#/9"/> </type> </elements> <filter xsi:type="ocl:CollectionOperationCallExp" location="36:33-36:67" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="36:33-36:54" name="inElements"> <source xsi:type="ocl:VariableExp" location="36:33-36:43"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/10"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="36:65-36:66" referredVariable="//@elements.5/@inPattern/@elements.0"/> @@ -340,7 +351,7 @@ <outPattern location="65:5-86:28"> <elements xsi:type="atl:SimpleOutPatternElement" location="65:8-86:28" varName="t" variableExp="//@elements.6/@actionBlock/@statements.0/@thenStatements.0/@expression/@source //@elements.6/@actionBlock/@statements.0/@thenStatements.1/@expression/@source //@elements.6/@actionBlock/@statements.0/@thenStatements.2/@expression/@source //@elements.6/@actionBlock/@statements.0/@thenStatements.3/@expression/@source" sourceElement="//@elements.6/@inPattern/@elements.0"> <type xsi:type="ocl:OclModelElement" location="65:12-65:43" name="uml::CallOperationAction"> - <model href="temp#/0"/> + <model href="new-model#/17"/> </type> <bindings location="66:9-66:23" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="66:17-66:23" name="name"> @@ -453,7 +464,7 @@ <statements xsi:type="atl:IfStat" location="88:3-93:4"> <condition xsi:type="ocl:OperationCallExp" location="88:7-88:44" operationName="isStereotypeNeeded"> <source xsi:type="ocl:VariableExp" location="88:7-88:17"> - <referredVariable href="temp#/5"/> + <referredVariable href="new-model#/18"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="88:37-88:43" name="name"> <source xsi:type="ocl:VariableExp" location="88:37-88:38" referredVariable="//@elements.6/@inPattern/@elements.0"/> @@ -464,7 +475,7 @@ <source xsi:type="ocl:VariableExp" location="89:4-89:5" referredVariable="//@elements.6/@outPattern/@elements.0"/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="89:22-89:61" name="servicePerformanceStereotype"> <source xsi:type="ocl:VariableExp" location="89:22-89:32"> - <referredVariable href="temp#/6"/> + <referredVariable href="new-model#/19"/> </source> </arguments> </expression> @@ -474,13 +485,13 @@ <source xsi:type="ocl:VariableExp" location="90:4-90:5" referredVariable="//@elements.6/@outPattern/@elements.0"/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="90:15-90:54" name="servicePerformanceStereotype"> <source xsi:type="ocl:VariableExp" location="90:15-90:25"> - <referredVariable href="temp#/7"/> + <referredVariable href="new-model#/20"/> </source> </arguments> <arguments xsi:type="ocl:StringExp" location="90:55-90:65" stringSymbol="DBAccess"/> <arguments xsi:type="ocl:OperationCallExp" location="90:66-90:98" operationName="getNbDBAccess"> <source xsi:type="ocl:VariableExp" location="90:66-90:76"> - <referredVariable href="temp#/8"/> + <referredVariable href="new-model#/21"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="90:91-90:97" name="name"> <source xsi:type="ocl:VariableExp" location="90:91-90:92" referredVariable="//@elements.6/@inPattern/@elements.0"/> @@ -493,13 +504,13 @@ <source xsi:type="ocl:VariableExp" location="91:4-91:5" referredVariable="//@elements.6/@outPattern/@elements.0"/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="91:15-91:54" name="servicePerformanceStereotype"> <source xsi:type="ocl:VariableExp" location="91:15-91:25"> - <referredVariable href="temp#/9"/> + <referredVariable href="new-model#/22"/> </source> </arguments> <arguments xsi:type="ocl:StringExp" location="91:55-91:63" stringSymbol="DBRows"/> <arguments xsi:type="ocl:OperationCallExp" location="91:64-91:94" operationName="getNbDBRows"> <source xsi:type="ocl:VariableExp" location="91:64-91:74"> - <referredVariable href="temp#/10"/> + <referredVariable href="new-model#/23"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="91:87-91:93" name="name"> <source xsi:type="ocl:VariableExp" location="91:87-91:88" referredVariable="//@elements.6/@inPattern/@elements.0"/> @@ -512,13 +523,13 @@ <source xsi:type="ocl:VariableExp" location="92:4-92:5" referredVariable="//@elements.6/@outPattern/@elements.0"/> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="92:15-92:54" name="servicePerformanceStereotype"> <source xsi:type="ocl:VariableExp" location="92:15-92:25"> - <referredVariable href="temp#/11"/> + <referredVariable href="new-model#/24"/> </source> </arguments> <arguments xsi:type="ocl:StringExp" location="92:55-92:64" stringSymbol="CPUTime"/> <arguments xsi:type="ocl:OperationCallExp" location="92:65-92:94" operationName="getCPUTime"> <source xsi:type="ocl:VariableExp" location="92:65-92:75"> - <referredVariable href="temp#/12"/> + <referredVariable href="new-model#/25"/> </source> <arguments xsi:type="ocl:NavigationOrAttributeCallExp" location="92:87-92:93" name="name"> <source xsi:type="ocl:VariableExp" location="92:87-92:88" referredVariable="//@elements.6/@inPattern/@elements.0"/> @@ -531,13 +542,13 @@ <inPattern location="64:5-64:82"> <elements xsi:type="atl:SimpleInPatternElement" location="64:10-64:45" varName="s" variableExp="//@elements.6/@inPattern/@filter/@arguments.0 //@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.1/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.4/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.5/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.6/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.7/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.8/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.9/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.10/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.11/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.12/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.13/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.14/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.15/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.16/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.17/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.18/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.19/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.20/@value/@source //@elements.6/@actionBlock/@statements.0/@condition/@arguments.0/@source //@elements.6/@actionBlock/@statements.0/@thenStatements.1/@expression/@arguments.2/@arguments.0/@source //@elements.6/@actionBlock/@statements.0/@thenStatements.2/@expression/@arguments.2/@arguments.0/@source //@elements.6/@actionBlock/@statements.0/@thenStatements.3/@expression/@arguments.2/@arguments.0/@source" mapsTo="//@elements.6/@outPattern/@elements.0"> <type xsi:type="ocl:OclModelElement" location="64:14-64:45" name="uml::CallOperationAction"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> </elements> <filter xsi:type="ocl:CollectionOperationCallExp" location="64:47-64:81" operationName="includes"> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="64:47-64:68" name="inElements"> <source xsi:type="ocl:VariableExp" location="64:47-64:57"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/16"/> </source> </source> <arguments xsi:type="ocl:VariableExp" location="64:79-64:80" referredVariable="//@elements.6/@inPattern/@elements.0"/> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/UML2Relational/UML2Relational.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/UML2Relational/UML2Relational.atl.xmi index a65c2ccc..ed42190b 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/UML2Relational/UML2Relational.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/UML2Relational/UML2Relational.atl.xmi @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="6:1-93:2" name="Class2Relational"> + <commentsBefore>-- @atlcompiler atl2006</commentsBefore> + <commentsBefore>-- @mmPath Relational=/UML2Relational/metamodels/relational.ecore</commentsBefore> + <commentsBefore>-- @nsURI UML=http://www.eclipse.org/uml2/2.1.0/UML</commentsBefore> <inModels location="7:30-7:38" name="IN"> - <metamodel href="temp#/1"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="7:8-7:24" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="13:1-14:80"> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- HELPERS --------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> <definition location="13:8-14:79"> <feature xsi:type="ocl:Operation" location="13:40-14:79" name="hasStereotype"> <parameters location="13:54-13:73" varName="stereotype" variableExp="//@elements.0/@definition/@feature/@body/@arguments.0"> @@ -17,7 +23,7 @@ <source xsi:type="ocl:IteratorExp" location="14:2-14:55" name="collect"> <source xsi:type="ocl:OperationCallExp" location="14:2-14:30" operationName="getAppliedStereotypes"> <source xsi:type="ocl:VariableExp" location="14:2-14:6"> - <referredVariable href="temp#/2"/> + <referredVariable href="new-model#/3"/> </source> </source> <body xsi:type="ocl:NavigationOrAttributeCallExp" location="14:47-14:54" name="name"> @@ -30,23 +36,26 @@ </feature> <context_ location="13:8-13:34"> <context_ xsi:type="ocl:OclModelElement" location="13:16-13:34" name="uml::Element"> - <model href="temp#/1"/> + <model href="new-model#/2"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:Helper" location="16:1-20:8"> + <commentsAfter>-------------------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-- RULES ----------------------------------------------------------------------------------</commentsAfter> + <commentsAfter>-------------------------------------------------------------------------------------------</commentsAfter> <definition location="16:8-20:7"> <feature xsi:type="ocl:Operation" location="16:37-20:7" name="computeType"> <returnType xsi:type="ocl:OclModelElement" location="16:53-16:68" name="Type"> - <model href="temp#/0"/> + <model href="new-model#/5"/> </returnType> <body xsi:type="ocl:IfExp" location="17:2-20:7"> <thenExpression xsi:type="ocl:EnumLiteralExp" location="17:31-17:39" name="VARCHAR"/> <condition xsi:type="ocl:OperatorCallExp" location="17:5-17:25" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="17:5-17:14" name="name"> <source xsi:type="ocl:VariableExp" location="17:5-17:9"> - <referredVariable href="temp#/3"/> + <referredVariable href="new-model#/6"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="17:17-17:25" stringSymbol="String"/> @@ -56,7 +65,7 @@ <condition xsi:type="ocl:OperatorCallExp" location="18:6-18:27" operationName="="> <source xsi:type="ocl:NavigationOrAttributeCallExp" location="18:6-18:15" name="name"> <source xsi:type="ocl:VariableExp" location="18:6-18:10"> - <referredVariable href="temp#/4"/> + <referredVariable href="new-model#/7"/> </source> </source> <arguments xsi:type="ocl:StringExp" location="18:18-18:27" stringSymbol="Integer"/> @@ -67,16 +76,19 @@ </feature> <context_ location="16:8-16:31"> <context_ xsi:type="ocl:OclModelElement" location="16:16-16:31" name="uml::Type"> - <model href="temp#/1"/> + <model href="new-model#/4"/> </context_> </context_> </definition> </elements> <elements xsi:type="atl:MatchedRule" location="26:1-36:2" name="Model2Database"> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-- RULES ----------------------------------------------------------------------------------</commentsBefore> + <commentsBefore>-------------------------------------------------------------------------------------------</commentsBefore> <outPattern location="31:2-35:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="32:3-35:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="32:9-32:28" name="Database"> - <model href="temp#/0"/> + <model href="new-model#/9"/> </type> <bindings location="33:4-33:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="33:12-33:18" name="name"> @@ -92,7 +104,7 @@ <source xsi:type="ocl:OperationCallExp" location="34:52-34:85" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="34:52-34:53" referredVariable="//@elements.2/@outPattern/@elements.0/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="34:66-34:84" name="uml::Package"> - <model href="temp#/1"/> + <model href="new-model#/10"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="34:90-34:115" operationName="hasStereotype"> @@ -108,7 +120,7 @@ <inPattern location="27:2-30:5"> <elements xsi:type="atl:SimpleInPatternElement" location="28:3-28:23" varName="m" variableExp="//@elements.2/@inPattern/@filter/@source //@elements.2/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.2/@outPattern/@elements.0/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="28:7-28:23" name="uml::Model"> - <model href="temp#/1"/> + <model href="new-model#/8"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="29:5-29:32" operationName="hasStereotype"> @@ -121,7 +133,7 @@ <outPattern location="43:2-47:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="44:3-47:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="44:9-44:26" name="Schema"> - <model href="temp#/0"/> + <model href="new-model#/12"/> </type> <bindings location="45:4-45:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="45:12-45:18" name="name"> @@ -137,7 +149,7 @@ <source xsi:type="ocl:OperationCallExp" location="46:52-46:83" operationName="oclIsTypeOf"> <source xsi:type="ocl:VariableExp" location="46:52-46:53" referredVariable="//@elements.3/@outPattern/@elements.0/@bindings.1/@value/@iterators.0"/> <arguments xsi:type="ocl:OclModelElement" location="46:66-46:82" name="uml::Class"> - <model href="temp#/1"/> + <model href="new-model#/13"/> </arguments> </source> <arguments xsi:type="ocl:OperationCallExp" location="46:88-46:112" operationName="hasStereotype"> @@ -153,7 +165,7 @@ <inPattern location="39:2-42:5"> <elements xsi:type="atl:SimpleInPatternElement" location="40:3-40:25" varName="p" variableExp="//@elements.3/@inPattern/@filter/@source //@elements.3/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.3/@outPattern/@elements.0/@bindings.1/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="40:7-40:25" name="uml::Package"> - <model href="temp#/1"/> + <model href="new-model#/11"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="41:5-41:30" operationName="hasStereotype"> @@ -166,7 +178,7 @@ <outPattern location="55:2-64:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="56:3-64:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="56:9-56:25" name="Table"> - <model href="temp#/0"/> + <model href="new-model#/15"/> </type> <bindings location="57:4-57:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="57:12-57:18" name="name"> @@ -188,7 +200,7 @@ <source xsi:type="ocl:VariableExp" location="60:8-60:9" referredVariable="//@elements.4/@outPattern/@elements.0/@bindings.1/@value/@iterators.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="60:27-60:51" name="uml::PrimitiveType"> - <model href="temp#/1"/> + <model href="new-model#/16"/> </arguments> </arguments> </body> @@ -211,7 +223,7 @@ <source xsi:type="ocl:VariableExp" location="63:12-63:13" referredVariable="//@elements.4/@outPattern/@elements.0/@bindings.2/@value/@iterators.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="63:31-63:55" name="uml::PrimitiveType"> - <model href="temp#/1"/> + <model href="new-model#/17"/> </arguments> </source> </arguments> @@ -224,7 +236,7 @@ <inPattern location="51:2-54:5"> <elements xsi:type="atl:SimpleInPatternElement" location="52:3-52:23" varName="c" variableExp="//@elements.4/@inPattern/@filter/@source //@elements.4/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.4/@outPattern/@elements.0/@bindings.1/@value/@source/@source //@elements.4/@outPattern/@elements.0/@bindings.2/@value/@source/@source"> <type xsi:type="ocl:OclModelElement" location="52:7-52:23" name="uml::Class"> - <model href="temp#/1"/> + <model href="new-model#/14"/> </type> </elements> <filter xsi:type="ocl:OperationCallExp" location="53:5-53:29" operationName="hasStereotype"> @@ -237,7 +249,7 @@ <outPattern location="73:2-79:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="74:3-79:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="74:9-74:26" name="Column"> - <model href="temp#/0"/> + <model href="new-model#/20"/> </type> <bindings location="75:4-75:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="75:12-75:18" name="name"> @@ -272,7 +284,7 @@ <inPattern location="68:2-72:5"> <elements xsi:type="atl:SimpleInPatternElement" location="69:3-69:26" varName="p" variableExp="//@elements.5/@inPattern/@filter/@source/@source //@elements.5/@inPattern/@filter/@arguments.0/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.1/@value/@source/@source //@elements.5/@outPattern/@elements.0/@bindings.2/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.3/@value/@source //@elements.5/@outPattern/@elements.0/@bindings.3/@value/@arguments.0/@source/@source"> <type xsi:type="ocl:OclModelElement" location="69:7-69:26" name="uml::Property"> - <model href="temp#/1"/> + <model href="new-model#/18"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="70:5-71:49" operationName="and"> @@ -285,7 +297,7 @@ <source xsi:type="ocl:VariableExp" location="71:5-71:6" referredVariable="//@elements.5/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="71:24-71:48" name="uml::PrimitiveType"> - <model href="temp#/1"/> + <model href="new-model#/19"/> </arguments> </arguments> </filter> @@ -295,7 +307,7 @@ <outPattern location="88:2-92:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="89:3-92:4" varName="out"> <type xsi:type="ocl:OclModelElement" location="89:9-89:30" name="ForeignKey"> - <model href="temp#/0"/> + <model href="new-model#/23"/> </type> <bindings location="90:4-90:18" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="90:12-90:18" name="name"> @@ -312,7 +324,7 @@ <inPattern location="83:2-87:5"> <elements xsi:type="atl:SimpleInPatternElement" location="84:3-84:26" varName="p" variableExp="//@elements.6/@inPattern/@filter/@source/@source //@elements.6/@inPattern/@filter/@arguments.0/@source/@source/@source //@elements.6/@outPattern/@elements.0/@bindings.0/@value/@source //@elements.6/@outPattern/@elements.0/@bindings.1/@value/@source"> <type xsi:type="ocl:OclModelElement" location="84:7-84:26" name="uml::Property"> - <model href="temp#/1"/> + <model href="new-model#/21"/> </type> </elements> <filter xsi:type="ocl:OperatorCallExp" location="85:5-86:53" operationName="and"> @@ -326,7 +338,7 @@ <source xsi:type="ocl:VariableExp" location="86:9-86:10" referredVariable="//@elements.6/@inPattern/@elements.0"/> </source> <arguments xsi:type="ocl:OclModelElement" location="86:28-86:52" name="uml::PrimitiveType"> - <model href="temp#/1"/> + <model href="new-model#/22"/> </arguments> </source> </arguments> diff --git a/tests/org.eclipse.m2m.atl.tests/data/expected/UniqueLazyRule/UniqueLazyRule.atl.xmi b/tests/org.eclipse.m2m.atl.tests/data/expected/UniqueLazyRule/UniqueLazyRule.atl.xmi index eb147548..032baa40 100644 --- a/tests/org.eclipse.m2m.atl.tests/data/expected/UniqueLazyRule/UniqueLazyRule.atl.xmi +++ b/tests/org.eclipse.m2m.atl.tests/data/expected/UniqueLazyRule/UniqueLazyRule.atl.xmi @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="Cp1252"?> <atl:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atl="http://www.eclipse.org/gmt/2005/ATL" xmlns:ocl="http://www.eclipse.org/gmt/2005/OCL" location="1:1-25:2" name="atl"> <inModels location="2:34-2:53" name="IN"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/1"/> </inModels> <outModels location="2:8-2:28" name="OUT"> - <metamodel href="temp#/0"/> + <metamodel href="new-model#/0"/> </outModels> <elements xsi:type="atl:Helper" location="4:1-4:57"> <definition location="4:8-4:56"> <feature xsi:type="ocl:Attribute" location="4:14-4:56" name="root"> <initExpression xsi:type="ocl:OclUndefinedExp" location="4:44-4:56"/> <type xsi:type="ocl:OclModelElement" location="4:21-4:41" name="Liste"> - <model href="temp#/0"/> + <model href="new-model#/2"/> </type> </feature> </definition> @@ -20,7 +20,7 @@ <outPattern location="9:2-12:4"> <elements xsi:type="atl:SimpleOutPatternElement" location="10:3-12:4" varName="object"> <type xsi:type="ocl:OclModelElement" location="10:13-10:34" name="Object"> - <model href="temp#/0"/> + <model href="new-model#/4"/> </type> <bindings location="11:6-11:28" propertyName="name"> <value xsi:type="ocl:NavigationOrAttributeCallExp" location="11:14-11:28" name="name"> @@ -32,7 +32,7 @@ <inPattern location="7:2-8:36"> <elements xsi:type="atl:SimpleInPatternElement" location="8:3-8:36" varName="in_object" variableExp="//@elements.1/@outPattern/@elements.0/@bindings.0/@value/@source"> <type xsi:type="ocl:OclModelElement" location="8:15-8:36" name="Object"> - <model href="temp#/0"/> + <model href="new-model#/3"/> </type> </elements> </inPattern> @@ -41,19 +41,19 @@ <outPattern location="19:2-22:3"> <elements xsi:type="atl:SimpleOutPatternElement" location="20:3-22:3" varName="liste"> <type xsi:type="ocl:OclModelElement" location="20:11-20:31" name="Liste"> - <model href="temp#/0"/> + <model href="new-model#/6"/> </type> <bindings location="21:4-21:95" propertyName="contents"> <value xsi:type="ocl:IteratorExp" location="21:16-21:95" name="collect"> <source xsi:type="ocl:OperationCallExp" location="21:16-21:60" operationName="allInstancesFrom"> <source xsi:type="ocl:OclModelElement" location="21:16-21:37" name="Object"> - <model href="temp#/0"/> + <model href="new-model#/7"/> </source> <arguments xsi:type="ocl:StringExp" location="21:55-21:59" stringSymbol="IN"/> </source> <body xsi:type="ocl:OperationCallExp" location="21:74-21:94" operationName="Object"> <source xsi:type="ocl:VariableExp" location="21:74-21:84"> - <referredVariable href="temp#/1"/> + <referredVariable href="new-model#/8"/> </source> <arguments xsi:type="ocl:VariableExp" location="21:92-21:93" referredVariable="//@elements.2/@outPattern/@elements.0/@bindings.0/@value/@iterators.0"/> </body> @@ -65,7 +65,7 @@ <inPattern location="17:2-18:34"> <elements xsi:type="atl:SimpleInPatternElement" location="18:3-18:34" varName="in_liste"> <type xsi:type="ocl:OclModelElement" location="18:14-18:34" name="Liste"> - <model href="temp#/0"/> + <model href="new-model#/5"/> </type> </elements> </inPattern> |