diff options
| author | glefur | 2010-02-10 10:48:33 +0000 |
|---|---|---|
| committer | glefur | 2010-02-10 10:48:33 +0000 |
| commit | cc70d39030fb8784dab87c7f3396ceb1d7b13353 (patch) | |
| tree | e40e9c5cb80ed8b5e2cca302649a8daa04865c56 | |
| parent | f2455dc805844b64a54817d5b33cb12e6074e9ec (diff) | |
| download | org.eclipse.eef-cc70d39030fb8784dab87c7f3396ceb1d7b13353.tar.gz org.eclipse.eef-cc70d39030fb8784dab87c7f3396ceb1d7b13353.tar.xz org.eclipse.eef-cc70d39030fb8784dab87c7f3396ceb1d7b13353.zip | |
updated emtl
8 files changed, 705 insertions, 738 deletions
diff --git a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textControl.emtl b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textControl.emtl index 8366e8541..ab6367b89 100644 --- a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textControl.emtl +++ b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textControl.emtl @@ -59,7 +59,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -81,7 +81,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -120,7 +120,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -142,7 +142,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -167,7 +167,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -189,7 +189,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -214,7 +214,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -236,7 +236,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -261,7 +261,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -283,7 +283,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -308,7 +308,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -361,7 +361,7 @@ <definition href="../../../services/naming.emtl#/0/editorID"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveCommandUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -397,7 +397,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -444,7 +444,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -477,7 +477,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -510,7 +510,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -543,7 +543,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -639,7 +639,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/commandUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -661,7 +661,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -712,7 +712,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/commandUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -734,7 +734,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -771,7 +771,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/commandUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -793,7 +793,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -830,7 +830,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/commandUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -852,7 +852,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -889,7 +889,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/commandUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -911,7 +911,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1017,7 +1017,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/partUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1039,7 +1039,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1097,7 +1097,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/partUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1119,7 +1119,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1163,7 +1163,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/partUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1185,7 +1185,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1229,7 +1229,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/partUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1251,7 +1251,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1295,7 +1295,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/partUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1317,7 +1317,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1436,7 +1436,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1490,7 +1490,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1529,7 +1529,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1583,7 +1583,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1608,7 +1608,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1662,7 +1662,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1687,7 +1687,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1741,7 +1741,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -1766,7 +1766,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -1820,7 +1820,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/8/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -3946,7 +3946,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="eefPackage"> @@ -3961,7 +3961,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -5660,7 +5660,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="metamodelPrefix"> @@ -5901,7 +5901,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -6016,6 +6016,14 @@ </eOperations> </eClassifiers> </ecore:EPackage> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List"> + <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + </eClassifiers> + <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(ElementEditor)" instanceClassName="java.util.LinkedHashSet"> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </eClassifiers> + </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> @@ -6042,11 +6050,6 @@ <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </ocl.ecore:Variable> - <ecore:EPackage name="collections"> - <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(ElementEditor)" instanceClassName="java.util.LinkedHashSet"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </eClassifiers> - </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </ocl.ecore:Variable> diff --git a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textFormImpl.emtl b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textFormImpl.emtl index b6649aa8a..d095aaae9 100644 --- a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textFormImpl.emtl +++ b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textFormImpl.emtl @@ -288,47 +288,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addModifyListener(new ModifyListener() {

			/**
			 * {@inheritDoc}
			 * 
			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
			 */
			public void modifyText(ModifyEvent e) {
				if (propertiesEditionComponent != null)
					propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> - <body xsi:type="mtl:QueryInvocation"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../api/widgetFormImpl.emtl#/0/editionPart"/> - <argument xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </argument> - </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".this, "/> - <body xsi:type="mtl:TemplateInvocation"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../services/naming.emtl#/0/editorID"/> - <argument xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </argument> - </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, "/> - <body xsi:type="mtl:TemplateInvocation"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> - <argument xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> - </argument> - </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".getText()));
			}

		});
		"/> - <body xsi:type="mtl:TemplateInvocation"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> - <argument xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> - </argument> - </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addFocusListener(new FocusAdapter() {

			/**
			 * {@inheritDoc}
			 * 
			 * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent)
			 */
			public void focusLost(FocusEvent e) {
				if (propertiesEditionComponent != null)
					propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addFocusListener(new FocusAdapter() {

			/**
			 * {@inheritDoc}
			 * 
			 * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent)
			 */
			@Override
			@SuppressWarnings("synthetic-access")
			public void focusLost(FocusEvent e) {
				if (propertiesEditionComponent != null)
					propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../api/widgetFormImpl.emtl#/0/editionPart"/> @@ -368,7 +328,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addKeyListener(new KeyAdapter() {

			/**
			 * {@inheritDoc}
			 * 
			 * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent)
			 */
			public void keyPressed(KeyEvent e) {
				if (e.character == SWT.CR) {
					if (propertiesEditionComponent != null)
						propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addKeyListener(new KeyAdapter() {

			/**
			 * {@inheritDoc}
			 * 
			 * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent)
			 */
			@Override
			@SuppressWarnings("synthetic-access")
			public void keyPressed(KeyEvent e) {
				if (e.character == SWT.CR) {
					if (propertiesEditionComponent != null)
						propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../api/widgetFormImpl.emtl#/0/editionPart"/> @@ -1804,7 +1764,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="eefPackage"> @@ -1819,7 +1779,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4183,7 +4143,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="metamodelPrefix"> @@ -4709,7 +4669,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4779,6 +4739,11 @@ </eOperations> </eClassifiers> </ecore:EPackage> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List"> + <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + </eClassifiers> + </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> @@ -4891,18 +4856,6 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </ocl.ecore:Variable> - <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </ocl.ecore:Variable> - <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </ocl.ecore:Variable> - <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </ocl.ecore:Variable> - <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> <ecore:EAnnotation source="positions"> @@ -5020,7 +4973,7 @@ </eAnnotations> <eAnnotations source="positions.28" references="/0/additionalImplementation"> <details key="start" value="1297"/> - <details key="end" value="4423"/> + <details key="end" value="3972"/> </eAnnotations> <eAnnotations source="positions.29" references="/0/additionalImplementation/@body.0"> <details key="start" value="1511"/> @@ -5280,217 +5233,161 @@ </eAnnotations> <eAnnotations source="positions.93" references="/0/additionalImplementation/@body.24"> <details key="start" value="2559"/> - <details key="end" value="2907"/> + <details key="end" value="2952"/> </eAnnotations> <eAnnotations source="positions.94" references="/0/additionalImplementation/@body.25"> - <details key="start" value="2908"/> - <details key="end" value="2928"/> + <details key="start" value="2953"/> + <details key="end" value="2973"/> </eAnnotations> <eAnnotations source="positions.95" references="/0/additionalImplementation/@body.25/editor"> - <details key="start" value="2908"/> - <details key="end" value="2914"/> + <details key="start" value="2953"/> + <details key="end" value="2959"/> </eAnnotations> <eAnnotations source="positions.96" references="/0/additionalImplementation/@body.26"> - <details key="start" value="2930"/> - <details key="end" value="2937"/> + <details key="start" value="2975"/> + <details key="end" value="2982"/> </eAnnotations> <eAnnotations source="positions.97" references="/0/additionalImplementation/@body.27"> - <details key="start" value="2938"/> - <details key="end" value="2955"/> + <details key="start" value="2983"/> + <details key="end" value="3000"/> </eAnnotations> <eAnnotations source="positions.98" references="/0/additionalImplementation/@body.27/editor"> - <details key="start" value="2938"/> - <details key="end" value="2944"/> + <details key="start" value="2983"/> + <details key="end" value="2989"/> </eAnnotations> <eAnnotations source="positions.99" references="/0/additionalImplementation/@body.28"> - <details key="start" value="2957"/> - <details key="end" value="3024"/> + <details key="start" value="3002"/> + <details key="end" value="3069"/> </eAnnotations> <eAnnotations source="positions.100" references="/0/additionalImplementation/@body.29"> - <details key="start" value="3025"/> - <details key="end" value="3055"/> + <details key="start" value="3070"/> + <details key="end" value="3100"/> </eAnnotations> <eAnnotations source="positions.101" references="/0/additionalImplementation/@body.29/@argument.0"> - <details key="start" value="3025"/> - <details key="end" value="3036"/> + <details key="start" value="3070"/> + <details key="end" value="3081"/> </eAnnotations> <eAnnotations source="positions.102" references="/0/additionalImplementation/@body.29/@argument.0/editor"> - <details key="start" value="3025"/> - <details key="end" value="3031"/> + <details key="start" value="3070"/> + <details key="end" value="3076"/> </eAnnotations> <eAnnotations source="positions.103" references="/0/additionalImplementation/@body.30"> - <details key="start" value="3057"/> - <details key="end" value="3085"/> + <details key="start" value="3102"/> + <details key="end" value="3130"/> </eAnnotations> <eAnnotations source="positions.104" references="/0/additionalImplementation/@body.31"> - <details key="start" value="3086"/> - <details key="end" value="3116"/> + <details key="start" value="3131"/> + <details key="end" value="3161"/> </eAnnotations> <eAnnotations source="positions.105" references="/0/additionalImplementation/@body.31/@argument.0"> - <details key="start" value="3086"/> - <details key="end" value="3097"/> + <details key="start" value="3131"/> + <details key="end" value="3142"/> </eAnnotations> <eAnnotations source="positions.106" references="/0/additionalImplementation/@body.31/@argument.0/editor"> - <details key="start" value="3086"/> - <details key="end" value="3092"/> + <details key="start" value="3131"/> + <details key="end" value="3137"/> </eAnnotations> <eAnnotations source="positions.107" references="/0/additionalImplementation/@body.32"> - <details key="start" value="3118"/> - <details key="end" value="3457"/> + <details key="start" value="3163"/> + <details key="end" value="3583"/> </eAnnotations> <eAnnotations source="positions.108" references="/0/additionalImplementation/@body.33"> - <details key="start" value="3458"/> - <details key="end" value="3478"/> + <details key="start" value="3584"/> + <details key="end" value="3604"/> </eAnnotations> <eAnnotations source="positions.109" references="/0/additionalImplementation/@body.33/editor"> - <details key="start" value="3458"/> - <details key="end" value="3464"/> + <details key="start" value="3584"/> + <details key="end" value="3590"/> </eAnnotations> <eAnnotations source="positions.110" references="/0/additionalImplementation/@body.34"> - <details key="start" value="3480"/> - <details key="end" value="3487"/> + <details key="start" value="3606"/> + <details key="end" value="3613"/> </eAnnotations> <eAnnotations source="positions.111" references="/0/additionalImplementation/@body.35"> - <details key="start" value="3488"/> - <details key="end" value="3505"/> + <details key="start" value="3614"/> + <details key="end" value="3631"/> </eAnnotations> <eAnnotations source="positions.112" references="/0/additionalImplementation/@body.35/editor"> - <details key="start" value="3488"/> - <details key="end" value="3494"/> + <details key="start" value="3614"/> + <details key="end" value="3620"/> </eAnnotations> <eAnnotations source="positions.113" references="/0/additionalImplementation/@body.36"> - <details key="start" value="3507"/> - <details key="end" value="3574"/> + <details key="start" value="3633"/> + <details key="end" value="3700"/> </eAnnotations> <eAnnotations source="positions.114" references="/0/additionalImplementation/@body.37"> - <details key="start" value="3575"/> - <details key="end" value="3605"/> + <details key="start" value="3701"/> + <details key="end" value="3731"/> </eAnnotations> <eAnnotations source="positions.115" references="/0/additionalImplementation/@body.37/@argument.0"> - <details key="start" value="3575"/> - <details key="end" value="3586"/> + <details key="start" value="3701"/> + <details key="end" value="3712"/> </eAnnotations> <eAnnotations source="positions.116" references="/0/additionalImplementation/@body.37/@argument.0/editor"> - <details key="start" value="3575"/> - <details key="end" value="3581"/> + <details key="start" value="3701"/> + <details key="end" value="3707"/> </eAnnotations> <eAnnotations source="positions.117" references="/0/additionalImplementation/@body.38"> - <details key="start" value="3607"/> - <details key="end" value="3635"/> + <details key="start" value="3733"/> + <details key="end" value="3859"/> </eAnnotations> <eAnnotations source="positions.118" references="/0/additionalImplementation/@body.39"> - <details key="start" value="3636"/> - <details key="end" value="3666"/> + <details key="start" value="3860"/> + <details key="end" value="3877"/> </eAnnotations> - <eAnnotations source="positions.119" references="/0/additionalImplementation/@body.39/@argument.0"> - <details key="start" value="3636"/> - <details key="end" value="3647"/> + <eAnnotations source="positions.119" references="/0/additionalImplementation/@body.39/editor"> + <details key="start" value="3860"/> + <details key="end" value="3866"/> </eAnnotations> - <eAnnotations source="positions.120" references="/0/additionalImplementation/@body.39/@argument.0/editor"> - <details key="start" value="3636"/> - <details key="end" value="3642"/> + <eAnnotations source="positions.120" references="/0/additionalImplementation/@body.40"> + <details key="start" value="3879"/> + <details key="end" value="3881"/> </eAnnotations> - <eAnnotations source="positions.121" references="/0/additionalImplementation/@body.40"> - <details key="start" value="3668"/> - <details key="end" value="4034"/> + <eAnnotations source="positions.121" references="/0/additionalImplementation/@body.41"> + <details key="start" value="3882"/> + <details key="end" value="3922"/> </eAnnotations> - <eAnnotations source="positions.122" references="/0/additionalImplementation/@body.41"> - <details key="start" value="4035"/> - <details key="end" value="4055"/> + <eAnnotations source="positions.122" references="/0/additionalImplementation/@body.41/@argument.0"> + <details key="start" value="3882"/> + <details key="end" value="3912"/> </eAnnotations> - <eAnnotations source="positions.123" references="/0/additionalImplementation/@body.41/editor"> - <details key="start" value="4035"/> - <details key="end" value="4041"/> + <eAnnotations source="positions.123" references="/0/additionalImplementation/@body.41/@argument.0/editor"> + <details key="start" value="3882"/> + <details key="end" value="3888"/> </eAnnotations> <eAnnotations source="positions.124" references="/0/additionalImplementation/@body.42"> - <details key="start" value="4057"/> - <details key="end" value="4064"/> - </eAnnotations> - <eAnnotations source="positions.125" references="/0/additionalImplementation/@body.43"> - <details key="start" value="4065"/> - <details key="end" value="4082"/> - </eAnnotations> - <eAnnotations source="positions.126" references="/0/additionalImplementation/@body.43/editor"> - <details key="start" value="4065"/> - <details key="end" value="4071"/> - </eAnnotations> - <eAnnotations source="positions.127" references="/0/additionalImplementation/@body.44"> - <details key="start" value="4084"/> - <details key="end" value="4151"/> - </eAnnotations> - <eAnnotations source="positions.128" references="/0/additionalImplementation/@body.45"> - <details key="start" value="4152"/> - <details key="end" value="4182"/> - </eAnnotations> - <eAnnotations source="positions.129" references="/0/additionalImplementation/@body.45/@argument.0"> - <details key="start" value="4152"/> - <details key="end" value="4163"/> - </eAnnotations> - <eAnnotations source="positions.130" references="/0/additionalImplementation/@body.45/@argument.0/editor"> - <details key="start" value="4152"/> - <details key="end" value="4158"/> - </eAnnotations> - <eAnnotations source="positions.131" references="/0/additionalImplementation/@body.46"> - <details key="start" value="4184"/> - <details key="end" value="4310"/> - </eAnnotations> - <eAnnotations source="positions.132" references="/0/additionalImplementation/@body.47"> - <details key="start" value="4311"/> - <details key="end" value="4328"/> - </eAnnotations> - <eAnnotations source="positions.133" references="/0/additionalImplementation/@body.47/editor"> - <details key="start" value="4311"/> - <details key="end" value="4317"/> - </eAnnotations> - <eAnnotations source="positions.134" references="/0/additionalImplementation/@body.48"> - <details key="start" value="4330"/> - <details key="end" value="4332"/> - </eAnnotations> - <eAnnotations source="positions.135" references="/0/additionalImplementation/@body.49"> - <details key="start" value="4333"/> - <details key="end" value="4373"/> - </eAnnotations> - <eAnnotations source="positions.136" references="/0/additionalImplementation/@body.49/@argument.0"> - <details key="start" value="4333"/> - <details key="end" value="4363"/> - </eAnnotations> - <eAnnotations source="positions.137" references="/0/additionalImplementation/@body.49/@argument.0/editor"> - <details key="start" value="4333"/> - <details key="end" value="4339"/> - </eAnnotations> - <eAnnotations source="positions.138" references="/0/additionalImplementation/@body.50"> - <details key="start" value="4375"/> - <details key="end" value="4411"/> + <details key="start" value="3924"/> + <details key="end" value="3960"/> </eAnnotations> - <eAnnotations source="positions.139" references="/0/additionalImplementation/editor"> + <eAnnotations source="positions.125" references="/0/additionalImplementation/editor"> <details key="start" value="1339"/> <details key="end" value="1361"/> </eAnnotations> - <eAnnotations source="positions.140" references="/0/additionalImplementation/pec"> + <eAnnotations source="positions.126" references="/0/additionalImplementation/pec"> <details key="start" value="1363"/> <details key="end" value="1395"/> </eAnnotations> - <eAnnotations source="positions.141" references="/0/additionalImplementation/inputPEC"> + <eAnnotations source="positions.127" references="/0/additionalImplementation/inputPEC"> <details key="start" value="1397"/> <details key="end" value="1433"/> </eAnnotations> - <eAnnotations source="positions.142" references="/0/additionalImplementation/@guard"> + <eAnnotations source="positions.128" references="/0/additionalImplementation/@guard"> <details key="start" value="1473"/> <details key="end" value="1508"/> </eAnnotations> - <eAnnotations source="positions.143" references="/0/additionalImplementation/@guard/@source"> + <eAnnotations source="positions.129" references="/0/additionalImplementation/@guard/@source"> <details key="start" value="1473"/> <details key="end" value="1499"/> </eAnnotations> - <eAnnotations source="positions.144" references="/0/additionalImplementation/@guard/@source/@source"> + <eAnnotations source="positions.130" references="/0/additionalImplementation/@guard/@source/@source"> <details key="start" value="1473"/> <details key="end" value="1494"/> </eAnnotations> - <eAnnotations source="positions.145" references="/0/additionalImplementation/@guard/@source/@source/editor"> + <eAnnotations source="positions.131" references="/0/additionalImplementation/@guard/@source/@source/editor"> <details key="start" value="1473"/> <details key="end" value="1479"/> </eAnnotations> - <eAnnotations source="positions.146" references="/0/additionalImplementation/@guard/@argument.0"> + <eAnnotations source="positions.132" references="/0/additionalImplementation/@guard/@argument.0"> <details key="start" value="1502"/> <details key="end" value="1508"/> </eAnnotations> diff --git a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textGettersSetters.emtl b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textGettersSetters.emtl index 55fa65d6a..bed7b3183 100644 --- a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textGettersSetters.emtl +++ b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textGettersSetters.emtl @@ -1087,7 +1087,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenFeature"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> <eParameters name="pee"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </eParameters> @@ -1099,7 +1099,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenPackage"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> <eParameters name="p"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> @@ -1111,7 +1111,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenPackage.1"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> <eParameters name="pec"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionComponent"/> </eParameters> @@ -1123,7 +1123,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenContext"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//GenEditionContext"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> <eParameters name="peco"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionContext"/> </eParameters> @@ -1135,7 +1135,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenContext.1"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//GenEditionContext"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> <eParameters name="peco"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionComponent"/> </eParameters> @@ -1147,7 +1147,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenModel"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//EEFGenModel"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> <eParameters name="pec"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionContext"/> </eParameters> @@ -1159,7 +1159,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenRepository"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//GenViewsRepository"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> <eParameters name="viewsRepository"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewsRepository"/> </eParameters> @@ -1171,7 +1171,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenModel.1"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//EEFGenModel"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> <eParameters name="viewsRepository"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewsRepository"/> </eParameters> @@ -1539,7 +1539,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="eefGenModel"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//EEFGenModel"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eParameters> </eOperations> <eOperations name="authorText"> @@ -1551,7 +1551,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="eefGenModel"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//EEFGenModel"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eParameters> </eOperations> <eOperations name="viewCompletePackageGetter"> @@ -1782,7 +1782,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="eefPackage"> @@ -1797,7 +1797,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4174,7 +4174,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenPackage.1"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eOperations> <eOperations name="associatedGenContext"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> @@ -4183,7 +4183,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenContext.1"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//GenEditionContext"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eOperations> <eOperations name="mustBeGenerated"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> @@ -4819,7 +4819,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenFeature"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/GenModel#//GenFeature"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eOperations> <eOperations name="representationName"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> @@ -4908,7 +4908,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenPackage"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/GenModel#//GenPackage"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eOperations> <eOperations name="completePackage"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> @@ -4928,7 +4928,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="metamodelPrefix"> @@ -5003,7 +5003,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenContext"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//GenEditionContext"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eOperations> <eOperations name="associatedGenModel"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> @@ -5012,7 +5012,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenModel"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//EEFGenModel"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eOperations> <eOperations name="contextPackage"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> @@ -5110,7 +5110,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenRepository"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//GenViewsRepository"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eOperations> <eOperations name="associatedGenModel"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> @@ -5119,7 +5119,7 @@ <eAnnotations source="MTL"> <references href="../../../services/common.emtl#/0/associatedGenModel.1"/> </eAnnotations> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/generation/1.0.0#//EEFGenModel"/> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> </eOperations> <eOperations name="vrPackage"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> @@ -5376,29 +5376,6 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> </eOperations> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EEFGenModel_Class"> - <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/emf/eef/generation/1.0.0#//EEFGenModel"/> - </eAnnotations> - <eOperations name="licenceText"> - <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <contents xsi:type="ocl.ecore:Constraint"/> - </eAnnotations> - <eAnnotations source="MTL"> - <references href="../../../services/common.emtl#/0/licenceText"/> - </eAnnotations> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - </eOperations> - <eOperations name="authorText"> - <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <contents xsi:type="ocl.ecore:Constraint"/> - </eAnnotations> - <eAnnotations source="MTL"> - <references href="../../../services/common.emtl#/0/authorText"/> - </eAnnotations> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - </eOperations> - </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="EClassifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <references href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> @@ -5421,7 +5398,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -5468,6 +5445,11 @@ </eOperations> </eClassifiers> </ecore:EPackage> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List"> + <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + </eClassifiers> + </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> diff --git a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textSWTImpl.emtl b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textSWTImpl.emtl index 39af147ae..fd5e43af8 100644 --- a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textSWTImpl.emtl +++ b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/text/textSWTImpl.emtl @@ -43,7 +43,7 @@ <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/widgetDeclaration/editor"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/4/CustomElementEditor"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/5/CustomElementEditor"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//CustomElementEditor"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsTypeOf"/> @@ -109,7 +109,7 @@ <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/implementation/editor"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/4/CustomElementEditor"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/5/CustomElementEditor"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//CustomElementEditor"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsTypeOf"/> @@ -312,7 +312,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addModifyListener(new ModifyListener() {

			/*
			 * (non-Javadoc)
			 * 
			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
			 */
			public void modifyText(ModifyEvent e) {
				if (propertiesEditionComponent != null)
					propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addFocusListener(new FocusAdapter() {
			/**
			 * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent)
			 */
			@Override
			@SuppressWarnings("synthetic-access")
			public void focusLost(FocusEvent e) {
				if (propertiesEditionComponent != null)
					propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../api/widgetSWTImpl.emtl#/0/editionPart"/> @@ -328,7 +328,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, "/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, "/> <body xsi:type="mtl:TemplateInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> @@ -340,7 +340,47 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".getText()));
			}
			
		});

		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent("/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".getText()));
			}
		});
		"/> + <body xsi:type="mtl:TemplateInvocation"> + <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> + <argument xsi:type="ocl.ecore:PropertyCallExp"> + <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </source> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> + </argument> + </body> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addKeyListener(new KeyAdapter() {
			/**
			 * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent)
			 */
			@Override
			@SuppressWarnings("synthetic-access")
			public void keyPressed(KeyEvent e) {
				if (e.character == SWT.CR) {
					if (propertiesEditionComponent != null)
						propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> + <body xsi:type="mtl:QueryInvocation"> + <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <definition href="../../api/widgetSWTImpl.emtl#/0/editionPart"/> + <argument xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </argument> + </body> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".this, "/> + <body xsi:type="mtl:TemplateInvocation"> + <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <definition href="../../../services/naming.emtl#/0/editorID"/> + <argument xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </argument> + </body> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, "/> + <body xsi:type="mtl:TemplateInvocation"> + <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> + <argument xsi:type="ocl.ecore:PropertyCallExp"> + <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </source> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> + </argument> + </body> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".getText()));
				}
			}
		});
		SWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent("/> <body xsi:type="mtl:TemplateInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../../services/naming.emtl#/0/editorID"/> @@ -380,7 +420,7 @@ <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/4/CustomElementEditor"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/5/CustomElementEditor"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//CustomElementEditor"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsTypeOf"/> @@ -1766,7 +1806,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="eefPackage"> @@ -1781,7 +1821,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4145,7 +4185,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="metamodelPrefix"> @@ -4671,7 +4711,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4741,6 +4781,11 @@ </eOperations> </eClassifiers> </ecore:EPackage> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List"> + <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + </eClassifiers> + </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> @@ -4843,6 +4888,18 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </ocl.ecore:Variable> + <ocl.ecore:Variable name="self"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </ocl.ecore:Variable> + <ocl.ecore:Variable name="self"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </ocl.ecore:Variable> + <ocl.ecore:Variable name="self"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </ocl.ecore:Variable> + <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> <ecore:EAnnotation source="positions"> @@ -5000,7 +5057,7 @@ </eAnnotations> <eAnnotations source="positions.38" references="/0/additionalImplementation"> <details key="start" value="1379"/> - <details key="end" value="3202"/> + <details key="end" value="3847"/> </eAnnotations> <eAnnotations source="positions.39" references="/0/additionalImplementation/@body.0"> <details key="start" value="1643"/> @@ -5244,125 +5301,181 @@ </eAnnotations> <eAnnotations source="positions.99" references="/0/additionalImplementation/@body.22"> <details key="start" value="2485"/> - <details key="end" value="2832"/> + <details key="end" value="2858"/> </eAnnotations> <eAnnotations source="positions.100" references="/0/additionalImplementation/@body.23"> - <details key="start" value="2833"/> - <details key="end" value="2853"/> + <details key="start" value="2859"/> + <details key="end" value="2879"/> </eAnnotations> <eAnnotations source="positions.101" references="/0/additionalImplementation/@body.23/editor"> - <details key="start" value="2833"/> - <details key="end" value="2839"/> + <details key="start" value="2859"/> + <details key="end" value="2865"/> </eAnnotations> <eAnnotations source="positions.102" references="/0/additionalImplementation/@body.24"> - <details key="start" value="2855"/> - <details key="end" value="2862"/> + <details key="start" value="2881"/> + <details key="end" value="2888"/> </eAnnotations> <eAnnotations source="positions.103" references="/0/additionalImplementation/@body.25"> - <details key="start" value="2863"/> - <details key="end" value="2880"/> + <details key="start" value="2889"/> + <details key="end" value="2906"/> </eAnnotations> <eAnnotations source="positions.104" references="/0/additionalImplementation/@body.25/editor"> - <details key="start" value="2863"/> - <details key="end" value="2869"/> + <details key="start" value="2889"/> + <details key="end" value="2895"/> </eAnnotations> <eAnnotations source="positions.105" references="/0/additionalImplementation/@body.26"> - <details key="start" value="2882"/> - <details key="end" value="2949"/> + <details key="start" value="2908"/> + <details key="end" value="2975"/> </eAnnotations> <eAnnotations source="positions.106" references="/0/additionalImplementation/@body.27"> - <details key="start" value="2950"/> - <details key="end" value="2980"/> + <details key="start" value="2976"/> + <details key="end" value="3006"/> </eAnnotations> <eAnnotations source="positions.107" references="/0/additionalImplementation/@body.27/@argument.0"> - <details key="start" value="2950"/> - <details key="end" value="2961"/> + <details key="start" value="2976"/> + <details key="end" value="2987"/> </eAnnotations> <eAnnotations source="positions.108" references="/0/additionalImplementation/@body.27/@argument.0/editor"> - <details key="start" value="2950"/> - <details key="end" value="2956"/> + <details key="start" value="2976"/> + <details key="end" value="2982"/> </eAnnotations> <eAnnotations source="positions.109" references="/0/additionalImplementation/@body.28"> - <details key="start" value="2982"/> - <details key="end" value="3090"/> + <details key="start" value="3008"/> + <details key="end" value="3038"/> </eAnnotations> <eAnnotations source="positions.110" references="/0/additionalImplementation/@body.29"> - <details key="start" value="3091"/> - <details key="end" value="3108"/> + <details key="start" value="3039"/> + <details key="end" value="3069"/> </eAnnotations> - <eAnnotations source="positions.111" references="/0/additionalImplementation/@body.29/editor"> - <details key="start" value="3091"/> - <details key="end" value="3097"/> + <eAnnotations source="positions.111" references="/0/additionalImplementation/@body.29/@argument.0"> + <details key="start" value="3039"/> + <details key="end" value="3050"/> </eAnnotations> - <eAnnotations source="positions.112" references="/0/additionalImplementation/@body.30"> - <details key="start" value="3110"/> - <details key="end" value="3112"/> + <eAnnotations source="positions.112" references="/0/additionalImplementation/@body.29/@argument.0/editor"> + <details key="start" value="3039"/> + <details key="end" value="3045"/> </eAnnotations> - <eAnnotations source="positions.113" references="/0/additionalImplementation/@body.31"> - <details key="start" value="3113"/> - <details key="end" value="3153"/> + <eAnnotations source="positions.113" references="/0/additionalImplementation/@body.30"> + <details key="start" value="3071"/> + <details key="end" value="3472"/> </eAnnotations> - <eAnnotations source="positions.114" references="/0/additionalImplementation/@body.31/@argument.0"> - <details key="start" value="3113"/> - <details key="end" value="3143"/> + <eAnnotations source="positions.114" references="/0/additionalImplementation/@body.31"> + <details key="start" value="3473"/> + <details key="end" value="3493"/> </eAnnotations> - <eAnnotations source="positions.115" references="/0/additionalImplementation/@body.31/@argument.0/editor"> - <details key="start" value="3113"/> - <details key="end" value="3119"/> + <eAnnotations source="positions.115" references="/0/additionalImplementation/@body.31/editor"> + <details key="start" value="3473"/> + <details key="end" value="3479"/> </eAnnotations> <eAnnotations source="positions.116" references="/0/additionalImplementation/@body.32"> - <details key="start" value="3155"/> - <details key="end" value="3190"/> + <details key="start" value="3495"/> + <details key="end" value="3502"/> + </eAnnotations> + <eAnnotations source="positions.117" references="/0/additionalImplementation/@body.33"> + <details key="start" value="3503"/> + <details key="end" value="3520"/> + </eAnnotations> + <eAnnotations source="positions.118" references="/0/additionalImplementation/@body.33/editor"> + <details key="start" value="3503"/> + <details key="end" value="3509"/> + </eAnnotations> + <eAnnotations source="positions.119" references="/0/additionalImplementation/@body.34"> + <details key="start" value="3522"/> + <details key="end" value="3589"/> + </eAnnotations> + <eAnnotations source="positions.120" references="/0/additionalImplementation/@body.35"> + <details key="start" value="3590"/> + <details key="end" value="3620"/> + </eAnnotations> + <eAnnotations source="positions.121" references="/0/additionalImplementation/@body.35/@argument.0"> + <details key="start" value="3590"/> + <details key="end" value="3601"/> + </eAnnotations> + <eAnnotations source="positions.122" references="/0/additionalImplementation/@body.35/@argument.0/editor"> + <details key="start" value="3590"/> + <details key="end" value="3596"/> + </eAnnotations> + <eAnnotations source="positions.123" references="/0/additionalImplementation/@body.36"> + <details key="start" value="3622"/> + <details key="end" value="3735"/> + </eAnnotations> + <eAnnotations source="positions.124" references="/0/additionalImplementation/@body.37"> + <details key="start" value="3736"/> + <details key="end" value="3753"/> + </eAnnotations> + <eAnnotations source="positions.125" references="/0/additionalImplementation/@body.37/editor"> + <details key="start" value="3736"/> + <details key="end" value="3742"/> + </eAnnotations> + <eAnnotations source="positions.126" references="/0/additionalImplementation/@body.38"> + <details key="start" value="3755"/> + <details key="end" value="3757"/> + </eAnnotations> + <eAnnotations source="positions.127" references="/0/additionalImplementation/@body.39"> + <details key="start" value="3758"/> + <details key="end" value="3798"/> + </eAnnotations> + <eAnnotations source="positions.128" references="/0/additionalImplementation/@body.39/@argument.0"> + <details key="start" value="3758"/> + <details key="end" value="3788"/> + </eAnnotations> + <eAnnotations source="positions.129" references="/0/additionalImplementation/@body.39/@argument.0/editor"> + <details key="start" value="3758"/> + <details key="end" value="3764"/> + </eAnnotations> + <eAnnotations source="positions.130" references="/0/additionalImplementation/@body.40"> + <details key="start" value="3800"/> + <details key="end" value="3835"/> </eAnnotations> - <eAnnotations source="positions.117" references="/0/additionalImplementation/editor"> + <eAnnotations source="positions.131" references="/0/additionalImplementation/editor"> <details key="start" value="1421"/> <details key="end" value="1443"/> </eAnnotations> - <eAnnotations source="positions.118" references="/0/additionalImplementation/pec"> + <eAnnotations source="positions.132" references="/0/additionalImplementation/pec"> <details key="start" value="1445"/> <details key="end" value="1477"/> </eAnnotations> - <eAnnotations source="positions.119" references="/0/additionalImplementation/inputPEC"> + <eAnnotations source="positions.133" references="/0/additionalImplementation/inputPEC"> <details key="start" value="1479"/> <details key="end" value="1515"/> </eAnnotations> - <eAnnotations source="positions.120" references="/0/additionalImplementation/@guard"> + <eAnnotations source="positions.134" references="/0/additionalImplementation/@guard"> <details key="start" value="1555"/> <details key="end" value="1640"/> </eAnnotations> - <eAnnotations source="positions.121" references="/0/additionalImplementation/@guard/@source"> + <eAnnotations source="positions.135" references="/0/additionalImplementation/@guard/@source"> <details key="start" value="1555"/> <details key="end" value="1600"/> </eAnnotations> - <eAnnotations source="positions.122" references="/0/additionalImplementation/@guard/@source/@source"> + <eAnnotations source="positions.136" references="/0/additionalImplementation/@guard/@source/@source"> <details key="start" value="1559"/> <details key="end" value="1600"/> </eAnnotations> - <eAnnotations source="positions.123" references="/0/additionalImplementation/@guard/@source/@source/editor"> + <eAnnotations source="positions.137" references="/0/additionalImplementation/@guard/@source/@source/editor"> <details key="start" value="1560"/> <details key="end" value="1566"/> </eAnnotations> - <eAnnotations source="positions.124" references="/0/additionalImplementation/@guard/@source/@source/@argument.0"> + <eAnnotations source="positions.138" references="/0/additionalImplementation/@guard/@source/@source/@argument.0"> <details key="start" value="1579"/> <details key="end" value="1598"/> </eAnnotations> - <eAnnotations source="positions.125" references="/0/additionalImplementation/@guard/@argument.0"> + <eAnnotations source="positions.139" references="/0/additionalImplementation/@guard/@argument.0"> <details key="start" value="1605"/> <details key="end" value="1640"/> </eAnnotations> - <eAnnotations source="positions.126" references="/0/additionalImplementation/@guard/@argument.0/@source"> + <eAnnotations source="positions.140" references="/0/additionalImplementation/@guard/@argument.0/@source"> <details key="start" value="1605"/> <details key="end" value="1631"/> </eAnnotations> - <eAnnotations source="positions.127" references="/0/additionalImplementation/@guard/@argument.0/@source/@source"> + <eAnnotations source="positions.141" references="/0/additionalImplementation/@guard/@argument.0/@source/@source"> <details key="start" value="1605"/> <details key="end" value="1626"/> </eAnnotations> - <eAnnotations source="positions.128" references="/0/additionalImplementation/@guard/@argument.0/@source/@source/editor"> + <eAnnotations source="positions.142" references="/0/additionalImplementation/@guard/@argument.0/@source/@source/editor"> <details key="start" value="1605"/> <details key="end" value="1611"/> </eAnnotations> - <eAnnotations source="positions.129" references="/0/additionalImplementation/@guard/@argument.0/@argument.0"> + <eAnnotations source="positions.143" references="/0/additionalImplementation/@guard/@argument.0/@argument.0"> <details key="start" value="1634"/> <details key="end" value="1640"/> </eAnnotations> diff --git a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaControl.emtl b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaControl.emtl index 26d4bf47d..704c74716 100644 --- a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaControl.emtl +++ b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaControl.emtl @@ -59,7 +59,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -85,7 +85,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -107,7 +107,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/5/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/6/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -175,7 +175,7 @@ <definition href="../../../services/naming.emtl#/0/editorID"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/liveCommandUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -209,7 +209,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/5/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/6/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -319,7 +319,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/commandUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -341,7 +341,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/5/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/6/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -461,7 +461,7 @@ <definition href="../../../services/common.emtl#/0/viewCompletePackageGetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/partUpdater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -483,7 +483,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/5/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/6/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -616,7 +616,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -670,7 +670,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/5/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/6/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -709,7 +709,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -763,7 +763,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/5/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/6/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -788,7 +788,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -842,7 +842,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/5/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/6/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -867,7 +867,7 @@ <definition href="../../../services/common.emtl#/0/viewPackageSetter"/> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/10/OrderedSet(ElementEditor)"> + <source xsi:type="ocl.ecore:PropertyCallExp" eType="/2/OrderedSet(ElementEditor)"> <source xsi:type="ocl.ecore:VariableExp" name="editionElement" referredVariable="/0/updater/editionElement"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </source> @@ -921,7 +921,7 @@ </source> <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/eef/mapping/1.0.0#//EMFPropertyBinding/model"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/5/EAttribute"> + <argument xsi:type="ocl.ecore:TypeExp" eType="/6/EAttribute"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> @@ -3047,7 +3047,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="eefPackage"> @@ -3062,7 +3062,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4761,7 +4761,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="metamodelPrefix"> @@ -5002,7 +5002,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -5117,6 +5117,14 @@ </eOperations> </eClassifiers> </ecore:EPackage> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List"> + <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + </eClassifiers> + <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(ElementEditor)" instanceClassName="java.util.LinkedHashSet"> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </eClassifiers> + </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> @@ -5143,11 +5151,6 @@ <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </ocl.ecore:Variable> - <ecore:EPackage name="collections"> - <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(ElementEditor)" instanceClassName="java.util.LinkedHashSet"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </eClassifiers> - </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/components/1.0.0#//PropertiesEditionElement"/> </ocl.ecore:Variable> diff --git a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaFormImpl.emtl b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaFormImpl.emtl index cb83ea9be..69d7b353d 100644 --- a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaFormImpl.emtl +++ b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaFormImpl.emtl @@ -233,7 +233,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = widgetFactory.createText(parent, "", SWT.BORDER | SWT.WRAP | SWT.MULTI); //$NON-NLS-1$
"/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = widgetFactory.createText(parent, "", SWT.BORDER | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL); //$NON-NLS-1$
"/> <body xsi:type="mtl:IfBlock"> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="		"/> <body xsi:type="mtl:TemplateInvocation"> @@ -336,7 +336,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".setLayoutData("/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="Data.widthHint = 200;
		"/> <body xsi:type="mtl:TemplateInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> @@ -348,35 +348,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="Data);
		"/> - <body xsi:type="mtl:TemplateInvocation"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> - <argument xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> - </argument> - </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addFocusListener(new FocusAdapter() {

			/**
			 * {@inheritDoc}
			 * 
			 * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent)
			 */
			public void focusLost(FocusEvent e) {
				if (propertiesEditionComponent != null)
					propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> - <body xsi:type="mtl:QueryInvocation"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../api/widgetFormImpl.emtl#/0/editionPart"/> - <argument xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </argument> - </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".this, "/> - <body xsi:type="mtl:TemplateInvocation"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <definition href="../../../services/naming.emtl#/0/editorID"/> - <argument xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </argument> - </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, null, "/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".setLayoutData("/> <body xsi:type="mtl:TemplateInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> @@ -388,7 +360,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".getText()));
			}

		});
		"/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="Data);
		"/> <body xsi:type="mtl:TemplateInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> @@ -400,7 +372,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addKeyListener(new KeyAdapter() {

			/**
			 * {@inheritDoc}
			 * 
			 * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent)
			 */
			public void keyPressed(KeyEvent e) {
				if (e.character == SWT.CR) {
					if (propertiesEditionComponent != null)
						propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".addFocusListener(new FocusAdapter() {

			/**
			 * {@inheritDoc}
			 * 
			 * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent)
			 */
			public void focusLost(FocusEvent e) {
				if (propertiesEditionComponent != null)
					propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent("/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../api/widgetFormImpl.emtl#/0/editionPart"/> @@ -428,7 +400,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".getText()));
				}
			}

		});
		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent("/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".getText()));
			}

		});
		FormUtils.createHelpButton(widgetFactory, parent, propertiesEditionComponent.getHelpContent("/> <body xsi:type="mtl:TemplateInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../../services/naming.emtl#/0/editorID"/> @@ -1836,7 +1808,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="eefPackage"> @@ -1851,7 +1823,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4215,7 +4187,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="metamodelPrefix"> @@ -4741,7 +4713,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4811,6 +4783,11 @@ </eOperations> </eClassifiers> </ecore:EPackage> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List"> + <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + </eClassifiers> + </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> @@ -4932,15 +4909,6 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </ocl.ecore:Variable> - <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </ocl.ecore:Variable> - <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> - </ocl.ecore:Variable> - <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> <ecore:EAnnotation source="positions"> @@ -5058,7 +5026,7 @@ </eAnnotations> <eAnnotations source="positions.28" references="/0/additionalImplementation"> <details key="start" value="1313"/> - <details key="end" value="4208"/> + <details key="end" value="3697"/> </eAnnotations> <eAnnotations source="positions.29" references="/0/additionalImplementation/@body.0"> <details key="start" value="1531"/> @@ -5238,337 +5206,297 @@ </eAnnotations> <eAnnotations source="positions.73" references="/0/additionalImplementation/@body.22"> <details key="start" value="2248"/> - <details key="end" value="2338"/> + <details key="end" value="2353"/> </eAnnotations> <eAnnotations source="positions.74" references="/0/additionalImplementation/@body.23"> - <details key="start" value="2340"/> - <details key="end" value="2569"/> + <details key="start" value="2355"/> + <details key="end" value="2584"/> </eAnnotations> <eAnnotations source="positions.75" references="/0/additionalImplementation/@body.23/@body.0"> - <details key="start" value="2363"/> - <details key="end" value="2365"/> + <details key="start" value="2378"/> + <details key="end" value="2380"/> </eAnnotations> <eAnnotations source="positions.76" references="/0/additionalImplementation/@body.23/@body.1"> - <details key="start" value="2366"/> - <details key="end" value="2396"/> + <details key="start" value="2381"/> + <details key="end" value="2411"/> </eAnnotations> <eAnnotations source="positions.77" references="/0/additionalImplementation/@body.23/@body.1/@argument.0"> - <details key="start" value="2366"/> - <details key="end" value="2377"/> + <details key="start" value="2381"/> + <details key="end" value="2392"/> </eAnnotations> <eAnnotations source="positions.78" references="/0/additionalImplementation/@body.23/@body.1/@argument.0/editor"> - <details key="start" value="2366"/> - <details key="end" value="2372"/> + <details key="start" value="2381"/> + <details key="end" value="2387"/> </eAnnotations> <eAnnotations source="positions.79" references="/0/additionalImplementation/@body.23/@body.2"> - <details key="start" value="2398"/> - <details key="end" value="2420"/> + <details key="start" value="2413"/> + <details key="end" value="2435"/> </eAnnotations> <eAnnotations source="positions.80" references="/0/additionalImplementation/@body.23/@body.3"> - <details key="start" value="2421"/> - <details key="end" value="2451"/> + <details key="start" value="2436"/> + <details key="end" value="2466"/> </eAnnotations> <eAnnotations source="positions.81" references="/0/additionalImplementation/@body.23/@body.3/@argument.0"> - <details key="start" value="2421"/> - <details key="end" value="2432"/> + <details key="start" value="2436"/> + <details key="end" value="2447"/> </eAnnotations> <eAnnotations source="positions.82" references="/0/additionalImplementation/@body.23/@body.3/@argument.0/editor"> - <details key="start" value="2421"/> - <details key="end" value="2427"/> + <details key="start" value="2436"/> + <details key="end" value="2442"/> </eAnnotations> <eAnnotations source="positions.83" references="/0/additionalImplementation/@body.23/@body.4"> - <details key="start" value="2453"/> - <details key="end" value="2469"/> + <details key="start" value="2468"/> + <details key="end" value="2484"/> </eAnnotations> <eAnnotations source="positions.84" references="/0/additionalImplementation/@body.23/@body.5"> - <details key="start" value="2470"/> - <details key="end" value="2519"/> + <details key="start" value="2485"/> + <details key="end" value="2534"/> </eAnnotations> <eAnnotations source="positions.85" references="/0/additionalImplementation/@body.23/@body.5/@argument.0"> - <details key="start" value="2470"/> - <details key="end" value="2500"/> + <details key="start" value="2485"/> + <details key="end" value="2515"/> </eAnnotations> <eAnnotations source="positions.86" references="/0/additionalImplementation/@body.23/@body.5/@argument.0/editor"> - <details key="start" value="2470"/> - <details key="end" value="2476"/> + <details key="start" value="2485"/> + <details key="end" value="2491"/> </eAnnotations> <eAnnotations source="positions.87" references="/0/additionalImplementation/@body.23/@body.6"> - <details key="start" value="2521"/> - <details key="end" value="2522"/> + <details key="start" value="2536"/> + <details key="end" value="2537"/> </eAnnotations> <eAnnotations source="positions.88" references="/0/additionalImplementation/@body.23/@body.7"> - <details key="start" value="2523"/> - <details key="end" value="2548"/> + <details key="start" value="2538"/> + <details key="end" value="2563"/> </eAnnotations> <eAnnotations source="positions.89" references="/0/additionalImplementation/@body.23/@body.7/editor"> - <details key="start" value="2523"/> - <details key="end" value="2529"/> + <details key="start" value="2538"/> + <details key="end" value="2544"/> </eAnnotations> <eAnnotations source="positions.90" references="/0/additionalImplementation/@body.23/@body.8"> - <details key="start" value="2550"/> - <details key="end" value="2562"/> + <details key="start" value="2565"/> + <details key="end" value="2577"/> </eAnnotations> <eAnnotations source="positions.91" references="/0/additionalImplementation/@body.23/@ifExpr"> - <details key="start" value="2344"/> - <details key="end" value="2361"/> + <details key="start" value="2359"/> + <details key="end" value="2376"/> </eAnnotations> <eAnnotations source="positions.92" references="/0/additionalImplementation/@body.23/@ifExpr/editor"> - <details key="start" value="2345"/> - <details key="end" value="2351"/> + <details key="start" value="2360"/> + <details key="end" value="2366"/> </eAnnotations> <eAnnotations source="positions.93" references="/0/additionalImplementation/@body.24"> - <details key="start" value="2570"/> - <details key="end" value="2581"/> + <details key="start" value="2585"/> + <details key="end" value="2596"/> </eAnnotations> <eAnnotations source="positions.94" references="/0/additionalImplementation/@body.25"> - <details key="start" value="2582"/> - <details key="end" value="2612"/> + <details key="start" value="2597"/> + <details key="end" value="2627"/> </eAnnotations> <eAnnotations source="positions.95" references="/0/additionalImplementation/@body.25/@argument.0"> - <details key="start" value="2582"/> - <details key="end" value="2593"/> + <details key="start" value="2597"/> + <details key="end" value="2608"/> </eAnnotations> <eAnnotations source="positions.96" references="/0/additionalImplementation/@body.25/@argument.0/editor"> - <details key="start" value="2582"/> - <details key="end" value="2588"/> + <details key="start" value="2597"/> + <details key="end" value="2603"/> </eAnnotations> <eAnnotations source="positions.97" references="/0/additionalImplementation/@body.26"> - <details key="start" value="2614"/> - <details key="end" value="2663"/> + <details key="start" value="2629"/> + <details key="end" value="2678"/> </eAnnotations> <eAnnotations source="positions.98" references="/0/additionalImplementation/@body.27"> - <details key="start" value="2664"/> - <details key="end" value="2694"/> + <details key="start" value="2679"/> + <details key="end" value="2709"/> </eAnnotations> <eAnnotations source="positions.99" references="/0/additionalImplementation/@body.27/@argument.0"> - <details key="start" value="2664"/> - <details key="end" value="2675"/> + <details key="start" value="2679"/> + <details key="end" value="2690"/> </eAnnotations> <eAnnotations source="positions.100" references="/0/additionalImplementation/@body.27/@argument.0/editor"> - <details key="start" value="2664"/> - <details key="end" value="2670"/> + <details key="start" value="2679"/> + <details key="end" value="2685"/> </eAnnotations> <eAnnotations source="positions.101" references="/0/additionalImplementation/@body.28"> - <details key="start" value="2696"/> - <details key="end" value="2723"/> + <details key="start" value="2711"/> + <details key="end" value="2738"/> </eAnnotations> <eAnnotations source="positions.102" references="/0/additionalImplementation/@body.29"> - <details key="start" value="2724"/> - <details key="end" value="2754"/> + <details key="start" value="2739"/> + <details key="end" value="2769"/> </eAnnotations> <eAnnotations source="positions.103" references="/0/additionalImplementation/@body.29/@argument.0"> - <details key="start" value="2724"/> - <details key="end" value="2735"/> + <details key="start" value="2739"/> + <details key="end" value="2750"/> </eAnnotations> <eAnnotations source="positions.104" references="/0/additionalImplementation/@body.29/@argument.0/editor"> - <details key="start" value="2724"/> - <details key="end" value="2730"/> + <details key="start" value="2739"/> + <details key="end" value="2745"/> </eAnnotations> <eAnnotations source="positions.105" references="/0/additionalImplementation/@body.30"> - <details key="start" value="2756"/> - <details key="end" value="2780"/> + <details key="start" value="2771"/> + <details key="end" value="2795"/> </eAnnotations> <eAnnotations source="positions.106" references="/0/additionalImplementation/@body.31"> - <details key="start" value="2781"/> - <details key="end" value="2811"/> + <details key="start" value="2796"/> + <details key="end" value="2826"/> </eAnnotations> <eAnnotations source="positions.107" references="/0/additionalImplementation/@body.31/@argument.0"> - <details key="start" value="2781"/> - <details key="end" value="2792"/> + <details key="start" value="2796"/> + <details key="end" value="2807"/> </eAnnotations> <eAnnotations source="positions.108" references="/0/additionalImplementation/@body.31/@argument.0/editor"> - <details key="start" value="2781"/> - <details key="end" value="2787"/> + <details key="start" value="2796"/> + <details key="end" value="2802"/> </eAnnotations> <eAnnotations source="positions.109" references="/0/additionalImplementation/@body.32"> - <details key="start" value="2813"/> - <details key="end" value="2828"/> + <details key="start" value="2828"/> + <details key="end" value="2852"/> </eAnnotations> <eAnnotations source="positions.110" references="/0/additionalImplementation/@body.33"> - <details key="start" value="2829"/> - <details key="end" value="2859"/> + <details key="start" value="2853"/> + <details key="end" value="2883"/> </eAnnotations> <eAnnotations source="positions.111" references="/0/additionalImplementation/@body.33/@argument.0"> - <details key="start" value="2829"/> - <details key="end" value="2840"/> + <details key="start" value="2853"/> + <details key="end" value="2864"/> </eAnnotations> <eAnnotations source="positions.112" references="/0/additionalImplementation/@body.33/@argument.0/editor"> - <details key="start" value="2829"/> - <details key="end" value="2835"/> + <details key="start" value="2853"/> + <details key="end" value="2859"/> </eAnnotations> <eAnnotations source="positions.113" references="/0/additionalImplementation/@body.34"> - <details key="start" value="2861"/> - <details key="end" value="2870"/> + <details key="start" value="2885"/> + <details key="end" value="2900"/> </eAnnotations> <eAnnotations source="positions.114" references="/0/additionalImplementation/@body.35"> - <details key="start" value="2871"/> - <details key="end" value="2901"/> + <details key="start" value="2901"/> + <details key="end" value="2931"/> </eAnnotations> <eAnnotations source="positions.115" references="/0/additionalImplementation/@body.35/@argument.0"> - <details key="start" value="2871"/> - <details key="end" value="2882"/> + <details key="start" value="2901"/> + <details key="end" value="2912"/> </eAnnotations> <eAnnotations source="positions.116" references="/0/additionalImplementation/@body.35/@argument.0/editor"> - <details key="start" value="2871"/> - <details key="end" value="2877"/> + <details key="start" value="2901"/> + <details key="end" value="2907"/> </eAnnotations> <eAnnotations source="positions.117" references="/0/additionalImplementation/@body.36"> - <details key="start" value="2903"/> - <details key="end" value="3242"/> + <details key="start" value="2933"/> + <details key="end" value="2942"/> </eAnnotations> <eAnnotations source="positions.118" references="/0/additionalImplementation/@body.37"> - <details key="start" value="3243"/> - <details key="end" value="3263"/> + <details key="start" value="2943"/> + <details key="end" value="2973"/> </eAnnotations> - <eAnnotations source="positions.119" references="/0/additionalImplementation/@body.37/editor"> - <details key="start" value="3243"/> - <details key="end" value="3249"/> + <eAnnotations source="positions.119" references="/0/additionalImplementation/@body.37/@argument.0"> + <details key="start" value="2943"/> + <details key="end" value="2954"/> </eAnnotations> - <eAnnotations source="positions.120" references="/0/additionalImplementation/@body.38"> - <details key="start" value="3265"/> - <details key="end" value="3272"/> + <eAnnotations source="positions.120" references="/0/additionalImplementation/@body.37/@argument.0/editor"> + <details key="start" value="2943"/> + <details key="end" value="2949"/> </eAnnotations> - <eAnnotations source="positions.121" references="/0/additionalImplementation/@body.39"> - <details key="start" value="3273"/> - <details key="end" value="3290"/> + <eAnnotations source="positions.121" references="/0/additionalImplementation/@body.38"> + <details key="start" value="2975"/> + <details key="end" value="3314"/> </eAnnotations> - <eAnnotations source="positions.122" references="/0/additionalImplementation/@body.39/editor"> - <details key="start" value="3273"/> - <details key="end" value="3279"/> + <eAnnotations source="positions.122" references="/0/additionalImplementation/@body.39"> + <details key="start" value="3315"/> + <details key="end" value="3335"/> </eAnnotations> - <eAnnotations source="positions.123" references="/0/additionalImplementation/@body.40"> - <details key="start" value="3292"/> - <details key="end" value="3359"/> + <eAnnotations source="positions.123" references="/0/additionalImplementation/@body.39/editor"> + <details key="start" value="3315"/> + <details key="end" value="3321"/> </eAnnotations> - <eAnnotations source="positions.124" references="/0/additionalImplementation/@body.41"> - <details key="start" value="3360"/> - <details key="end" value="3390"/> + <eAnnotations source="positions.124" references="/0/additionalImplementation/@body.40"> + <details key="start" value="3337"/> + <details key="end" value="3344"/> </eAnnotations> - <eAnnotations source="positions.125" references="/0/additionalImplementation/@body.41/@argument.0"> - <details key="start" value="3360"/> - <details key="end" value="3371"/> + <eAnnotations source="positions.125" references="/0/additionalImplementation/@body.41"> + <details key="start" value="3345"/> + <details key="end" value="3362"/> </eAnnotations> - <eAnnotations source="positions.126" references="/0/additionalImplementation/@body.41/@argument.0/editor"> - <details key="start" value="3360"/> - <details key="end" value="3366"/> + <eAnnotations source="positions.126" references="/0/additionalImplementation/@body.41/editor"> + <details key="start" value="3345"/> + <details key="end" value="3351"/> </eAnnotations> <eAnnotations source="positions.127" references="/0/additionalImplementation/@body.42"> - <details key="start" value="3392"/> - <details key="end" value="3420"/> + <details key="start" value="3364"/> + <details key="end" value="3431"/> </eAnnotations> <eAnnotations source="positions.128" references="/0/additionalImplementation/@body.43"> - <details key="start" value="3421"/> - <details key="end" value="3451"/> + <details key="start" value="3432"/> + <details key="end" value="3462"/> </eAnnotations> <eAnnotations source="positions.129" references="/0/additionalImplementation/@body.43/@argument.0"> - <details key="start" value="3421"/> - <details key="end" value="3432"/> + <details key="start" value="3432"/> + <details key="end" value="3443"/> </eAnnotations> <eAnnotations source="positions.130" references="/0/additionalImplementation/@body.43/@argument.0/editor"> - <details key="start" value="3421"/> - <details key="end" value="3427"/> + <details key="start" value="3432"/> + <details key="end" value="3438"/> </eAnnotations> <eAnnotations source="positions.131" references="/0/additionalImplementation/@body.44"> - <details key="start" value="3453"/> - <details key="end" value="3819"/> + <details key="start" value="3464"/> + <details key="end" value="3584"/> </eAnnotations> <eAnnotations source="positions.132" references="/0/additionalImplementation/@body.45"> - <details key="start" value="3820"/> - <details key="end" value="3840"/> + <details key="start" value="3585"/> + <details key="end" value="3602"/> </eAnnotations> <eAnnotations source="positions.133" references="/0/additionalImplementation/@body.45/editor"> - <details key="start" value="3820"/> - <details key="end" value="3826"/> + <details key="start" value="3585"/> + <details key="end" value="3591"/> </eAnnotations> <eAnnotations source="positions.134" references="/0/additionalImplementation/@body.46"> - <details key="start" value="3842"/> - <details key="end" value="3849"/> + <details key="start" value="3604"/> + <details key="end" value="3606"/> </eAnnotations> <eAnnotations source="positions.135" references="/0/additionalImplementation/@body.47"> - <details key="start" value="3850"/> - <details key="end" value="3867"/> - </eAnnotations> - <eAnnotations source="positions.136" references="/0/additionalImplementation/@body.47/editor"> - <details key="start" value="3850"/> - <details key="end" value="3856"/> - </eAnnotations> - <eAnnotations source="positions.137" references="/0/additionalImplementation/@body.48"> - <details key="start" value="3869"/> - <details key="end" value="3936"/> - </eAnnotations> - <eAnnotations source="positions.138" references="/0/additionalImplementation/@body.49"> - <details key="start" value="3937"/> - <details key="end" value="3967"/> - </eAnnotations> - <eAnnotations source="positions.139" references="/0/additionalImplementation/@body.49/@argument.0"> - <details key="start" value="3937"/> - <details key="end" value="3948"/> - </eAnnotations> - <eAnnotations source="positions.140" references="/0/additionalImplementation/@body.49/@argument.0/editor"> - <details key="start" value="3937"/> - <details key="end" value="3943"/> - </eAnnotations> - <eAnnotations source="positions.141" references="/0/additionalImplementation/@body.50"> - <details key="start" value="3969"/> - <details key="end" value="4095"/> - </eAnnotations> - <eAnnotations source="positions.142" references="/0/additionalImplementation/@body.51"> - <details key="start" value="4096"/> - <details key="end" value="4113"/> - </eAnnotations> - <eAnnotations source="positions.143" references="/0/additionalImplementation/@body.51/editor"> - <details key="start" value="4096"/> - <details key="end" value="4102"/> - </eAnnotations> - <eAnnotations source="positions.144" references="/0/additionalImplementation/@body.52"> - <details key="start" value="4115"/> - <details key="end" value="4117"/> - </eAnnotations> - <eAnnotations source="positions.145" references="/0/additionalImplementation/@body.53"> - <details key="start" value="4118"/> - <details key="end" value="4158"/> + <details key="start" value="3607"/> + <details key="end" value="3647"/> </eAnnotations> - <eAnnotations source="positions.146" references="/0/additionalImplementation/@body.53/@argument.0"> - <details key="start" value="4118"/> - <details key="end" value="4148"/> + <eAnnotations source="positions.136" references="/0/additionalImplementation/@body.47/@argument.0"> + <details key="start" value="3607"/> + <details key="end" value="3637"/> </eAnnotations> - <eAnnotations source="positions.147" references="/0/additionalImplementation/@body.53/@argument.0/editor"> - <details key="start" value="4118"/> - <details key="end" value="4124"/> + <eAnnotations source="positions.137" references="/0/additionalImplementation/@body.47/@argument.0/editor"> + <details key="start" value="3607"/> + <details key="end" value="3613"/> </eAnnotations> - <eAnnotations source="positions.148" references="/0/additionalImplementation/@body.54"> - <details key="start" value="4160"/> - <details key="end" value="4196"/> + <eAnnotations source="positions.138" references="/0/additionalImplementation/@body.48"> + <details key="start" value="3649"/> + <details key="end" value="3685"/> </eAnnotations> - <eAnnotations source="positions.149" references="/0/additionalImplementation/editor"> + <eAnnotations source="positions.139" references="/0/additionalImplementation/editor"> <details key="start" value="1355"/> <details key="end" value="1377"/> </eAnnotations> - <eAnnotations source="positions.150" references="/0/additionalImplementation/pec"> + <eAnnotations source="positions.140" references="/0/additionalImplementation/pec"> <details key="start" value="1379"/> <details key="end" value="1411"/> </eAnnotations> - <eAnnotations source="positions.151" references="/0/additionalImplementation/inputPEC"> + <eAnnotations source="positions.141" references="/0/additionalImplementation/inputPEC"> <details key="start" value="1413"/> <details key="end" value="1449"/> </eAnnotations> - <eAnnotations source="positions.152" references="/0/additionalImplementation/@guard"> + <eAnnotations source="positions.142" references="/0/additionalImplementation/@guard"> <details key="start" value="1489"/> <details key="end" value="1528"/> </eAnnotations> - <eAnnotations source="positions.153" references="/0/additionalImplementation/@guard/@source"> + <eAnnotations source="positions.143" references="/0/additionalImplementation/@guard/@source"> <details key="start" value="1489"/> <details key="end" value="1515"/> </eAnnotations> - <eAnnotations source="positions.154" references="/0/additionalImplementation/@guard/@source/@source"> + <eAnnotations source="positions.144" references="/0/additionalImplementation/@guard/@source/@source"> <details key="start" value="1489"/> <details key="end" value="1510"/> </eAnnotations> - <eAnnotations source="positions.155" references="/0/additionalImplementation/@guard/@source/@source/editor"> + <eAnnotations source="positions.145" references="/0/additionalImplementation/@guard/@source/@source/editor"> <details key="start" value="1489"/> <details key="end" value="1495"/> </eAnnotations> - <eAnnotations source="positions.156" references="/0/additionalImplementation/@guard/@argument.0"> + <eAnnotations source="positions.146" references="/0/additionalImplementation/@guard/@argument.0"> <details key="start" value="1518"/> <details key="end" value="1528"/> </eAnnotations> diff --git a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaGettersSetters.emtl b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaGettersSetters.emtl index d5d4a6566..ae51b538b 100644 --- a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaGettersSetters.emtl +++ b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaGettersSetters.emtl @@ -1782,7 +1782,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="eefPackage"> @@ -1797,7 +1797,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4928,7 +4928,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="metamodelPrefix"> @@ -5421,7 +5421,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -5468,6 +5468,11 @@ </eOperations> </eClassifiers> </ecore:EPackage> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List"> + <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + </eClassifiers> + </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> diff --git a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaSWTImpl.emtl b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaSWTImpl.emtl index 0cc8b82ff..6f5be0bd4 100644 --- a/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaSWTImpl.emtl +++ b/plugins/org.eclipse.emf.eef.codegen/.emtl/org/eclipse/emf/eef/codegen/widgets/impl/textarea/textareaSWTImpl.emtl @@ -233,7 +233,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> - <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = new Text(parent, SWT.BORDER | SWT.WRAP | SWT.MULTI);
"/> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = new Text(parent, SWT.BORDER | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL);
"/> <body xsi:type="mtl:IfBlock"> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="		"/> <body xsi:type="mtl:TemplateInvocation"> @@ -336,6 +336,18 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> </argument> </body> + <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="Data.widthHint = 200;
		"/> + <body xsi:type="mtl:TemplateInvocation"> + <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <definition href="../../../services/common.emtl#/0/toJavaIdentifier"/> + <argument xsi:type="ocl.ecore:PropertyCallExp"> + <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <source xsi:type="ocl.ecore:VariableExp" name="editor" referredVariable="/0/additionalImplementation/editor"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </source> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ViewElement/name"/> + </argument> + </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".setLayoutData("/> <body xsi:type="mtl:TemplateInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> @@ -1756,7 +1768,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClassifier"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="eefPackage"> @@ -1771,7 +1783,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> </eParameters> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4135,7 +4147,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="metamodelPrefix"> @@ -4661,7 +4673,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="basePackage"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eParameters> </eOperations> <eOperations name="qualifiedName"> @@ -4731,6 +4743,11 @@ </eOperations> </eClassifiers> </ecore:EPackage> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List"> + <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + </eClassifiers> + </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> @@ -4837,6 +4854,9 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/eef/views/1.0.0#//ElementEditor"/> + </ocl.ecore:Variable> + <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> <ecore:EAnnotation source="positions"> @@ -4954,7 +4974,7 @@ </eAnnotations> <eAnnotations source="positions.28" references="/0/additionalImplementation"> <details key="start" value="1295"/> - <details key="end" value="2962"/> + <details key="end" value="3034"/> </eAnnotations> <eAnnotations source="positions.29" references="/0/additionalImplementation/@body.0"> <details key="start" value="1513"/> @@ -5134,225 +5154,241 @@ </eAnnotations> <eAnnotations source="positions.73" references="/0/additionalImplementation/@body.22"> <details key="start" value="2186"/> - <details key="end" value="2242"/> + <details key="end" value="2257"/> </eAnnotations> <eAnnotations source="positions.74" references="/0/additionalImplementation/@body.23"> - <details key="start" value="2244"/> - <details key="end" value="2473"/> + <details key="start" value="2259"/> + <details key="end" value="2488"/> </eAnnotations> <eAnnotations source="positions.75" references="/0/additionalImplementation/@body.23/@body.0"> - <details key="start" value="2267"/> - <details key="end" value="2269"/> + <details key="start" value="2282"/> + <details key="end" value="2284"/> </eAnnotations> <eAnnotations source="positions.76" references="/0/additionalImplementation/@body.23/@body.1"> - <details key="start" value="2270"/> - <details key="end" value="2300"/> + <details key="start" value="2285"/> + <details key="end" value="2315"/> </eAnnotations> <eAnnotations source="positions.77" references="/0/additionalImplementation/@body.23/@body.1/@argument.0"> - <details key="start" value="2270"/> - <details key="end" value="2281"/> + <details key="start" value="2285"/> + <details key="end" value="2296"/> </eAnnotations> <eAnnotations source="positions.78" references="/0/additionalImplementation/@body.23/@body.1/@argument.0/editor"> - <details key="start" value="2270"/> - <details key="end" value="2276"/> + <details key="start" value="2285"/> + <details key="end" value="2291"/> </eAnnotations> <eAnnotations source="positions.79" references="/0/additionalImplementation/@body.23/@body.2"> - <details key="start" value="2302"/> - <details key="end" value="2324"/> + <details key="start" value="2317"/> + <details key="end" value="2339"/> </eAnnotations> <eAnnotations source="positions.80" references="/0/additionalImplementation/@body.23/@body.3"> - <details key="start" value="2325"/> - <details key="end" value="2355"/> + <details key="start" value="2340"/> + <details key="end" value="2370"/> </eAnnotations> <eAnnotations source="positions.81" references="/0/additionalImplementation/@body.23/@body.3/@argument.0"> - <details key="start" value="2325"/> - <details key="end" value="2336"/> + <details key="start" value="2340"/> + <details key="end" value="2351"/> </eAnnotations> <eAnnotations source="positions.82" references="/0/additionalImplementation/@body.23/@body.3/@argument.0/editor"> - <details key="start" value="2325"/> - <details key="end" value="2331"/> + <details key="start" value="2340"/> + <details key="end" value="2346"/> </eAnnotations> <eAnnotations source="positions.83" references="/0/additionalImplementation/@body.23/@body.4"> - <details key="start" value="2357"/> - <details key="end" value="2373"/> + <details key="start" value="2372"/> + <details key="end" value="2388"/> </eAnnotations> <eAnnotations source="positions.84" references="/0/additionalImplementation/@body.23/@body.5"> - <details key="start" value="2374"/> - <details key="end" value="2423"/> + <details key="start" value="2389"/> + <details key="end" value="2438"/> </eAnnotations> <eAnnotations source="positions.85" references="/0/additionalImplementation/@body.23/@body.5/@argument.0"> - <details key="start" value="2374"/> - <details key="end" value="2404"/> + <details key="start" value="2389"/> + <details key="end" value="2419"/> </eAnnotations> <eAnnotations source="positions.86" references="/0/additionalImplementation/@body.23/@body.5/@argument.0/editor"> - <details key="start" value="2374"/> - <details key="end" value="2380"/> + <details key="start" value="2389"/> + <details key="end" value="2395"/> </eAnnotations> <eAnnotations source="positions.87" references="/0/additionalImplementation/@body.23/@body.6"> - <details key="start" value="2425"/> - <details key="end" value="2426"/> + <details key="start" value="2440"/> + <details key="end" value="2441"/> </eAnnotations> <eAnnotations source="positions.88" references="/0/additionalImplementation/@body.23/@body.7"> - <details key="start" value="2427"/> - <details key="end" value="2452"/> + <details key="start" value="2442"/> + <details key="end" value="2467"/> </eAnnotations> <eAnnotations source="positions.89" references="/0/additionalImplementation/@body.23/@body.7/editor"> - <details key="start" value="2427"/> - <details key="end" value="2433"/> + <details key="start" value="2442"/> + <details key="end" value="2448"/> </eAnnotations> <eAnnotations source="positions.90" references="/0/additionalImplementation/@body.23/@body.8"> - <details key="start" value="2454"/> - <details key="end" value="2466"/> + <details key="start" value="2469"/> + <details key="end" value="2481"/> </eAnnotations> <eAnnotations source="positions.91" references="/0/additionalImplementation/@body.23/@ifExpr"> - <details key="start" value="2248"/> - <details key="end" value="2265"/> + <details key="start" value="2263"/> + <details key="end" value="2280"/> </eAnnotations> <eAnnotations source="positions.92" references="/0/additionalImplementation/@body.23/@ifExpr/editor"> - <details key="start" value="2249"/> - <details key="end" value="2255"/> + <details key="start" value="2264"/> + <details key="end" value="2270"/> </eAnnotations> <eAnnotations source="positions.93" references="/0/additionalImplementation/@body.24"> - <details key="start" value="2474"/> - <details key="end" value="2485"/> + <details key="start" value="2489"/> + <details key="end" value="2500"/> </eAnnotations> <eAnnotations source="positions.94" references="/0/additionalImplementation/@body.25"> - <details key="start" value="2486"/> - <details key="end" value="2516"/> + <details key="start" value="2501"/> + <details key="end" value="2531"/> </eAnnotations> <eAnnotations source="positions.95" references="/0/additionalImplementation/@body.25/@argument.0"> - <details key="start" value="2486"/> - <details key="end" value="2497"/> + <details key="start" value="2501"/> + <details key="end" value="2512"/> </eAnnotations> <eAnnotations source="positions.96" references="/0/additionalImplementation/@body.25/@argument.0/editor"> - <details key="start" value="2486"/> - <details key="end" value="2492"/> + <details key="start" value="2501"/> + <details key="end" value="2507"/> </eAnnotations> <eAnnotations source="positions.97" references="/0/additionalImplementation/@body.26"> - <details key="start" value="2518"/> - <details key="end" value="2567"/> + <details key="start" value="2533"/> + <details key="end" value="2582"/> </eAnnotations> <eAnnotations source="positions.98" references="/0/additionalImplementation/@body.27"> - <details key="start" value="2568"/> - <details key="end" value="2598"/> + <details key="start" value="2583"/> + <details key="end" value="2613"/> </eAnnotations> <eAnnotations source="positions.99" references="/0/additionalImplementation/@body.27/@argument.0"> - <details key="start" value="2568"/> - <details key="end" value="2579"/> + <details key="start" value="2583"/> + <details key="end" value="2594"/> </eAnnotations> <eAnnotations source="positions.100" references="/0/additionalImplementation/@body.27/@argument.0/editor"> - <details key="start" value="2568"/> - <details key="end" value="2574"/> + <details key="start" value="2583"/> + <details key="end" value="2589"/> </eAnnotations> <eAnnotations source="positions.101" references="/0/additionalImplementation/@body.28"> - <details key="start" value="2600"/> - <details key="end" value="2627"/> + <details key="start" value="2615"/> + <details key="end" value="2642"/> </eAnnotations> <eAnnotations source="positions.102" references="/0/additionalImplementation/@body.29"> - <details key="start" value="2628"/> - <details key="end" value="2658"/> + <details key="start" value="2643"/> + <details key="end" value="2673"/> </eAnnotations> <eAnnotations source="positions.103" references="/0/additionalImplementation/@body.29/@argument.0"> - <details key="start" value="2628"/> - <details key="end" value="2639"/> + <details key="start" value="2643"/> + <details key="end" value="2654"/> </eAnnotations> <eAnnotations source="positions.104" references="/0/additionalImplementation/@body.29/@argument.0/editor"> - <details key="start" value="2628"/> - <details key="end" value="2634"/> + <details key="start" value="2643"/> + <details key="end" value="2649"/> </eAnnotations> <eAnnotations source="positions.105" references="/0/additionalImplementation/@body.30"> - <details key="start" value="2660"/> - <details key="end" value="2684"/> + <details key="start" value="2675"/> + <details key="end" value="2699"/> </eAnnotations> <eAnnotations source="positions.106" references="/0/additionalImplementation/@body.31"> - <details key="start" value="2685"/> - <details key="end" value="2715"/> + <details key="start" value="2700"/> + <details key="end" value="2730"/> </eAnnotations> <eAnnotations source="positions.107" references="/0/additionalImplementation/@body.31/@argument.0"> - <details key="start" value="2685"/> - <details key="end" value="2696"/> + <details key="start" value="2700"/> + <details key="end" value="2711"/> </eAnnotations> <eAnnotations source="positions.108" references="/0/additionalImplementation/@body.31/@argument.0/editor"> - <details key="start" value="2685"/> - <details key="end" value="2691"/> + <details key="start" value="2700"/> + <details key="end" value="2706"/> </eAnnotations> <eAnnotations source="positions.109" references="/0/additionalImplementation/@body.32"> - <details key="start" value="2717"/> - <details key="end" value="2732"/> + <details key="start" value="2732"/> + <details key="end" value="2756"/> </eAnnotations> <eAnnotations source="positions.110" references="/0/additionalImplementation/@body.33"> - <details key="start" value="2733"/> - <details key="end" value="2763"/> + <details key="start" value="2757"/> + <details key="end" value="2787"/> </eAnnotations> <eAnnotations source="positions.111" references="/0/additionalImplementation/@body.33/@argument.0"> - <details key="start" value="2733"/> - <details key="end" value="2744"/> + <details key="start" value="2757"/> + <details key="end" value="2768"/> </eAnnotations> <eAnnotations source="positions.112" references="/0/additionalImplementation/@body.33/@argument.0/editor"> - <details key="start" value="2733"/> - <details key="end" value="2739"/> + <details key="start" value="2757"/> + <details key="end" value="2763"/> </eAnnotations> <eAnnotations source="positions.113" references="/0/additionalImplementation/@body.34"> - <details key="start" value="2765"/> - <details key="end" value="2850"/> + <details key="start" value="2789"/> + <details key="end" value="2804"/> </eAnnotations> <eAnnotations source="positions.114" references="/0/additionalImplementation/@body.35"> - <details key="start" value="2851"/> - <details key="end" value="2868"/> + <details key="start" value="2805"/> + <details key="end" value="2835"/> </eAnnotations> - <eAnnotations source="positions.115" references="/0/additionalImplementation/@body.35/editor"> - <details key="start" value="2851"/> - <details key="end" value="2857"/> + <eAnnotations source="positions.115" references="/0/additionalImplementation/@body.35/@argument.0"> + <details key="start" value="2805"/> + <details key="end" value="2816"/> </eAnnotations> - <eAnnotations source="positions.116" references="/0/additionalImplementation/@body.36"> - <details key="start" value="2870"/> - <details key="end" value="2872"/> + <eAnnotations source="positions.116" references="/0/additionalImplementation/@body.35/@argument.0/editor"> + <details key="start" value="2805"/> + <details key="end" value="2811"/> </eAnnotations> - <eAnnotations source="positions.117" references="/0/additionalImplementation/@body.37"> - <details key="start" value="2873"/> - <details key="end" value="2913"/> + <eAnnotations source="positions.117" references="/0/additionalImplementation/@body.36"> + <details key="start" value="2837"/> + <details key="end" value="2922"/> </eAnnotations> - <eAnnotations source="positions.118" references="/0/additionalImplementation/@body.37/@argument.0"> - <details key="start" value="2873"/> - <details key="end" value="2903"/> + <eAnnotations source="positions.118" references="/0/additionalImplementation/@body.37"> + <details key="start" value="2923"/> + <details key="end" value="2940"/> </eAnnotations> - <eAnnotations source="positions.119" references="/0/additionalImplementation/@body.37/@argument.0/editor"> - <details key="start" value="2873"/> - <details key="end" value="2879"/> + <eAnnotations source="positions.119" references="/0/additionalImplementation/@body.37/editor"> + <details key="start" value="2923"/> + <details key="end" value="2929"/> </eAnnotations> <eAnnotations source="positions.120" references="/0/additionalImplementation/@body.38"> - <details key="start" value="2915"/> - <details key="end" value="2950"/> + <details key="start" value="2942"/> + <details key="end" value="2944"/> + </eAnnotations> + <eAnnotations source="positions.121" references="/0/additionalImplementation/@body.39"> + <details key="start" value="2945"/> + <details key="end" value="2985"/> + </eAnnotations> + <eAnnotations source="positions.122" references="/0/additionalImplementation/@body.39/@argument.0"> + <details key="start" value="2945"/> + <details key="end" value="2975"/> + </eAnnotations> + <eAnnotations source="positions.123" references="/0/additionalImplementation/@body.39/@argument.0/editor"> + <details key="start" value="2945"/> + <details key="end" value="2951"/> + </eAnnotations> + <eAnnotations source="positions.124" references="/0/additionalImplementation/@body.40"> + <details key="start" value="2987"/> + <details key="end" value="3022"/> </eAnnotations> - <eAnnotations source="positions.121" references="/0/additionalImplementation/editor"> + <eAnnotations source="positions.125" references="/0/additionalImplementation/editor"> <details key="start" value="1337"/> <details key="end" value="1359"/> </eAnnotations> - <eAnnotations source="positions.122" references="/0/additionalImplementation/pec"> + <eAnnotations source="positions.126" references="/0/additionalImplementation/pec"> <details key="start" value="1361"/> <details key="end" value="1393"/> </eAnnotations> - <eAnnotations source="positions.123" references="/0/additionalImplementation/inputPEC"> + <eAnnotations source="positions.127" references="/0/additionalImplementation/inputPEC"> <details key="start" value="1395"/> <details key="end" value="1431"/> </eAnnotations> - <eAnnotations source="positions.124" references="/0/additionalImplementation/@guard"> + <eAnnotations source="positions.128" references="/0/additionalImplementation/@guard"> <details key="start" value="1471"/> <details key="end" value="1510"/> </eAnnotations> - <eAnnotations source="positions.125" references="/0/additionalImplementation/@guard/@source"> + <eAnnotations source="positions.129" references="/0/additionalImplementation/@guard/@source"> <details key="start" value="1471"/> <details key="end" value="1497"/> </eAnnotations> - <eAnnotations source="positions.126" references="/0/additionalImplementation/@guard/@source/@source"> + <eAnnotations source="positions.130" references="/0/additionalImplementation/@guard/@source/@source"> <details key="start" value="1471"/> <details key="end" value="1492"/> </eAnnotations> - <eAnnotations source="positions.127" references="/0/additionalImplementation/@guard/@source/@source/editor"> + <eAnnotations source="positions.131" references="/0/additionalImplementation/@guard/@source/@source/editor"> <details key="start" value="1471"/> <details key="end" value="1477"/> </eAnnotations> - <eAnnotations source="positions.128" references="/0/additionalImplementation/@guard/@argument.0"> + <eAnnotations source="positions.132" references="/0/additionalImplementation/@guard/@argument.0"> <details key="start" value="1500"/> <details key="end" value="1510"/> </eAnnotations> |