[87260] Taking advantage of EMF support for multi-line and sorted property cell editors.

1 files changed, 465 insertions, 444 deletions

diff --git a/plugins/org.eclipse.uml2.uml/model/UML.genmodel b/plugins/org.eclipse.uml2.uml/model/UML.genmodel
index bd78d1a6..6aa79124 100644
--- a/plugins/org.eclipse.uml2.uml/model/UML.genmodel
+++ b/plugins/org.eclipse.uml2.uml/model/UML.genmodel
@@ -122,9 +122,10 @@
     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="UML.ecore#//String"/>
     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="UML.ecore#//UnlimitedNatural"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Comment">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Comment/body"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertyMultiLine="true"
+          ecoreFeature="ecore:EAttribute UML.ecore#//Comment/body"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Comment/annotatedElement"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Comment/annotatedElement"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Element">
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -136,7 +137,7 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Element/ownedComment">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Element/ownedComment">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Element/not_own_self">
@@ -243,27 +244,27 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Package">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Package/ownedType">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Package/ownedType">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Package/packageMerge">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Package/packageMerge">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Package/packagedElement">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Package/packagedElement">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Package/nestedPackage">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Package/nestedPackage">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Package/nestingPackage">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Package/nestingPackage">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference UML.ecore#//Package/profileApplication"/>
+          createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Package/profileApplication"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Package/elements_public_or_private">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Package/elements_public_or_private/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Package/elements_public_or_private/context"/>
@@ -327,13 +328,13 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//NamedElement/clientDependency"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//NamedElement/clientDependency"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//NamedElement/namespace">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//NamedElement/nameExpression">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//NamedElement/nameExpression">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//NamedElement/has_no_qualified_name">
@@ -367,9 +368,10 @@
           cacheAdapterScope="Global"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Dependency">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Dependency/supplier"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Dependency/supplier"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Dependency/client"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Dependency/client"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//DirectedRelationship">
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -389,15 +391,15 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Namespace">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Namespace/elementImport">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Namespace/elementImport">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Namespace/packageImport">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Namespace/packageImport">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Namespace/ownedRule">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Namespace/ownedRule">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -445,10 +447,10 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ElementImport/visibility"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ElementImport/alias"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ElementImport/importedElement"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ElementImport/importedElement"
           key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ElementImport/importingNamespace">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ElementImport/importingNamespace">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ElementImport/visibility_public_or_private">
@@ -463,10 +465,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//PackageImport">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//PackageImport/visibility"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//PackageImport/importedPackage"
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//PackageImport/importedPackage"
           key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//PackageImport/importingNamespace">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//PackageImport/importingNamespace">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//PackageImport/public_or_private">
@@ -476,13 +479,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Constraint">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Constraint/constrainedElement"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Constraint/constrainedElement"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Constraint/specification">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Constraint/specification">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Constraint/context">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Constraint/context">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Constraint/not_apply_to_self">
@@ -515,12 +518,12 @@
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ValueSpecification/isNull"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//TypedElement">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//TypedElement/type"
-          key="true"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//TypedElement/type" key="true"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Type">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Type/package">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Type/package">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Type/createAssociation">
@@ -544,17 +547,18 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Association">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Association/ownedEnd">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Association/ownedEnd">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Association/memberEnd"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Association/memberEnd"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Association/isDerived"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Association/endType">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Association/navigableOwnedEnd"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Association/navigableOwnedEnd"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Association/specialized_end_number">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Association/specialized_end_number/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Association/specialized_end_number/context"/>
@@ -578,11 +582,11 @@
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Classifier">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Classifier/isAbstract"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/generalization">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/generalization">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/powertypeExtent"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/powertypeExtent"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Classifier/feature">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
@@ -592,13 +596,13 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/redefinedClassifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/redefinedClassifier"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/general">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/general">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/substitution">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/substitution">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -606,17 +610,17 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/representation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/representation"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/collaborationUse">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/collaborationUse">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/ownedUseCase">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/ownedUseCase">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Classifier/useCase"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Classifier/useCase"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Classifier/no_cycles_in_generalization">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Classifier/no_cycles_in_generalization/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Classifier/no_cycles_in_generalization/context"/>
@@ -707,11 +711,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//TemplateableElement">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateableElement/templateBinding">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateableElement/templateBinding">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateableElement/ownedTemplateSignature">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateableElement/ownedTemplateSignature">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//TemplateableElement/parameterableElements"
@@ -719,14 +723,14 @@
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//TemplateableElement/isTemplate"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TemplateBinding">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//TemplateBinding/signature"
-          key="true"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//TemplateBinding/signature" key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateBinding/parameterSubstitution">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateBinding/parameterSubstitution">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateBinding/boundElement">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateBinding/boundElement">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//TemplateBinding/parameter_substitution_formal">
@@ -740,13 +744,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TemplateSignature">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateSignature/parameter"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateSignature/parameter"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateSignature/ownedParameter">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateSignature/ownedParameter">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateSignature/template">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateSignature/template">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//TemplateSignature/own_elements">
@@ -756,18 +760,19 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TemplateParameter">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/signature">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/signature">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/parameteredElement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/parameteredElement"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/ownedParameteredElement">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/ownedParameteredElement">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/default"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/default"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/ownedDefault">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameter/ownedDefault">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//TemplateParameter/must_be_compatible">
@@ -777,11 +782,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//ParameterableElement">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ParameterableElement/owningTemplateParameter">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ParameterableElement/owningTemplateParameter">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ParameterableElement/templateParameter"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ParameterableElement/templateParameter"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ParameterableElement/isCompatibleWith">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ParameterableElement/isCompatibleWith/p"/>
       </genOperations>
@@ -789,15 +794,15 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TemplateParameterSubstitution">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameterSubstitution/formal"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameterSubstitution/formal"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameterSubstitution/actual"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameterSubstitution/actual"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameterSubstitution/ownedActual">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameterSubstitution/ownedActual">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TemplateParameterSubstitution/templateBinding">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TemplateParameterSubstitution/templateBinding">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//TemplateParameterSubstitution/must_be_compatible">
@@ -807,12 +812,12 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Generalization">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Generalization/isSubstitutable"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Generalization/general"
-          key="true"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Generalization/general" key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Generalization/generalizationSet"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Generalization/generalizationSet"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Generalization/specific">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Generalization/specific">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Generalization/generalization_same_classifier">
@@ -824,8 +829,9 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//GeneralizationSet/isCovering"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//GeneralizationSet/isDisjoint"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//GeneralizationSet/powertype"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//GeneralizationSet/generalization"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//GeneralizationSet/powertype"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//GeneralizationSet/generalization"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//GeneralizationSet/generalization_same_classifier">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//GeneralizationSet/generalization_same_classifier/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//GeneralizationSet/generalization_same_classifier/context"/>
@@ -843,29 +849,30 @@
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Substitution">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Substitution/contract"
-          key="true"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Substitution/contract" key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Substitution/substitutingClassifier">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Substitution/substitutingClassifier">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Realization"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Abstraction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Abstraction/mapping">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Abstraction/mapping">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//OpaqueExpression">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueExpression/body"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertyMultiLine="true"
+          ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueExpression/body"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueExpression/language"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//OpaqueExpression/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//OpaqueExpression/behavior"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//OpaqueExpression/behavior"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//OpaqueExpression/language_body_size">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//OpaqueExpression/language_body_size/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//OpaqueExpression/language_body_size/context"/>
@@ -886,13 +893,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Parameter">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Parameter/parameterSet"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Parameter/parameterSet"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Parameter/operation"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Parameter/direction"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Parameter/default"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Parameter/defaultValue">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Parameter/defaultValue">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Parameter/isException"/>
@@ -944,11 +951,11 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//MultiplicityElement/upper"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//MultiplicityElement/lower"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//MultiplicityElement/upperValue">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//MultiplicityElement/upperValue">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//MultiplicityElement/lowerValue">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//MultiplicityElement/lowerValue">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//MultiplicityElement/upper_gt_0">
@@ -991,7 +998,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//ConnectableElement">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ConnectableElement/end"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConnectableElement/end"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ConnectorEnd">
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -999,9 +1006,9 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ConnectorEnd/partWithPort"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConnectorEnd/partWithPort"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ConnectorEnd/role"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConnectorEnd/role"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ConnectorEnd/multiplicity">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ConnectorEnd/multiplicity/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ConnectorEnd/multiplicity/context"/>
@@ -1024,7 +1031,7 @@
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Property/class"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Property/datatype">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Property/datatype">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Property/isDerived"/>
@@ -1035,28 +1042,29 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Property/redefinedProperty"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Property/redefinedProperty"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Property/owningAssociation">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Property/owningAssociation">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Property/defaultValue">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Property/defaultValue">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Property/opposite">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Property/opposite">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Property/subsettedProperty"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Property/association"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Property/subsettedProperty"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Property/association"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Property/qualifier">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Property/qualifier">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Property/associationEnd">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Property/associationEnd">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Property/multiplicity_of_composite">
@@ -1139,7 +1147,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//DeploymentTarget">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//DeploymentTarget/deployment">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//DeploymentTarget/deployment">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -1150,13 +1158,14 @@
           cacheAdapterScope="Global"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Deployment">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Deployment/deployedArtifact"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Deployment/deployedArtifact"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Deployment/configuration">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Deployment/configuration">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Deployment/location">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Deployment/location">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
@@ -1165,7 +1174,7 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//DeploymentSpecification/deploymentLocation"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//DeploymentSpecification/executionLocation"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//DeploymentSpecification/deployment">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//DeploymentSpecification/deployment">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//DeploymentSpecification/deployed_elements">
@@ -1180,19 +1189,19 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Artifact">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Artifact/fileName"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Artifact/nestedArtifact">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Artifact/nestedArtifact">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Artifact/manifestation">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Artifact/manifestation">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Artifact/ownedOperation">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Artifact/ownedOperation">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Artifact/ownedAttribute">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Artifact/ownedAttribute">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Artifact/createOwnedOperation">
@@ -1209,16 +1218,17 @@
       </genOperations>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Manifestation">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Manifestation/utilizedElement"
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Manifestation/utilizedElement"
           key="true"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Operation">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Operation/interface">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Operation/interface">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Operation/class">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Operation/class">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Operation/isQuery"/>
@@ -1227,19 +1237,19 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Operation/lower"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Operation/upper"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Operation/precondition"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Operation/precondition"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Operation/postcondition"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Operation/postcondition"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Operation/redefinedOperation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Operation/redefinedOperation"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Operation/datatype">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Operation/datatype">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Operation/bodyCondition"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Operation/bodyCondition"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Operation/type"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Operation/type"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Operation/at_most_one_return">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Operation/at_most_one_return/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Operation/at_most_one_return/context"/>
@@ -1276,18 +1286,18 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//BehavioralFeature">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//BehavioralFeature/ownedParameter"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehavioralFeature/ownedParameter"
           key="true">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//BehavioralFeature/isAbstract"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//BehavioralFeature/method"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehavioralFeature/method"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//BehavioralFeature/concurrency"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//BehavioralFeature/raisedException"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehavioralFeature/raisedException"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//BehavioralFeature/ownedParameterSet">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehavioralFeature/ownedParameterSet">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//BehavioralFeature/createReturnResult">
@@ -1298,9 +1308,9 @@
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Behavior">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Behavior/isReentrant"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Behavior/redefinedBehavior"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Behavior/redefinedBehavior"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Behavior/ownedParameter">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Behavior/ownedParameter">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
@@ -1308,15 +1318,15 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference UML.ecore#//Behavior/precondition"/>
+          createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Behavior/precondition"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference UML.ecore#//Behavior/postcondition"/>
+          createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Behavior/postcondition"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Behavior/ownedParameterSet">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Behavior/ownedParameterSet">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Behavior/specification"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Behavior/specification"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Behavior/parameters_match">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Behavior/parameters_match/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Behavior/parameters_match/context"/>
@@ -1337,20 +1347,20 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Class">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Class/nestedClassifier">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Class/nestedClassifier">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Class/ownedOperation">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Class/ownedOperation">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Class/superClass">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Class/superClass">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Class/isActive"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Class/ownedReception">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Class/ownedReception">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -1373,17 +1383,17 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//BehavioredClassifier">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//BehavioredClassifier/ownedBehavior">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehavioredClassifier/ownedBehavior">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//BehavioredClassifier/classifierBehavior"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehavioredClassifier/classifierBehavior"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//BehavioredClassifier/interfaceRealization">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehavioredClassifier/interfaceRealization">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//BehavioredClassifier/ownedTrigger">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehavioredClassifier/ownedTrigger">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//BehavioredClassifier/class_behavior">
@@ -1396,34 +1406,35 @@
           cacheAdapterScope="Global"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InterfaceRealization">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//InterfaceRealization/contract"
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//InterfaceRealization/contract"
           key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InterfaceRealization/implementingClassifier">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InterfaceRealization/implementingClassifier">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Interface">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interface/ownedAttribute">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interface/ownedAttribute">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interface/ownedOperation">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interface/ownedOperation">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interface/nestedClassifier">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interface/nestedClassifier">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Interface/redefinedInterface"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interface/redefinedInterface"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interface/ownedReception">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interface/ownedReception">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interface/protocol">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interface/protocol">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Interface/visibility">
@@ -1445,7 +1456,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Reception">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Reception/signal"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Reception/signal"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Reception/not_query">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Reception/not_query/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Reception/not_query/context"/>
@@ -1453,7 +1464,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Signal">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Signal/ownedAttribute">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Signal/ownedAttribute">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Signal/createOwnedAttribute">
@@ -1465,7 +1476,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ProtocolStateMachine">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ProtocolStateMachine/conformance">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ProtocolStateMachine/conformance">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ProtocolStateMachine/protocol_transitions">
@@ -1487,17 +1498,17 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//StateMachine">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StateMachine/region">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StateMachine/region">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//StateMachine/submachineState"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StateMachine/submachineState"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StateMachine/connectionPoint">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StateMachine/connectionPoint">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//StateMachine/extendedStateMachine"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StateMachine/extendedStateMachine"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//StateMachine/classifier_context">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//StateMachine/classifier_context/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//StateMachine/classifier_context/context"/>
@@ -1528,21 +1539,21 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Region">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Region/subvertex">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Region/subvertex">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Region/transition">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Region/transition">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Region/state">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Region/state">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Region/extendedRegion"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Region/extendedRegion"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Region/stateMachine">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Region/stateMachine">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Region/initial_vertex">
@@ -1570,11 +1581,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Vertex">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Vertex/outgoing"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Vertex/outgoing"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Vertex/incoming"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Vertex/incoming"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Vertex/container">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Vertex/container">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Vertex/containingStateMachine"/>
@@ -1582,27 +1593,27 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Transition">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Transition/kind"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Transition/container">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Transition/container">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Transition/target"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Transition/target"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Transition/redefinedTransition"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Transition/redefinedTransition"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Transition/guard">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Transition/guard">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Transition/effect">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Transition/effect">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Transition/trigger">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Transition/trigger">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Transition/source"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Transition/source"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Transition/fork_segment_guards">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Transition/fork_segment_guards/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Transition/fork_segment_guards/context"/>
@@ -1636,9 +1647,9 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Trigger">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Trigger/event"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Trigger/event"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Trigger/port"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Trigger/port"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Event"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Port">
@@ -1649,13 +1660,13 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Port/redefinedPort"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Port/redefinedPort"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Port/provided">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Port/protocol"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Port/protocol"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Port/required_interfaces">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Port/required_interfaces/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Port/required_interfaces/context"/>
@@ -1695,39 +1706,39 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//State/submachine"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/submachine"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//State/connection">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/connection">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//State/connectionPoint">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/connectionPoint">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//State/redefinedState"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/redefinedState"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//State/stateInvariant">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/stateInvariant">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//State/entry">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/entry">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//State/exit">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/exit">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//State/doActivity">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/doActivity">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//State/deferrableTrigger">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/deferrableTrigger">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//State/region">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//State/region">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//State/submachine_states">
@@ -1761,11 +1772,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ConnectionPointReference">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ConnectionPointReference/entry"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConnectionPointReference/entry"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ConnectionPointReference/exit"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConnectionPointReference/exit"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ConnectionPointReference/state">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConnectionPointReference/state">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ConnectionPointReference/entry_pseudostates">
@@ -1780,11 +1791,11 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Pseudostate">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Pseudostate/kind"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Pseudostate/stateMachine">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Pseudostate/stateMachine">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Pseudostate/state">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Pseudostate/state">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Pseudostate/initial_vertex">
@@ -1826,20 +1837,20 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ProtocolConformance">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ProtocolConformance/generalMachine"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ProtocolConformance/generalMachine"
           key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ProtocolConformance/specificMachine">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ProtocolConformance/specificMachine">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//EncapsulatedClassifier">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//EncapsulatedClassifier/ownedPort"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//EncapsulatedClassifier/ownedPort"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//StructuredClassifier">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StructuredClassifier/ownedAttribute">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StructuredClassifier/ownedAttribute">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -1851,7 +1862,7 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StructuredClassifier/ownedConnector">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StructuredClassifier/ownedConnector">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//StructuredClassifier/multiplicities">
@@ -1867,16 +1878,16 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Connector">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Connector/type"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Connector/type"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Connector/redefinedConnector"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Connector/redefinedConnector"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Connector/end">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Connector/end">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Connector/kind"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Connector/contract"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Connector/contract"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Connector/types">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Connector/types/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Connector/types/context"/>
@@ -1945,7 +1956,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Stereotype">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Stereotype/icon"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Stereotype/icon"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Stereotype/name_not_clash">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Stereotype/name_not_clash/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Stereotype/name_not_clash/context"/>
@@ -1983,11 +1994,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Profile">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Profile/ownedStereotype"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Profile/ownedStereotype"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Profile/metaclassReference"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Profile/metaclassReference"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Profile/metamodelReference"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Profile/metamodelReference"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Profile/metaclass_reference_not_specialized">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Profile/metaclass_reference_not_specialized/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Profile/metaclass_reference_not_specialized/context"/>
@@ -2022,9 +2033,10 @@
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Model/isMetamodel"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ParameterSet">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//ParameterSet/parameter"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//ParameterSet/parameter"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ParameterSet/condition">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ParameterSet/condition">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ParameterSet/same_parameterized_entity">
@@ -2042,11 +2054,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//DataType">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//DataType/ownedAttribute">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//DataType/ownedAttribute">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//DataType/ownedOperation">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//DataType/ownedOperation">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//DataType/createOwnedOperation">
@@ -2069,9 +2081,9 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ConnectableElementTemplateParameter"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//CollaborationUse">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//CollaborationUse/type"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CollaborationUse/type"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//CollaborationUse/roleBinding">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CollaborationUse/roleBinding">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//CollaborationUse/client_elements">
@@ -2089,23 +2101,23 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Collaboration">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Collaboration/collaborationRole"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Collaboration/collaborationRole"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//UseCase">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//UseCase/include">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//UseCase/include">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//UseCase/extend">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//UseCase/extend">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//UseCase/extensionPoint">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//UseCase/extensionPoint">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//UseCase/subject"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//UseCase/subject"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//UseCase/must_have_name">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//UseCase/must_have_name/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//UseCase/must_have_name/context"/>
@@ -2126,24 +2138,24 @@
           cacheAdapterScope="Global"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Include">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Include/addition"
-          key="true"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Include/addition" key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Include/includingCase">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Include/includingCase">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Extend">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Extend/extendedCase"
-          key="true"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Extend/extendedCase" key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Extend/condition">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Extend/condition">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Extend/extensionLocation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Extend/extensionLocation"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Extend/extension">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Extend/extension">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Extend/extension_points">
@@ -2153,7 +2165,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ExtensionPoint">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExtensionPoint/useCase">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExtensionPoint/useCase">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ExtensionPoint/must_have_name">
@@ -2163,7 +2175,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//RedefinableTemplateSignature">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//RedefinableTemplateSignature/extendedSignature"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//RedefinableTemplateSignature/extendedSignature"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//RedefinableTemplateSignature/inheritedParameter">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
@@ -2182,9 +2194,9 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ClassifierTemplateParameter">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ClassifierTemplateParameter/allowSubstitutable"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ClassifierTemplateParameter/defaultClassifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ClassifierTemplateParameter/defaultClassifier"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ClassifierTemplateParameter/constrainingClassifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ClassifierTemplateParameter/constrainingClassifier"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ClassifierTemplateParameter/has_constraining_classifier">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ClassifierTemplateParameter/has_constraining_classifier/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ClassifierTemplateParameter/has_constraining_classifier/context"/>
@@ -2192,11 +2204,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//StringExpression">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StringExpression/subExpression">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StringExpression/subExpression">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//StringExpression/owningExpression">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StringExpression/owningExpression">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//StringExpression/operands">
@@ -2211,23 +2223,24 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Expression">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Expression/symbol"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Expression/operand">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Expression/operand">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//PackageMerge">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//PackageMerge/mergedPackage"
-          key="true"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//PackageMerge/mergedPackage" key="true"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//PackageMerge/receivingPackage">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//PackageMerge/receivingPackage">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ProfileApplication">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//ProfileApplication/appliedProfile"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//ProfileApplication/appliedProfile"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ProfileApplication/isStrict"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ProfileApplication/applyingPackage"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ProfileApplication/applyingPackage"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ProfileApplication/getAppliedDefinition"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ProfileApplication/getAppliedDefinition.1">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ProfileApplication/getAppliedDefinition.1/namedElement"/>
@@ -2235,25 +2248,25 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Enumeration">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Enumeration/ownedLiteral">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Enumeration/ownedLiteral">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//EnumerationLiteral">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//EnumerationLiteral/enumeration">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//EnumerationLiteral/enumeration">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InstanceSpecification">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InstanceSpecification/classifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InstanceSpecification/classifier"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InstanceSpecification/slot">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InstanceSpecification/slot">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InstanceSpecification/specification">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InstanceSpecification/specification">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//InstanceSpecification/defining_feature">
@@ -2274,13 +2287,14 @@
       </genOperations>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Slot">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Slot/definingFeature"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Slot/definingFeature"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Slot/value">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Slot/value">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Slot/owningInstance">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Slot/owningInstance">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
@@ -2298,13 +2312,14 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//LiteralNull"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InstanceValue">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InstanceValue/instance"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InstanceValue/instance"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//LiteralUnlimitedNatural">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//LiteralUnlimitedNatural/value"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//OpaqueBehavior">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueBehavior/body"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertyMultiLine="true"
+          ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueBehavior/body"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueBehavior/language"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//FunctionBehavior">
@@ -2318,12 +2333,13 @@
       </genOperations>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//OpaqueAction">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueAction/body"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertyMultiLine="true"
+          ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueAction/body"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//OpaqueAction/language"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//OpaqueAction/inputValue"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//OpaqueAction/inputValue"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//OpaqueAction/outputValue"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//OpaqueAction/outputValue"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Action">
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -2339,43 +2355,43 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Action/localPrecondition">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Action/localPrecondition">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Action/localPostcondition">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Action/localPostcondition">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//ExecutableNode">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ExecutableNode/handler">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExecutableNode/handler">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//ActivityNode">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/inStructuredNode">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/inStructuredNode">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/activity">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/activity">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/outgoing"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/outgoing"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/incoming"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/incoming"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/inPartition"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/inPartition"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/inInterruptibleRegion"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/inInterruptibleRegion"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
           createChild="false" ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/inGroup">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/redefinedNode"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityNode/redefinedNode"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ActivityNode/owned_structured_node">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ActivityNode/owned_structured_node/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ActivityNode/owned_structured_node/context"/>
@@ -2387,16 +2403,16 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//StructuredActivityNode">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StructuredActivityNode/variable">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StructuredActivityNode/variable">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StructuredActivityNode/edge">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StructuredActivityNode/edge">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//StructuredActivityNode/mustIsolate"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StructuredActivityNode/node">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StructuredActivityNode/node">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//StructuredActivityNode/edges">
@@ -2414,7 +2430,7 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityGroup/inActivity">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityGroup/inActivity">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -2444,23 +2460,23 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Activity/variable">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Activity/variable">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Activity/node">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Activity/node">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Activity/isReadOnly"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Activity/edge">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Activity/edge">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Activity/partition"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Activity/partition"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Activity/isSingleExecution"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Activity/group">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Activity/group">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Activity/no_supergroups">
@@ -2478,11 +2494,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Variable">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Variable/scope">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Variable/scope">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Variable/activityScope">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Variable/activityScope">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Variable/owned">
@@ -2495,25 +2511,25 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//ActivityEdge">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/source"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/source"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/target"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/target"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/redefinedEdge"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/redefinedEdge"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/inPartition"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/inPartition"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/guard">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/guard">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/weight">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/weight">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/interrupts"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/interrupts"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/inStructuredNode">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/inStructuredNode">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -2521,7 +2537,7 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/activity">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityEdge/activity">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ActivityEdge/source_and_target">
@@ -2541,19 +2557,19 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ActivityPartition/isDimension"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ActivityPartition/isExternal"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/node"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/node"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/subpartition">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/subpartition">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/superPartition">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/superPartition">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/represents"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/represents"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/edge"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityPartition/edge"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ActivityPartition/dimension_not_contained">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ActivityPartition/dimension_not_contained/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ActivityPartition/dimension_not_contained/context"/>
@@ -2573,9 +2589,9 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InterruptibleActivityRegion">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InterruptibleActivityRegion/node"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InterruptibleActivityRegion/node"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InterruptibleActivityRegion/interruptingEdge"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InterruptibleActivityRegion/interruptingEdge"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//InterruptibleActivityRegion/interrupting_edges">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//InterruptibleActivityRegion/interrupting_edges/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//InterruptibleActivityRegion/interrupting_edges/context"/>
@@ -2583,13 +2599,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ExceptionHandler">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExceptionHandler/handlerBody"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExceptionHandler/handlerBody"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExceptionHandler/exceptionInput"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExceptionHandler/exceptionInput"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExceptionHandler/exceptionType"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExceptionHandler/exceptionType"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExceptionHandler/protectedNode">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExceptionHandler/protectedNode">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ExceptionHandler/exception_body">
@@ -2613,13 +2629,13 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ObjectNode/ordering"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ObjectNode/isControlType"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ObjectNode/upperBound">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ObjectNode/upperBound">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ObjectNode/inState"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ObjectNode/inState"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ObjectNode/selection"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ObjectNode/selection"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ObjectNode/object_flow_edges">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ObjectNode/object_flow_edges/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ObjectNode/object_flow_edges/context"/>
@@ -2648,7 +2664,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InputPin"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ValuePin">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ValuePin/value">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ValuePin/value">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ValuePin/compatible_type">
@@ -2659,7 +2675,7 @@
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//CallAction">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//CallAction/isSynchronous"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//CallAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CallAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//CallAction/synchronous_call">
@@ -2677,11 +2693,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//InvocationAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InvocationAction/argument">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InvocationAction/argument">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InvocationAction/onPort"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InvocationAction/onPort"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//InvocationAction/on_port_receiver">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//InvocationAction/on_port_receiver/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//InvocationAction/on_port_receiver/context"/>
@@ -2689,11 +2705,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//SendSignalAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//SendSignalAction/target">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//SendSignalAction/target">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//SendSignalAction/signal"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//SendSignalAction/signal"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//SendSignalAction/number_order">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//SendSignalAction/number_order/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//SendSignalAction/number_order/context"/>
@@ -2705,9 +2721,9 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//CallOperationAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//CallOperationAction/operation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CallOperationAction/operation"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//CallOperationAction/target">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CallOperationAction/target">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//CallOperationAction/argument_pin_equal_parameter">
@@ -2725,7 +2741,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//CallBehaviorAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//CallBehaviorAction/behavior"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CallBehaviorAction/behavior"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//CallBehaviorAction/argument_pin_equal_parameter">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//CallBehaviorAction/argument_pin_equal_parameter/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//CallBehaviorAction/argument_pin_equal_parameter/context"/>
@@ -2737,7 +2753,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//SequenceNode">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//SequenceNode/executableNode">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//SequenceNode/executableNode">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
@@ -2761,7 +2777,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ActivityParameterNode">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActivityParameterNode/parameter"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActivityParameterNode/parameter"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ActivityParameterNode/has_parameters">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ActivityParameterNode/has_parameters/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ActivityParameterNode/has_parameters/context"/>
@@ -2790,17 +2806,17 @@
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Message/messageSort"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Message/receiveEvent"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Message/receiveEvent"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Message/sendEvent"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Message/sendEvent"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Message/connector"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Message/connector"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Message/interaction">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Message/interaction">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Message/argument">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Message/argument">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -2840,61 +2856,61 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//MessageEnd">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//MessageEnd/message"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//MessageEnd/message"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Interaction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interaction/lifeline">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interaction/lifeline">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interaction/fragment">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interaction/fragment">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interaction/action">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interaction/action">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interaction/formalGate">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interaction/formalGate">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Interaction/message">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Interaction/message">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//InteractionFragment">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionFragment/covered"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionFragment/covered"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionFragment/generalOrdering">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionFragment/generalOrdering">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionFragment/enclosingInteraction">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionFragment/enclosingInteraction">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionFragment/enclosingOperand">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionFragment/enclosingOperand">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Lifeline">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Lifeline/represents"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Lifeline/represents"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Lifeline/interaction">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Lifeline/interaction">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Lifeline/selector">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Lifeline/selector">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Lifeline/decomposedAs"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Lifeline/decomposedAs"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Lifeline/coveredBy"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Lifeline/coveredBy"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Lifeline/interaction_uses_share_lifeline">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Lifeline/interaction_uses_share_lifeline/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Lifeline/interaction_uses_share_lifeline/context"/>
@@ -2924,13 +2940,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InteractionUse">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionUse/refersTo"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionUse/refersTo"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionUse/actualGate">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionUse/actualGate">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionUse/argument">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionUse/argument">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//InteractionUse/gates_match">
@@ -2962,25 +2978,25 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//GeneralOrdering">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//GeneralOrdering/before"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//GeneralOrdering/before"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//GeneralOrdering/after"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//GeneralOrdering/after"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//OccurrenceSpecification">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//OccurrenceSpecification/toBefore"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//OccurrenceSpecification/toBefore"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//OccurrenceSpecification/event"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//OccurrenceSpecification/event"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//OccurrenceSpecification/toAfter"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//OccurrenceSpecification/toAfter"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InteractionOperand">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionOperand/guard">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionOperand/guard">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionOperand/fragment">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionOperand/fragment">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//InteractionOperand/guard_directly_prior">
@@ -2994,11 +3010,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InteractionConstraint">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionConstraint/minint">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionConstraint/minint">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//InteractionConstraint/maxint">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InteractionConstraint/maxint">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//InteractionConstraint/dynamic_variables">
@@ -3028,9 +3044,9 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//ExecutionSpecification">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExecutionSpecification/start"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExecutionSpecification/start"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExecutionSpecification/finish"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExecutionSpecification/finish"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ExecutionSpecification/same_lifeline">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ExecutionSpecification/same_lifeline/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ExecutionSpecification/same_lifeline/context"/>
@@ -3038,13 +3054,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//StateInvariant">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StateInvariant/invariant">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StateInvariant/invariant">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ActionExecutionSpecification">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ActionExecutionSpecification/action"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActionExecutionSpecification/action"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ActionExecutionSpecification/action_referenced">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ActionExecutionSpecification/action_referenced/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ActionExecutionSpecification/action_referenced/context"/>
@@ -3052,7 +3068,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//BehaviorExecutionSpecification">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//BehaviorExecutionSpecification/behavior"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BehaviorExecutionSpecification/behavior"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ExecutionEvent"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//CreationEvent">
@@ -3069,25 +3085,25 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//SendOperationEvent">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//SendOperationEvent/operation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//SendOperationEvent/operation"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//MessageEvent"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//SendSignalEvent">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//SendSignalEvent/signal"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//SendSignalEvent/signal"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//MessageOccurrenceSpecification"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ExecutionOccurrenceSpecification">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExecutionOccurrenceSpecification/execution"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExecutionOccurrenceSpecification/execution"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReceiveOperationEvent">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReceiveOperationEvent/operation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReceiveOperationEvent/operation"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReceiveSignalEvent">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReceiveSignalEvent/signal"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReceiveSignalEvent/signal"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Actor">
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Actor/associations">
@@ -3101,17 +3117,17 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//CallEvent">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//CallEvent/operation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CallEvent/operation"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ChangeEvent">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ChangeEvent/changeExpression">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ChangeEvent/changeExpression">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//SignalEvent">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//SignalEvent/signal"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//SignalEvent/signal"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//AnyReceiveEvent"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ForkNode">
@@ -3144,7 +3160,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//DecisionNode">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//DecisionNode/decisionInput"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//DecisionNode/decisionInput"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//DecisionNode/one_incoming_edge">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//DecisionNode/one_incoming_edge/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//DecisionNode/one_incoming_edge/context"/>
@@ -3161,10 +3177,11 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ActivityFinalNode"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ComponentRealization">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ComponentRealization/abstraction">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ComponentRealization/abstraction">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//ComponentRealization/realizingClassifier"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//ComponentRealization/realizingClassifier"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Component">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//Component/isIndirectlyInstantiated"/>
@@ -3177,11 +3194,11 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Component/packagedElement">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Component/packagedElement">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Component/realization">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Component/realization">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Component/createOwnedClass">
@@ -3212,7 +3229,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Node">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//Node/nestedNode">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Node/nestedNode">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Node/internal_structure">
@@ -3226,11 +3243,11 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//CombinedFragment">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//CombinedFragment/interactionOperator"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//CombinedFragment/operand">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CombinedFragment/operand">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//CombinedFragment/cfragmentGate">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CombinedFragment/cfragmentGate">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//CombinedFragment/opt_loop_break_neg">
@@ -3267,7 +3284,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ConsiderIgnoreFragment">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ConsiderIgnoreFragment/message"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConsiderIgnoreFragment/message"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ConsiderIgnoreFragment/consider_or_ignore">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ConsiderIgnoreFragment/consider_or_ignore/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ConsiderIgnoreFragment/consider_or_ignore/context"/>
@@ -3279,9 +3296,9 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//CreateObjectAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//CreateObjectAction/classifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CreateObjectAction/classifier"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//CreateObjectAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CreateObjectAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//CreateObjectAction/classifier_not_abstract">
@@ -3305,7 +3322,7 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//DestroyObjectAction/isDestroyLinks"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//DestroyObjectAction/isDestroyOwnedObjects"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//DestroyObjectAction/target">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//DestroyObjectAction/target">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//DestroyObjectAction/multiplicity">
@@ -3319,15 +3336,15 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TestIdentityAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TestIdentityAction/first">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TestIdentityAction/first">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TestIdentityAction/second">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TestIdentityAction/second">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TestIdentityAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TestIdentityAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//TestIdentityAction/no_type">
@@ -3345,7 +3362,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReadSelfAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadSelfAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadSelfAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReadSelfAction/contained">
@@ -3367,9 +3384,9 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//StructuralFeatureAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//StructuralFeatureAction/structuralFeature"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StructuralFeatureAction/structuralFeature"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StructuralFeatureAction/object">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StructuralFeatureAction/object">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//StructuralFeatureAction/not_static">
@@ -3395,7 +3412,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReadStructuralFeatureAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadStructuralFeatureAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadStructuralFeatureAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReadStructuralFeatureAction/type_and_ordering">
@@ -3405,7 +3422,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//WriteStructuralFeatureAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//WriteStructuralFeatureAction/value">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//WriteStructuralFeatureAction/value">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//WriteStructuralFeatureAction/input_pin">
@@ -3417,7 +3434,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//RemoveStructuralFeatureValueAction">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//RemoveStructuralFeatureValueAction/isRemoveDuplicates"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//RemoveStructuralFeatureValueAction/removeAt">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//RemoveStructuralFeatureValueAction/removeAt">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//RemoveStructuralFeatureValueAction/non_unique_removal">
@@ -3428,7 +3445,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//AddStructuralFeatureValueAction">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//AddStructuralFeatureValueAction/isReplaceAll"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//AddStructuralFeatureValueAction/insertAt">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//AddStructuralFeatureValueAction/insertAt">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//AddStructuralFeatureValueAction/unlimited_natural_and_multiplicity">
@@ -3438,11 +3455,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//LinkAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//LinkAction/endData">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LinkAction/endData">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//LinkAction/inputValue">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LinkAction/inputValue">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//LinkAction/same_association">
@@ -3461,11 +3478,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//LinkEndData">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LinkEndData/value"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LinkEndData/value"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LinkEndData/end"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LinkEndData/end"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//LinkEndData/qualifier">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LinkEndData/qualifier">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//LinkEndData/property_is_association_end">
@@ -3491,9 +3508,9 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//QualifierValue">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//QualifierValue/qualifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//QualifierValue/qualifier"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//QualifierValue/value"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//QualifierValue/value"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//QualifierValue/qualifier_attribute">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//QualifierValue/qualifier_attribute/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//QualifierValue/qualifier_attribute/context"/>
@@ -3509,7 +3526,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReadLinkAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadLinkAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadLinkAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReadLinkAction/one_open_end">
@@ -3536,7 +3553,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//LinkEndCreationData">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//LinkEndCreationData/isReplaceAll"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LinkEndCreationData/insertAt"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LinkEndCreationData/insertAt"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//LinkEndCreationData/create_link_action">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//LinkEndCreationData/create_link_action/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//LinkEndCreationData/create_link_action/context"/>
@@ -3562,7 +3579,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//LinkEndDestructionData">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//LinkEndDestructionData/isDestroyDuplicates"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LinkEndDestructionData/destroyAt"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LinkEndDestructionData/destroyAt"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//LinkEndDestructionData/destroy_link_action">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//LinkEndDestructionData/destroy_link_action/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//LinkEndDestructionData/destroy_link_action/context"/>
@@ -3574,11 +3591,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ClearAssociationAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ClearAssociationAction/object">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ClearAssociationAction/object">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ClearAssociationAction/association"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ClearAssociationAction/association"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ClearAssociationAction/same_type">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ClearAssociationAction/same_type/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ClearAssociationAction/same_type/context"/>
@@ -3590,7 +3607,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//BroadcastSignalAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//BroadcastSignalAction/signal"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//BroadcastSignalAction/signal"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//BroadcastSignalAction/number_and_order">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//BroadcastSignalAction/number_and_order/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//BroadcastSignalAction/number_and_order/context"/>
@@ -3602,21 +3619,21 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//SendObjectAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//SendObjectAction/target">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//SendObjectAction/target">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//SendObjectAction/request">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//SendObjectAction/request">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ValueSpecificationAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ValueSpecificationAction/value">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ValueSpecificationAction/value">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ValueSpecificationAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ValueSpecificationAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ValueSpecificationAction/compatible_type">
@@ -3629,20 +3646,24 @@
       </genOperations>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TimeExpression">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//TimeExpression/expr"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//TimeExpression/expr"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TimeExpression/observation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TimeExpression/observation"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//Observation"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Duration">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Duration/expr"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Duration/expr"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Duration/observation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Duration/observation"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//DurationInterval"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Interval">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Interval/min"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference UML.ecore#//Interval/max"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Interval/min"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" propertySortChoices="true"
+          ecoreFeature="ecore:EReference UML.ecore#//Interval/max"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TimeConstraint">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//TimeConstraint/firstEvent"/>
@@ -3658,12 +3679,12 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TimeObservation">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//TimeObservation/event"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TimeObservation/event"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//TimeObservation/firstEvent"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//DurationObservation">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//DurationObservation/event"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//DurationObservation/event"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//DurationObservation/firstEvent"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//DurationObservation/first_event_multiplicity">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//DurationObservation/first_event_multiplicity/diagnostics"/>
@@ -3699,7 +3720,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//TimeEvent">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//TimeEvent/isRelative"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//TimeEvent/when">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//TimeEvent/when">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//TimeEvent/when_non_negative">
@@ -3713,7 +3734,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//VariableAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//VariableAction/variable"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//VariableAction/variable"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//VariableAction/scope_of_variable">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//VariableAction/scope_of_variable/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//VariableAction/scope_of_variable/context"/>
@@ -3721,7 +3742,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReadVariableAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadVariableAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadVariableAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReadVariableAction/type_and_ordering">
@@ -3735,7 +3756,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UML.ecore#//WriteVariableAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//WriteVariableAction/value">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//WriteVariableAction/value">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//WriteVariableAction/same_type">
@@ -3751,7 +3772,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//AddVariableValueAction">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//AddVariableValueAction/isReplaceAll"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//AddVariableValueAction/insertAt">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//AddVariableValueAction/insertAt">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//AddVariableValueAction/single_input_pin">
@@ -3762,7 +3783,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//RemoveVariableValueAction">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//RemoveVariableValueAction/isRemoveDuplicates"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//RemoveVariableValueAction/removeAt">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//RemoveVariableValueAction/removeAt">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//RemoveVariableValueAction/unlimited_natural">
@@ -3772,13 +3793,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//RaiseExceptionAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//RaiseExceptionAction/exception">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//RaiseExceptionAction/exception">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ActionInputPin">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ActionInputPin/fromAction">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ActionInputPin/fromAction">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ActionInputPin/one_output_pin">
@@ -3796,7 +3817,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InformationItem">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InformationItem/represented"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InformationItem/represented"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//InformationItem/sources_and_targets">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//InformationItem/sources_and_targets/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//InformationItem/sources_and_targets/context"/>
@@ -3812,19 +3833,19 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//InformationFlow">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/realization"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/realization"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/conveyed"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/conveyed"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/informationSource"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/informationSource"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/informationTarget"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/informationTarget"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/realizingActivityEdge"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/realizingActivityEdge"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/realizingConnector"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/realizingConnector"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/realizingMessage"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//InformationFlow/realizingMessage"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//InformationFlow/sources_and_targets_kind">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//InformationFlow/sources_and_targets_kind/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//InformationFlow/sources_and_targets_kind/context"/>
@@ -3840,11 +3861,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReadExtentAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadExtentAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadExtentAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadExtentAction/classifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadExtentAction/classifier"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReadExtentAction/type_is_classifier">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ReadExtentAction/type_is_classifier/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ReadExtentAction/type_is_classifier/context"/>
@@ -3857,11 +3878,11 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReclassifyObjectAction">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ReclassifyObjectAction/isReplaceAll"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReclassifyObjectAction/oldClassifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReclassifyObjectAction/oldClassifier"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReclassifyObjectAction/newClassifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReclassifyObjectAction/newClassifier"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReclassifyObjectAction/object">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReclassifyObjectAction/object">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReclassifyObjectAction/classifier_not_abstract">
@@ -3880,13 +3901,13 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReadIsClassifiedObjectAction">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ReadIsClassifiedObjectAction/isDirect"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadIsClassifiedObjectAction/classifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadIsClassifiedObjectAction/classifier"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadIsClassifiedObjectAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadIsClassifiedObjectAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadIsClassifiedObjectAction/object">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadIsClassifiedObjectAction/object">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReadIsClassifiedObjectAction/multiplicity_of_input">
@@ -3908,7 +3929,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//StartClassifierBehaviorAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//StartClassifierBehaviorAction/object">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//StartClassifierBehaviorAction/object">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//StartClassifierBehaviorAction/multiplicity">
@@ -3922,13 +3943,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReadLinkObjectEndAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndAction/object">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndAction/object">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndAction/end"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndAction/end"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReadLinkObjectEndAction/property">
@@ -3962,15 +3983,15 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReadLinkObjectEndQualifierAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndQualifierAction/object">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndQualifierAction/object">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndQualifierAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndQualifierAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndQualifierAction/qualifier"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReadLinkObjectEndQualifierAction/qualifier"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReadLinkObjectEndQualifierAction/qualifier_attribute">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ReadLinkObjectEndQualifierAction/qualifier_attribute/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ReadLinkObjectEndQualifierAction/qualifier_attribute/context"/>
@@ -4006,7 +4027,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//CreateLinkObjectAction">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//CreateLinkObjectAction/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//CreateLinkObjectAction/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//CreateLinkObjectAction/association_class">
@@ -4025,9 +4046,9 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//AcceptEventAction">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//AcceptEventAction/isUnmarshall"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//AcceptEventAction/result"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//AcceptEventAction/result"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//AcceptEventAction/trigger">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//AcceptEventAction/trigger">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//AcceptEventAction/no_input_pins">
@@ -4049,7 +4070,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//AcceptCallAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//AcceptCallAction/returnInformation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//AcceptCallAction/returnInformation"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//AcceptCallAction/result_pins">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//AcceptCallAction/result_pins/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//AcceptCallAction/result_pins/context"/>
@@ -4065,13 +4086,13 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReplyAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReplyAction/replyToCall"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReplyAction/replyToCall"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReplyAction/returnInformation">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReplyAction/returnInformation">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ReplyAction/replyValue">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReplyAction/replyValue">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReplyAction/pins_match_parameter">
@@ -4085,11 +4106,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//UnmarshallAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//UnmarshallAction/result"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//UnmarshallAction/result"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//UnmarshallAction/unmarshallType"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//UnmarshallAction/unmarshallType"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//UnmarshallAction/object">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//UnmarshallAction/object">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//UnmarshallAction/same_type">
@@ -4123,11 +4144,11 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ReduceAction">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ReduceAction/reducer"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReduceAction/reducer"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference UML.ecore#//ReduceAction/result"/>
+          createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReduceAction/result"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference UML.ecore#//ReduceAction/collection"/>
+          createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ReduceAction/collection"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ReduceAction/isOrdered"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ReduceAction/input_type_is_collection">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ReduceAction/input_type_is_collection/diagnostics"/>
@@ -4145,7 +4166,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//JoinNode">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//JoinNode/isCombineDuplicate"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//JoinNode/joinSpec">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//JoinNode/joinSpec">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//JoinNode/one_outgoing_edge">
@@ -4162,9 +4183,9 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ObjectFlow/isMulticast"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ObjectFlow/isMultireceive"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ObjectFlow/transformation"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ObjectFlow/transformation"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ObjectFlow/selection"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ObjectFlow/selection"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ObjectFlow/no_actions">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ObjectFlow/no_actions/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ObjectFlow/no_actions/context"/>
@@ -4202,11 +4223,11 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ConditionalNode/isDeterminate"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ConditionalNode/isAssured"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ConditionalNode/clause">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConditionalNode/clause">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ConditionalNode/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ConditionalNode/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ConditionalNode/result_no_incoming">
@@ -4216,17 +4237,17 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//Clause">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Clause/test"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Clause/test"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Clause/body"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Clause/body"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Clause/predecessorClause"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Clause/predecessorClause"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Clause/successorClause"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Clause/successorClause"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Clause/decider"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Clause/decider"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//Clause/bodyOutput"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//Clause/bodyOutput"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Clause/decider_output">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Clause/decider_output/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Clause/decider_output/context"/>
@@ -4239,25 +4260,25 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//LoopNode">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//LoopNode/isTestedFirst"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LoopNode/bodyPart"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LoopNode/bodyPart"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LoopNode/setupPart"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LoopNode/setupPart"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LoopNode/decider"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LoopNode/decider"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LoopNode/test"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LoopNode/test"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//LoopNode/result">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LoopNode/result">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//LoopNode/loopVariable">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LoopNode/loopVariable">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//LoopNode/bodyOutput"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LoopNode/bodyOutput"/>
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//LoopNode/loopVariableInput">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//LoopNode/loopVariableInput">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//LoopNode/input_edges">
@@ -4275,16 +4296,16 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ExpansionNode">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExpansionNode/regionAsOutput"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExpansionNode/regionAsOutput"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExpansionNode/regionAsInput"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExpansionNode/regionAsInput"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ExpansionRegion">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UML.ecore#//ExpansionRegion/mode"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExpansionRegion/inputElement"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExpansionRegion/inputElement"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ExpansionRegion/outputElement"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ExpansionRegion/outputElement"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ExpansionRegion/expansion_nodes">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ExpansionRegion/expansion_nodes/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ExpansionRegion/expansion_nodes/context"/>
@@ -4292,7 +4313,7 @@
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="UML.ecore#//ProtocolTransition">
       <genFeatures xsi:type="genmodel:GenFeature" children="true" createChild="true"
-          ecoreFeature="ecore:EReference UML.ecore#//ProtocolTransition/postCondition">
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ProtocolTransition/postCondition">
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
@@ -4300,7 +4321,7 @@
         <propertyFilterFlags>org.eclipse.ui.views.properties.expert</propertyFilterFlags>
       </genFeatures>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          ecoreFeature="ecore:EReference UML.ecore#//ProtocolTransition/preCondition"/>
+          propertySortChoices="true" ecoreFeature="ecore:EReference UML.ecore#//ProtocolTransition/preCondition"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//ProtocolTransition/belongs_to_psm">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ProtocolTransition/belongs_to_psm/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//ProtocolTransition/belongs_to_psm/context"/>