[496058] Update the default rules

Use the new reference widget
Mandatory features are represented with a bold label
Property descriptor description is used as help message
Property descriptor category is used to group the properties

Bug: 496058
Change-Id: I4cc2acd6bdf20a1b818d86900ffd0ecd8341f6da
Signed-off-by: Mélanie Bats <melanie.bats@obeo.fr>

30 files changed, 6186 insertions, 1990 deletions

diff --git a/plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java b/plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java
index b9d84f4f48..224dfc7868 100644
--- a/plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java
+++ b/plugins/org.eclipse.sirius.ext.emf.edit/src/org/eclipse/sirius/ext/emf/edit/EditingDomainServices.java
@@ -159,6 +159,12 @@ import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory
  */
 // CHECKSTYLE:OFF
 public class EditingDomainServices {
+    /**
+     * The name used for the default category when nothing is specified in the
+     * genmodel.
+     */
+    public static final String DEFAULT_CATEGORY_NAME = "Default";
+
     private AdapterFactory defaultAdapterFactory;
 
     public EditingDomainServices() {
@@ -473,10 +479,12 @@ public class EditingDomainServices {
     public String getPropertyDescriptorCategory(EObject self, String featureName) {
         IItemPropertyDescriptor desc = getPropertyDescriptorForFeature(self, featureName);
         if (desc != null) {
-            return desc.getCategory(self);
-        } else {
-            return null;
+            String category = desc.getCategory(self);
+            if (category != null) {
+                return category;
+            }
         }
+        return DEFAULT_CATEGORY_NAME;
     }
 
     public String getPropertyDescriptorDescription(EObject self, String featureName) {
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/icons/full/ctool16/CreateTestElement_containmentReferenceMandatory_TestElement.gif b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/icons/full/ctool16/CreateTestElement_containmentReferenceMandatory_TestElement.gif
new file mode 100644
index 0000000000..40ef685420
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/icons/full/ctool16/CreateTestElement_containmentReferenceMandatory_TestElement.gif
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties
index a301af00f6..60706c3949 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/plugin.properties
@@ -41,3 +41,42 @@ _UI_TestElement_references_feature = References
 _UI_TestEnum_Literal1_literal = Literal1
 _UI_TestEnum_Literal2_literal = Literal2
 _UI_TestEnum_Literal3_literal = Literal3
+_UI_TestElement_charAttribute_feature = Char Attribute
+_UI_TestElement_charAttributes_feature = Char Attributes
+_UI_TestElement_dateAttribute_feature = Date Attribute
+_UI_TestElement_dateAttributes_feature = Date Attributes
+_UI_TestElement_doubleAttribute_feature = Double Attribute
+_UI_TestElement_doubleAttributes_feature = Double Attributes
+_UI_TestElement_floatAttribute_feature = Float Attribute
+_UI_TestElement_floatAttributes_feature = Float Attributes
+_UI_TestElement_longAttribute_feature = Long Attribute
+_UI_TestElement_longAttributes_feature = Long Attributes
+_UI_TestElement_shortAttribute_feature = Short Attribute
+_UI_TestElement_shortAttributes_feature = Short Attributes
+_UI_TestElement_deriveAttribute_feature = Derive Attribute
+_UI_TestElement_transientAttribute_feature = Transient Attribute
+_UI_TestElement_nonChangeableAttribute_feature = Non Changeable Attribute
+_UI_TestElement_optionalFeature_feature = Optional Feature
+_UI_TestElement_mandatoryFeature_feature = Mandatory Feature
+_UI_TestElement_multilineAttribute_feature = Multiline Attribute
+_UI_TestElement_derivedAttribute_feature = Derived Attribute
+_UI_TestElement_stringAttributeMandatory_feature = String Attribute Mandatory
+_UI_TestElement_intAttributeMandatory_feature = Int Attribute Mandatory
+_UI_TestElement_booleanAttributeMandatory_feature = Boolean Attribute Mandatory
+_UI_TestElement_enumAttributeMandatory_feature = Enum Attribute Mandatory
+_UI_TestElement_containmentReferenceMandatory_feature = Containment Reference Mandatory
+_UI_TestElement_referenceMandatory_feature = Reference Mandatory
+_UI_TestElement_charAttributeMandatory_feature = Char Attribute Mandatory
+_UI_TestElement_dateAttributeMandatory_feature = Date Attribute Mandatory
+_UI_TestElement_doubleAttributeMandatory_feature = Double Attribute Mandatory
+_UI_TestElement_floatAttributeMandatory_feature = Float Attribute Mandatory
+_UI_TestElement_longAttributeMandatory_feature = Long Attribute Mandatory
+_UI_TestElement_shortAttributeMandatory_feature = Short Attribute Mandatory
+_UI_TestElement_stringAttributeMultiline_feature = String Attribute Multiline
+_UI_TestElement_stringAttributeMultilineMandatory_feature = String Attribute Multiline Mandatory
+_UI_TestElement_stringAttribute_description = String attribute Description
+_UI_EnumPropertyCategory = Enum
+_UI_NumberPropertyCategory = Number
+_UI_ReferencePropertyCategory = Reference
+_UI_TextPropertyCategory = Text
+_UI_BooleanPropertyCategory = Boolean
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/PropertiestestsEditPlugin.java b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/PropertiestestsEditPlugin.java
index 496640b330..b6dbea7617 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/PropertiestestsEditPlugin.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/PropertiestestsEditPlugin.java
@@ -34,35 +34,37 @@ public final class PropertiestestsEditPlugin extends EMFPlugin {
     private static Implementation plugin;
 
     /**
-     * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Create the instance.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     public PropertiestestsEditPlugin() {
-        super(new ResourceLocator[] {});
+        super
+          (new ResourceLocator [] {
+           });
     }
 
     /**
-     * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
+     * Returns the singleton instance of the Eclipse plugin.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @return the singleton instance.
      * @generated
      */
     @Override
     public ResourceLocator getPluginResourceLocator() {
-        return PropertiestestsEditPlugin.plugin;
+        return plugin;
     }
 
     /**
-     * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
+     * Returns the singleton instance of the Eclipse plugin.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @return the singleton instance.
      * @generated
      */
     public static Implementation getPlugin() {
-        return PropertiestestsEditPlugin.plugin;
+        return plugin;
     }
 
     /**
@@ -73,8 +75,8 @@ public final class PropertiestestsEditPlugin extends EMFPlugin {
      */
     public static class Implementation extends EclipsePlugin {
         /**
-         * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * Creates an instance.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
         public Implementation() {
@@ -82,7 +84,7 @@ public final class PropertiestestsEditPlugin extends EMFPlugin {
 
             // Remember the static instance.
             //
-            PropertiestestsEditPlugin.plugin = this;
+            plugin = this;
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/PropertiestestsItemProviderAdapterFactory.java b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/PropertiestestsItemProviderAdapterFactory.java
index 836417bfa5..8ddc6df4d3 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/PropertiestestsItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/PropertiestestsItemProviderAdapterFactory.java
@@ -27,20 +27,18 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.sirius.tests.rcptt.properties.propertiestests.util.PropertiestestsAdapterFactory;
 
 /**
- * This is the factory that is used to provide the interfaces needed to support
- * Viewers. The adapters generated by this factory convert EMF adapter
- * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The
- * adapters also support Eclipse property sheets. Note that most of the adapters
- * are shared among multiple instances. <!-- begin-user-doc --> <!--
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc --> <!--
  * end-user-doc -->
- *
  * @generated
  */
 public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
     /**
-     * This keeps track of the root adapter factory that delegates to this
-     * adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This keeps track of the root adapter factory that delegates to this adapter factory.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,10 +53,9 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
     protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
     /**
-     * This keeps track of all the supported types checked by
-     * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!--
+     * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -78,19 +75,15 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected TestRootItemProvider testRootItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This creates an adapter for a {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -103,19 +96,15 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
     }
 
     /**
-     * This keeps track of the one adapter used for all
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}
-     * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This keeps track of the one adapter used for all {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement} instances.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected TestElementItemProvider testElementItemProvider;
 
     /**
-     * This creates an adapter for a
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}
-     * . <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This creates an adapter for a {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -151,7 +140,6 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -160,9 +148,8 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
     }
 
     /**
-     * This implementation substitutes the factory itself as the key for the
-     * adapter. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This implementation substitutes the factory itself as the key for the adapter.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -172,14 +159,13 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public Object adapt(Object object, Object type) {
         if (isFactoryForType(type)) {
             Object adapter = super.adapt(object, type);
-            if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
+            if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
                 return adapter;
             }
         }
@@ -188,8 +174,8 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
     }
 
     /**
-     * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This adds a listener.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -198,8 +184,8 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
     }
 
     /**
-     * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This removes a listener.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -231,12 +217,8 @@ public class PropertiestestsItemProviderAdapterFactory extends PropertiestestsAd
      */
     @Override
     public void dispose() {
-        if (testRootItemProvider != null) {
-            testRootItemProvider.dispose();
-        }
-        if (testElementItemProvider != null) {
-            testElementItemProvider.dispose();
-        }
+        if (testRootItemProvider != null) testRootItemProvider.dispose();
+        if (testElementItemProvider != null) testElementItemProvider.dispose();
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/TestElementItemProvider.java b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/TestElementItemProvider.java
index 9bcfa9d746..c0ee26f09b 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/TestElementItemProvider.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/TestElementItemProvider.java
@@ -29,10 +29,8 @@ import org.eclipse.sirius.tests.rcptt.properties.propertiestests.Propertiestests
 import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This is the item provider adapter for a {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class TestElementItemProvider extends ItemProviderAdapter
@@ -60,14 +58,43 @@ public class TestElementItemProvider extends ItemProviderAdapter
 
             addStringAttributePropertyDescriptor(object);
             addStringAttributesPropertyDescriptor(object);
+            addStringAttributeMandatoryPropertyDescriptor(object);
+            addStringAttributeMultilinePropertyDescriptor(object);
+            addStringAttributeMultilineMandatoryPropertyDescriptor(object);
             addIntAttributePropertyDescriptor(object);
             addIntAttributesPropertyDescriptor(object);
+            addIntAttributeMandatoryPropertyDescriptor(object);
             addBooleanAttributePropertyDescriptor(object);
             addBooleanAttributesPropertyDescriptor(object);
+            addBooleanAttributeMandatoryPropertyDescriptor(object);
             addEnumAttributePropertyDescriptor(object);
             addEnumAttributesPropertyDescriptor(object);
+            addEnumAttributeMandatoryPropertyDescriptor(object);
             addReferencePropertyDescriptor(object);
             addReferencesPropertyDescriptor(object);
+            addReferenceMandatoryPropertyDescriptor(object);
+            addCharAttributePropertyDescriptor(object);
+            addCharAttributesPropertyDescriptor(object);
+            addCharAttributeMandatoryPropertyDescriptor(object);
+            addDateAttributePropertyDescriptor(object);
+            addDateAttributesPropertyDescriptor(object);
+            addDateAttributeMandatoryPropertyDescriptor(object);
+            addDoubleAttributePropertyDescriptor(object);
+            addDoubleAttributesPropertyDescriptor(object);
+            addDoubleAttributeMandatoryPropertyDescriptor(object);
+            addFloatAttributePropertyDescriptor(object);
+            addFloatAttributesPropertyDescriptor(object);
+            addFloatAttributeMandatoryPropertyDescriptor(object);
+            addLongAttributePropertyDescriptor(object);
+            addLongAttributesPropertyDescriptor(object);
+            addLongAttributeMandatoryPropertyDescriptor(object);
+            addShortAttributePropertyDescriptor(object);
+            addShortAttributesPropertyDescriptor(object);
+            addShortAttributeMandatoryPropertyDescriptor(object);
+            addDerivedAttributePropertyDescriptor(object);
+            addTransientAttributePropertyDescriptor(object);
+            addNonChangeableAttributePropertyDescriptor(object);
+            addOptionalFeaturePropertyDescriptor(object);
         }
         return itemPropertyDescriptors;
     }
@@ -79,9 +106,19 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addStringAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_stringAttribute_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_stringAttribute_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__STRING_ATTRIBUTE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_stringAttribute_feature"),
+                 getString("_UI_TestElement_stringAttribute_description"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__STRING_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
     }
 
     /**
@@ -91,9 +128,85 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addStringAttributesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_stringAttributes_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_stringAttributes_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__STRING_ATTRIBUTES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_stringAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_stringAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__STRING_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the String Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addStringAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_stringAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_stringAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the String Attribute Multiline feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addStringAttributeMultilinePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_stringAttributeMultiline_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_stringAttributeMultiline_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE,
+                 true,
+                 true,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the String Attribute Multiline Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addStringAttributeMultilineMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_stringAttributeMultilineMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_stringAttributeMultilineMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY,
+                 true,
+                 true,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
     }
 
     /**
@@ -103,9 +216,19 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addIntAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_intAttribute_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_intAttribute_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__INT_ATTRIBUTE, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_intAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_intAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__INT_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
     }
 
     /**
@@ -115,9 +238,41 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addIntAttributesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_intAttributes_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_intAttributes_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__INT_ATTRIBUTES, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_intAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_intAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__INT_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Int Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addIntAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_intAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_intAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
     }
 
     /**
@@ -127,9 +282,19 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addBooleanAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_booleanAttribute_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_booleanAttribute_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__BOOLEAN_ATTRIBUTE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_booleanAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_booleanAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__BOOLEAN_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+                 getString("_UI_BooleanPropertyCategory"),
+                 null));
     }
 
     /**
@@ -139,9 +304,41 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addBooleanAttributesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_booleanAttributes_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_booleanAttributes_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__BOOLEAN_ATTRIBUTES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_booleanAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_booleanAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__BOOLEAN_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+                 getString("_UI_BooleanPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Boolean Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addBooleanAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_booleanAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_booleanAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+                 getString("_UI_BooleanPropertyCategory"),
+                 null));
     }
 
     /**
@@ -151,9 +348,19 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addEnumAttributePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_enumAttribute_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_enumAttribute_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__ENUM_ATTRIBUTE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_enumAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_enumAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__ENUM_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_EnumPropertyCategory"),
+                 null));
     }
 
     /**
@@ -163,9 +370,41 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addEnumAttributesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_enumAttributes_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_enumAttributes_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__ENUM_ATTRIBUTES, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_enumAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_enumAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__ENUM_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_EnumPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Enum Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addEnumAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_enumAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_enumAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_EnumPropertyCategory"),
+                 null));
     }
 
     /**
@@ -175,9 +414,19 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addReferencePropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_reference_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_reference_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__REFERENCE, true, false, true, null, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_reference_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_reference_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__REFERENCE,
+                 true,
+                 false,
+                 true,
+                 null,
+                 getString("_UI_ReferencePropertyCategory"),
+                 null));
     }
 
     /**
@@ -187,19 +436,532 @@ public class TestElementItemProvider extends ItemProviderAdapter
      * @generated
      */
     protected void addReferencesPropertyDescriptor(Object object) {
-        itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-                getString("_UI_TestElement_references_feature"), getString("_UI_PropertyDescriptor_description", "_UI_TestElement_references_feature", "_UI_TestElement_type"),
-                PropertiestestsPackage.Literals.TEST_ELEMENT__REFERENCES, true, false, true, null, null, null));
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_references_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_references_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__REFERENCES,
+                 true,
+                 false,
+                 true,
+                 null,
+                 getString("_UI_ReferencePropertyCategory"),
+                 null));
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This adds a property descriptor for the Reference Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addReferenceMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_referenceMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_referenceMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__REFERENCE_MANDATORY,
+                 true,
+                 false,
+                 true,
+                 null,
+                 getString("_UI_ReferencePropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Char Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addCharAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_charAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_charAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__CHAR_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Char Attributes feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addCharAttributesPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_charAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_charAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__CHAR_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Char Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addCharAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_charAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_charAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.TEXT_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Date Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addDateAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_dateAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_dateAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__DATE_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Date Attributes feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addDateAttributesPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_dateAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_dateAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__DATE_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Date Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addDateAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_dateAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_dateAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 getString("_UI_TextPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Double Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addDoubleAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_doubleAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_doubleAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__DOUBLE_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Double Attributes feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addDoubleAttributesPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_doubleAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_doubleAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__DOUBLE_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Double Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addDoubleAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_doubleAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_doubleAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Float Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addFloatAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_floatAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_floatAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__FLOAT_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Float Attributes feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addFloatAttributesPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_floatAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_floatAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__FLOAT_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Float Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addFloatAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_floatAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_floatAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Long Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addLongAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_longAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_longAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__LONG_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Long Attributes feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addLongAttributesPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_longAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_longAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__LONG_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Long Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addLongAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_longAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_longAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Short Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addShortAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_shortAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_shortAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__SHORT_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Short Attributes feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addShortAttributesPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_shortAttributes_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_shortAttributes_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__SHORT_ATTRIBUTES,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Short Attribute Mandatory feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addShortAttributeMandatoryPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_shortAttributeMandatory_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_shortAttributeMandatory_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+                 getString("_UI_NumberPropertyCategory"),
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Derived Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addDerivedAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_derivedAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_derivedAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__DERIVED_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Transient Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addTransientAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_transientAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_transientAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__TRANSIENT_ATTRIBUTE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Non Changeable Attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addNonChangeableAttributePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_nonChangeableAttribute_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_nonChangeableAttribute_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__NON_CHANGEABLE_ATTRIBUTE,
+                 false,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
+    }
+
+    /**
+     * This adds a property descriptor for the Optional Feature feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected void addOptionalFeaturePropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_TestElement_optionalFeature_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_TestElement_optionalFeature_feature", "_UI_TestElement_type"),
+                 PropertiestestsPackage.Literals.TEST_ELEMENT__OPTIONAL_FEATURE,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
+    }
+
+    /**
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -208,19 +970,18 @@ public class TestElementItemProvider extends ItemProviderAdapter
             super.getChildrenFeatures(object);
             childrenFeatures.add(PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCE);
             childrenFeatures.add(PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCES);
+            childrenFeatures.add(PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY);
         }
         return childrenFeatures;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
+        // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
         return super.getChildFeature(object, child);
@@ -238,23 +999,24 @@ public class TestElementItemProvider extends ItemProviderAdapter
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public String getText(Object object) {
-        String label = ((TestElement) object).getStringAttribute();
-        return label == null || label.length() == 0 ? getString("_UI_TestElement_type") : getString("_UI_TestElement_type") + " " + label;
+        String label = ((TestElement)object).getStringAttribute();
+        return label == null || label.length() == 0 ?
+            getString("_UI_TestElement_type") :
+            getString("_UI_TestElement_type") + " " + label;
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -262,20 +1024,49 @@ public class TestElementItemProvider extends ItemProviderAdapter
         updateChildren(notification);
 
         switch (notification.getFeatureID(TestElement.class)) {
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE:
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTES:
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY:
+            case PropertiestestsPackage.TEST_ELEMENT__DERIVED_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__TRANSIENT_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__NON_CHANGEABLE_ATTRIBUTE:
+            case PropertiestestsPackage.TEST_ELEMENT__OPTIONAL_FEATURE:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+                return;
         }
         super.notifyChanged(notification);
     }
@@ -291,9 +1082,20 @@ public class TestElementItemProvider extends ItemProviderAdapter
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCE, PropertiestestsFactory.eINSTANCE.createTestElement()));
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCE,
+                 PropertiestestsFactory.eINSTANCE.createTestElement()));
+
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCES,
+                 PropertiestestsFactory.eINSTANCE.createTestElement()));
 
-        newChildDescriptors.add(createChildParameter(PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCES, PropertiestestsFactory.eINSTANCE.createTestElement()));
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY,
+                 PropertiestestsFactory.eINSTANCE.createTestElement()));
     }
 
     /**
@@ -308,10 +1110,15 @@ public class TestElementItemProvider extends ItemProviderAdapter
         Object childFeature = feature;
         Object childObject = child;
 
-        boolean qualify = childFeature == PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCE || childFeature == PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCES;
+        boolean qualify =
+            childFeature == PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCE ||
+            childFeature == PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCES ||
+            childFeature == PropertiestestsPackage.Literals.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY;
 
         if (qualify) {
-            return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+            return getString
+                ("_UI_CreateChild_text2",
+                 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
         }
         return super.getCreateChildText(owner, feature, child, selection);
     }
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/TestRootItemProvider.java b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/TestRootItemProvider.java
index 5aea5d7930..da07d4c7af 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/TestRootItemProvider.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.edit/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/provider/TestRootItemProvider.java
@@ -27,10 +27,8 @@ import org.eclipse.sirius.tests.rcptt.properties.propertiestests.Propertiestests
 import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This is the item provider adapter for a {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
  * @generated
  */
 public class TestRootItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
@@ -60,13 +58,10 @@ public class TestRootItemProvider extends ItemProviderAdapter implements IEditin
     }
 
     /**
-     * This specifies how to implement {@link #getChildren} and is used to
-     * deduce an appropriate feature for an
-     * {@link org.eclipse.emf.edit.command.AddCommand},
-     * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-     * {@link org.eclipse.emf.edit.command.MoveCommand} in
-     * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+     * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+     * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -80,21 +75,19 @@ public class TestRootItemProvider extends ItemProviderAdapter implements IEditin
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     protected EStructuralFeature getChildFeature(Object object, Object child) {
-        // Check the type of the specified child object and return the proper
-        // feature to use for
+        // Check the type of the specified child object and return the proper feature to use for
         // adding (see {@link AddCommand}) it as a child.
 
         return super.getChildFeature(object, child);
     }
 
     /**
-     * This returns TestRoot.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This returns TestRoot.gif.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -103,9 +96,9 @@ public class TestRootItemProvider extends ItemProviderAdapter implements IEditin
     }
 
     /**
-     * This returns the label text for the adapted class. <!-- begin-user-doc
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -114,11 +107,10 @@ public class TestRootItemProvider extends ItemProviderAdapter implements IEditin
     }
 
     /**
-     * This handles model notifications by calling {@link #updateChildren} to
-     * update any cached children and by creating a viewer notification, which
-     * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -126,9 +118,9 @@ public class TestRootItemProvider extends ItemProviderAdapter implements IEditin
         updateChildren(notification);
 
         switch (notification.getFeatureID(TestRoot.class)) {
-        case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
-            fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-            return;
+            case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+                return;
         }
         super.notifyChanged(notification);
     }
@@ -144,7 +136,10 @@ public class TestRootItemProvider extends ItemProviderAdapter implements IEditin
     protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
         super.collectNewChildDescriptors(newChildDescriptors, object);
 
-        newChildDescriptors.add(createChildParameter(PropertiestestsPackage.Literals.TEST_ROOT__ELEMENTS, PropertiestestsFactory.eINSTANCE.createTestElement()));
+        newChildDescriptors.add
+            (createChildParameter
+                (PropertiestestsPackage.Literals.TEST_ROOT__ELEMENTS,
+                 PropertiestestsFactory.eINSTANCE.createTestElement()));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsActionBarContributor.java b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsActionBarContributor.java
index 4da77f682e..6f9716f51c 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsActionBarContributor.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsActionBarContributor.java
@@ -47,37 +47,38 @@ import org.eclipse.ui.PartInitException;
  */
 public class PropertiestestsActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener {
     /**
-     * This keeps track of the active editor. <!-- begin-user-doc --> <!--
+     * This keeps track of the active editor.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected IEditorPart activeEditorPart;
 
     /**
-     * This keeps track of the current selection provider. <!-- begin-user-doc
+     * This keeps track of the current selection provider.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected ISelectionProvider selectionProvider;
 
     /**
-     * This action opens the Properties view. <!-- begin-user-doc --> <!--
+     * This action opens the Properties view.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected IAction showPropertiesViewAction = new Action(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
-        @Override
-        public void run() {
-            try {
-                getPage().showView("org.eclipse.ui.views.PropertySheet");
-            } catch (PartInitException exception) {
-                PropertiestestsEditorPlugin.INSTANCE.log(exception);
+            @Override
+            public void run() {
+                try {
+                    getPage().showView("org.eclipse.ui.views.PropertySheet");
+                }
+                catch (PartInitException exception) {
+                    PropertiestestsEditorPlugin.INSTANCE.log(exception);
+                }
             }
-        }
-    };
+        };
 
     /**
      * This action refreshes the viewer of the current editor if the editor
@@ -87,28 +88,26 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
      * @generated
      */
     protected IAction refreshViewerAction = new Action(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
-        @Override
-        public boolean isEnabled() {
-            return activeEditorPart instanceof IViewerProvider;
-        }
+            @Override
+            public boolean isEnabled() {
+                return activeEditorPart instanceof IViewerProvider;
+            }
 
-        @Override
-        public void run() {
-            if (activeEditorPart instanceof IViewerProvider) {
-                Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
-                if (viewer != null) {
-                    viewer.refresh();
+            @Override
+            public void run() {
+                if (activeEditorPart instanceof IViewerProvider) {
+                    Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+                    if (viewer != null) {
+                        viewer.refresh();
+                    }
                 }
             }
-        }
-    };
+        };
 
     /**
-     * This will contain one
-     * {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to
-     * each descriptor generated for the current selection by the item provider.
+     * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+     * generated for the current selection by the item provider.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected Collection<IAction> createChildActions;
@@ -123,32 +122,29 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
     protected IMenuManager createChildMenuManager;
 
     /**
-     * This will contain one
-     * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding
-     * to each descriptor generated for the current selection by the item
-     * provider. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+     * generated for the current selection by the item provider.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected Collection<IAction> createSiblingActions;
 
     /**
-     * This is the menu manager into which menu contribution items should be
-     * added for CreateSibling actions. <!-- begin-user-doc --> <!--
+     * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected IMenuManager createSiblingMenuManager;
 
     /**
-     * This creates an instance of the contributor. <!-- begin-user-doc --> <!--
+     * This creates an instance of the contributor.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     public PropertiestestsActionBarContributor() {
-        super(EditingDomainActionBarContributor.ADDITIONS_LAST_STYLE);
+        super(ADDITIONS_LAST_STYLE);
         loadResourceAction = new LoadResourceAction();
         validateAction = new ValidateAction();
         controlAction = new ControlAction();
@@ -177,8 +173,7 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
     public void contributeToMenu(IMenuManager menuManager) {
         super.contributeToMenu(menuManager);
 
-        IMenuManager submenuManager = new MenuManager(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsEditor_menu"),
-                "org.eclipse.sirius.tests.rcptt.properties.propertiestestsMenuID");
+        IMenuManager submenuManager = new MenuManager(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsEditor_menu"), "org.eclipse.sirius.tests.rcptt.properties.propertiestestsMenuID");
         menuManager.insertAfter("additions", submenuManager);
         submenuManager.add(new Separator("settings"));
         submenuManager.add(new Separator("actions"));
@@ -197,21 +192,20 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
 
         // Force an update because Eclipse hides empty menus now.
         //
-        submenuManager.addMenuListener(new IMenuListener() {
-            @Override
-            public void menuAboutToShow(IMenuManager menuManager) {
-                menuManager.updateAll(true);
-            }
-        });
+        submenuManager.addMenuListener
+            (new IMenuListener() {
+                 public void menuAboutToShow(IMenuManager menuManager) {
+                     menuManager.updateAll(true);
+                 }
+             });
 
         addGlobalActions(submenuManager);
     }
 
     /**
-     * When the active editor changes, this remembers the change and registers
-     * with it as a selection provider. <!-- begin-user-doc --> <!--
+     * When the active editor changes, this remembers the change and registers with it as a selection provider.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -226,7 +220,8 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
         }
         if (part == null) {
             selectionProvider = null;
-        } else {
+        }
+        else {
             selectionProvider = part.getSite().getSelectionProvider();
             selectionProvider.addSelectionChangedListener(this);
 
@@ -265,10 +260,10 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
         Collection<?> newSiblingDescriptors = null;
 
         ISelection selection = event.getSelection();
-        if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
-            Object object = ((IStructuredSelection) selection).getFirstElement();
+        if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+            Object object = ((IStructuredSelection)selection).getFirstElement();
 
-            EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();
+            EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
 
             newChildDescriptors = domain.getNewChildDescriptors(object, null);
             newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
@@ -290,10 +285,9 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
     }
 
     /**
-     * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction}
-     * for each object in <code>descriptors</code>, and returns the collection
-     * of these actions. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+     * and returns the collection of these actions.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
@@ -307,11 +301,9 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
     }
 
     /**
-     * This generates a
-     * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each
-     * object in <code>descriptors</code>, and returns the collection of these
-     * actions. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+     * and returns the collection of these actions.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
@@ -325,14 +317,11 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
     }
 
     /**
-     * This populates the specified <code>manager</code> with
-     * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
-     * {@link org.eclipse.jface.action.IAction}s contained in the
-     * <code>actions</code> collection, by inserting them before the specified
-     * contribution item <code>contributionID</code>. If
-     * <code>contributionID</code> is <code>null</code>, they are simply added.
+     * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+     * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+     * by inserting them before the specified contribution item <code>contributionID</code>.
+     * If <code>contributionID</code> is <code>null</code>, they are simply added.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
@@ -340,7 +329,8 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
             for (IAction action : actions) {
                 if (contributionID != null) {
                     manager.insertBefore(contributionID, action);
-                } else {
+                }
+                else {
                     manager.add(action);
                 }
             }
@@ -348,29 +338,27 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
     }
 
     /**
-     * This removes from the specified <code>manager</code> all
-     * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
-     * {@link org.eclipse.jface.action.IAction}s contained in the
-     * <code>actions</code> collection. <!-- begin-user-doc --> <!--
+     * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+     * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
         if (actions != null) {
             IContributionItem[] items = manager.getItems();
-            for (IContributionItem item : items) {
+            for (int i = 0; i < items.length; i++) {
                 // Look into SubContributionItems
                 //
-                IContributionItem contributionItem = item;
+                IContributionItem contributionItem = items[i];
                 while (contributionItem instanceof SubContributionItem) {
-                    contributionItem = ((SubContributionItem) contributionItem).getInnerItem();
+                    contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
                 }
 
                 // Delete the ActionContributionItems with matching action.
                 //
                 if (contributionItem instanceof ActionContributionItem) {
-                    IAction action = ((ActionContributionItem) contributionItem).getAction();
+                    IAction action = ((ActionContributionItem)contributionItem).getAction();
                     if (actions.contains(action)) {
                         manager.remove(contributionItem);
                     }
@@ -380,9 +368,9 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
     }
 
     /**
-     * This populates the pop-up menu before it appears. <!-- begin-user-doc -->
+     * This populates the pop-up menu before it appears.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -410,16 +398,15 @@ public class PropertiestestsActionBarContributor extends EditingDomainActionBarC
         menuManager.insertAfter("additions-end", new Separator("ui-actions"));
         menuManager.insertAfter("ui-actions", showPropertiesViewAction);
 
-        refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+        refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
         menuManager.insertAfter("ui-actions", refreshViewerAction);
 
         super.addGlobalActions(menuManager);
     }
 
     /**
-     * This ensures that a delete action will clean up all references to deleted
-     * objects. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This ensures that a delete action will clean up all references to deleted objects.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsEditor.java b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsEditor.java
index 886a205a7d..4ac4d2fda7 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsEditor.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsEditor.java
@@ -124,16 +124,15 @@ import org.eclipse.ui.views.properties.PropertySheet;
 import org.eclipse.ui.views.properties.PropertySheetPage;
 
 /**
- * This is an example of a Propertiestests model editor. <!-- begin-user-doc -->
+ * This is an example of a Propertiestests model editor.
+ * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
  * @generated
  */
 public class PropertiestestsEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
     /**
-     * This keeps track of the editing domain that is used to track all changes
-     * to the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This keeps track of the editing domain that is used to track all changes to the model.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected AdapterFactoryEditingDomain editingDomain;
@@ -141,38 +140,37 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     /**
      * This is the one adapter factory used for providing views of the model.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected ComposedAdapterFactory adapterFactory;
 
     /**
-     * This is the content outline page. <!-- begin-user-doc --> <!--
+     * This is the content outline page.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected IContentOutlinePage contentOutlinePage;
 
     /**
-     * This is a kludge... <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This is a kludge...
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected IStatusLineManager contentOutlineStatusLineManager;
 
     /**
-     * This is the content outline page's viewer. <!-- begin-user-doc --> <!--
+     * This is the content outline page's viewer.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected TreeViewer contentOutlineViewer;
 
     /**
-     * This is the property sheet page. <!-- begin-user-doc --> <!--
+     * This is the property sheet page.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
@@ -187,41 +185,40 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     protected TreeViewer selectionViewer;
 
     /**
-     * This inverts the roll of parent and child in the content provider and
-     * show parents as a tree. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This inverts the roll of parent and child in the content provider and show parents as a tree.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected TreeViewer parentViewer;
 
     /**
-     * This shows how a tree view works. <!-- begin-user-doc --> <!--
+     * This shows how a tree view works.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected TreeViewer treeViewer;
 
     /**
-     * This shows how a list view works. A list viewer doesn't support icons.
+     * This shows how a list view works.
+     * A list viewer doesn't support icons.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected ListViewer listViewer;
 
     /**
-     * This shows how a table view works. A table can be used as a list with
-     * icons. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This shows how a table view works.
+     * A table can be used as a list with icons.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected TableViewer tableViewer;
 
     /**
-     * This shows how a tree view with columns works. <!-- begin-user-doc -->
+     * This shows how a tree view with columns works.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     protected TreeViewer treeViewerWithColumns;
@@ -244,18 +241,16 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     protected Viewer currentViewer;
 
     /**
-     * This listens to which ever viewer is active. <!-- begin-user-doc --> <!--
+     * This listens to which ever viewer is active.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected ISelectionChangedListener selectionChangedListener;
 
     /**
-     * This keeps track of all the
-     * {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are
-     * listening to this editor. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -269,59 +264,52 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     protected ISelection editorSelection = StructuredSelection.EMPTY;
 
     /**
-     * The MarkerHelper is responsible for creating workspace resource markers
-     * presented in Eclipse's Problems View. <!-- begin-user-doc --> <!--
+     * The MarkerHelper is responsible for creating workspace resource markers presented
+     * in Eclipse's Problems View.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected MarkerHelper markerHelper = new EditUIMarkerHelper();
 
     /**
-     * This listens for when the outline becomes active <!-- begin-user-doc -->
+     * This listens for when the outline becomes active
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     protected IPartListener partListener = new IPartListener() {
-        @Override
-        public void partActivated(IWorkbenchPart p) {
-            if (p instanceof ContentOutline) {
-                if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
-                    getActionBarContributor().setActiveEditor(PropertiestestsEditor.this);
+            public void partActivated(IWorkbenchPart p) {
+                if (p instanceof ContentOutline) {
+                    if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+                        getActionBarContributor().setActiveEditor(PropertiestestsEditor.this);
 
-                    setCurrentViewer(contentOutlineViewer);
+                        setCurrentViewer(contentOutlineViewer);
+                    }
+                }
+                else if (p instanceof PropertySheet) {
+                    if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+                        getActionBarContributor().setActiveEditor(PropertiestestsEditor.this);
+                        handleActivate();
+                    }
                 }
-            } else if (p instanceof PropertySheet) {
-                if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {
-                    getActionBarContributor().setActiveEditor(PropertiestestsEditor.this);
+                else if (p == PropertiestestsEditor.this) {
                     handleActivate();
                 }
-            } else if (p == PropertiestestsEditor.this) {
-                handleActivate();
             }
-        }
-
-        @Override
-        public void partBroughtToTop(IWorkbenchPart p) {
-            // Ignore.
-        }
-
-        @Override
-        public void partClosed(IWorkbenchPart p) {
-            // Ignore.
-        }
-
-        @Override
-        public void partDeactivated(IWorkbenchPart p) {
-            // Ignore.
-        }
-
-        @Override
-        public void partOpened(IWorkbenchPart p) {
-            // Ignore.
-        }
-    };
+            public void partBroughtToTop(IWorkbenchPart p) {
+                // Ignore.
+            }
+            public void partClosed(IWorkbenchPart p) {
+                // Ignore.
+            }
+            public void partDeactivated(IWorkbenchPart p) {
+                // Ignore.
+            }
+            public void partOpened(IWorkbenchPart p) {
+                // Ignore.
+            }
+        };
 
     /**
      * Resources that have been removed since last activation. <!--
@@ -364,140 +352,140 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     protected boolean updateProblemIndication = true;
 
     /**
-     * Adapter used to update the problem indication when resources are demanded
-     * loaded. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Adapter used to update the problem indication when resources are demanded loaded.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected EContentAdapter problemIndicationAdapter = new EContentAdapter() {
-        @Override
-        public void notifyChanged(Notification notification) {
-            if (notification.getNotifier() instanceof Resource) {
-                switch (notification.getFeatureID(Resource.class)) {
-                case Resource.RESOURCE__IS_LOADED:
-                case Resource.RESOURCE__ERRORS:
-                case Resource.RESOURCE__WARNINGS: {
-                    Resource resource = (Resource) notification.getNotifier();
-                    Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-                    if (diagnostic.getSeverity() != Diagnostic.OK) {
-                        resourceToDiagnosticMap.put(resource, diagnostic);
-                    } else {
-                        resourceToDiagnosticMap.remove(resource);
-                    }
+            @Override
+            public void notifyChanged(Notification notification) {
+                if (notification.getNotifier() instanceof Resource) {
+                    switch (notification.getFeatureID(Resource.class)) {
+                        case Resource.RESOURCE__IS_LOADED:
+                        case Resource.RESOURCE__ERRORS:
+                        case Resource.RESOURCE__WARNINGS: {
+                            Resource resource = (Resource)notification.getNotifier();
+                            Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+                            if (diagnostic.getSeverity() != Diagnostic.OK) {
+                                resourceToDiagnosticMap.put(resource, diagnostic);
+                            }
+                            else {
+                                resourceToDiagnosticMap.remove(resource);
+                            }
 
-                    if (updateProblemIndication) {
-                        getSite().getShell().getDisplay().asyncExec(new Runnable() {
-                            @Override
-                            public void run() {
-                                updateProblemIndication();
+                            if (updateProblemIndication) {
+                                getSite().getShell().getDisplay().asyncExec
+                                    (new Runnable() {
+                                         public void run() {
+                                             updateProblemIndication();
+                                         }
+                                     });
                             }
-                        });
+                            break;
+                        }
                     }
-                    break;
                 }
+                else {
+                    super.notifyChanged(notification);
                 }
-            } else {
-                super.notifyChanged(notification);
             }
-        }
 
-        @Override
-        protected void setTarget(Resource target) {
-            basicSetTarget(target);
-        }
+            @Override
+            protected void setTarget(Resource target) {
+                basicSetTarget(target);
+            }
 
-        @Override
-        protected void unsetTarget(Resource target) {
-            basicUnsetTarget(target);
-            resourceToDiagnosticMap.remove(target);
-            if (updateProblemIndication) {
-                getSite().getShell().getDisplay().asyncExec(new Runnable() {
-                    @Override
-                    public void run() {
-                        updateProblemIndication();
-                    }
-                });
+            @Override
+            protected void unsetTarget(Resource target) {
+                basicUnsetTarget(target);
+                resourceToDiagnosticMap.remove(target);
+                if (updateProblemIndication) {
+                    getSite().getShell().getDisplay().asyncExec
+                        (new Runnable() {
+                             public void run() {
+                                 updateProblemIndication();
+                             }
+                         });
+                }
             }
-        }
-    };
+        };
 
     /**
-     * This listens for workspace changes. <!-- begin-user-doc --> <!--
+     * This listens for workspace changes.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
-        @Override
-        public void resourceChanged(IResourceChangeEvent event) {
-            IResourceDelta delta = event.getDelta();
-            try {
-                class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-                    protected ResourceSet resourceSet = editingDomain.getResourceSet();
-
-                    protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-                    protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-                    @Override
-                    public boolean visit(IResourceDelta delta) {
-                        if (delta.getResource().getType() == IResource.FILE) {
-                            if (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
-                                Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
-                                if (resource != null) {
-                                    if (delta.getKind() == IResourceDelta.REMOVED) {
-                                        removedResources.add(resource);
-                                    } else if (!savedResources.remove(resource)) {
-                                        changedResources.add(resource);
+            public void resourceChanged(IResourceChangeEvent event) {
+                IResourceDelta delta = event.getDelta();
+                try {
+                    class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+                        protected ResourceSet resourceSet = editingDomain.getResourceSet();
+                        protected Collection<Resource> changedResources = new ArrayList<Resource>();
+                        protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+                        public boolean visit(IResourceDelta delta) {
+                            if (delta.getResource().getType() == IResource.FILE) {
+                                if (delta.getKind() == IResourceDelta.REMOVED ||
+                                    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+                                    Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                                    if (resource != null) {
+                                        if (delta.getKind() == IResourceDelta.REMOVED) {
+                                            removedResources.add(resource);
+                                        }
+                                        else if (!savedResources.remove(resource)) {
+                                            changedResources.add(resource);
+                                        }
                                     }
                                 }
+                                return false;
                             }
-                            return false;
+
+                            return true;
                         }
 
-                        return true;
-                    }
+                        public Collection<Resource> getChangedResources() {
+                            return changedResources;
+                        }
 
-                    public Collection<Resource> getChangedResources() {
-                        return changedResources;
+                        public Collection<Resource> getRemovedResources() {
+                            return removedResources;
+                        }
                     }
 
-                    public Collection<Resource> getRemovedResources() {
-                        return removedResources;
+                    final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+                    delta.accept(visitor);
+
+                    if (!visitor.getRemovedResources().isEmpty()) {
+                        getSite().getShell().getDisplay().asyncExec
+                            (new Runnable() {
+                                 public void run() {
+                                     removedResources.addAll(visitor.getRemovedResources());
+                                     if (!isDirty()) {
+                                         getSite().getPage().closeEditor(PropertiestestsEditor.this, false);
+                                     }
+                                 }
+                             });
                     }
-                }
 
-                final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-                delta.accept(visitor);
-
-                if (!visitor.getRemovedResources().isEmpty()) {
-                    getSite().getShell().getDisplay().asyncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            removedResources.addAll(visitor.getRemovedResources());
-                            if (!isDirty()) {
-                                getSite().getPage().closeEditor(PropertiestestsEditor.this, false);
-                            }
-                        }
-                    });
+                    if (!visitor.getChangedResources().isEmpty()) {
+                        getSite().getShell().getDisplay().asyncExec
+                            (new Runnable() {
+                                 public void run() {
+                                     changedResources.addAll(visitor.getChangedResources());
+                                     if (getSite().getPage().getActiveEditor() == PropertiestestsEditor.this) {
+                                         handleActivate();
+                                     }
+                                 }
+                             });
+                    }
                 }
-
-                if (!visitor.getChangedResources().isEmpty()) {
-                    getSite().getShell().getDisplay().asyncExec(new Runnable() {
-                        @Override
-                        public void run() {
-                            changedResources.addAll(visitor.getChangedResources());
-                            if (getSite().getPage().getActiveEditor() == PropertiestestsEditor.this) {
-                                handleActivate();
-                            }
-                        }
-                    });
+                catch (CoreException exception) {
+                    PropertiestestsEditorPlugin.INSTANCE.log(exception);
                 }
-            } catch (CoreException exception) {
-                PropertiestestsEditorPlugin.INSTANCE.log(exception);
             }
-        }
-    };
+        };
 
     /**
      * Handles activation of the editor or it's associated views. <!--
@@ -509,22 +497,24 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
         // Recompute the read only state.
         //
         if (editingDomain.getResourceToReadOnlyMap() != null) {
-            editingDomain.getResourceToReadOnlyMap().clear();
+          editingDomain.getResourceToReadOnlyMap().clear();
 
-            // Refresh any actions that may become enabled or disabled.
-            //
-            setSelection(getSelection());
+          // Refresh any actions that may become enabled or disabled.
+          //
+          setSelection(getSelection());
         }
 
         if (!removedResources.isEmpty()) {
             if (handleDirtyConflict()) {
                 getSite().getPage().closeEditor(PropertiestestsEditor.this, false);
-            } else {
+            }
+            else {
                 removedResources.clear();
                 changedResources.clear();
                 savedResources.clear();
             }
-        } else if (!changedResources.isEmpty()) {
+        }
+        else if (!changedResources.isEmpty()) {
             changedResources.removeAll(savedResources);
             handleChangedResources();
             changedResources.clear();
@@ -551,7 +541,8 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
                     resource.unload();
                     try {
                         resource.load(Collections.EMPTY_MAP);
-                    } catch (IOException exception) {
+                    }
+                    catch (IOException exception) {
                         if (!resourceToDiagnosticMap.containsKey(resource)) {
                             resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
                         }
@@ -569,14 +560,19 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * Updates the problems indication with the information described in the
-     * specified diagnostic. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Updates the problems indication with the information described in the specified diagnostic.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected void updateProblemIndication() {
         if (updateProblemIndication) {
-            BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.sirius.tests.rcptt.properties.editor", 0, null, new Object[] { editingDomain.getResourceSet() });
+            BasicDiagnostic diagnostic =
+                new BasicDiagnostic
+                    (Diagnostic.OK,
+                     "org.eclipse.sirius.tests.rcptt.properties.editor",
+                     0,
+                     null,
+                     new Object [] { editingDomain.getResourceSet() });
             for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
                 if (childDiagnostic.getSeverity() != Diagnostic.OK) {
                     diagnostic.add(childDiagnostic);
@@ -585,11 +581,12 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
             int lastEditorPage = getPageCount() - 1;
             if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
-                ((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+                ((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
                 if (diagnostic.getSeverity() != Diagnostic.OK) {
                     setActivePage(lastEditorPage);
                 }
-            } else if (diagnostic.getSeverity() != Diagnostic.OK) {
+            }
+            else if (diagnostic.getSeverity() != Diagnostic.OK) {
                 ProblemEditorPart problemEditorPart = new ProblemEditorPart();
                 problemEditorPart.setDiagnostic(diagnostic);
                 problemEditorPart.setMarkerHelper(markerHelper);
@@ -598,7 +595,8 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
                     setPageText(lastEditorPage, problemEditorPart.getPartName());
                     setActivePage(lastEditorPage);
                     showTabs();
-                } catch (PartInitException exception) {
+                }
+                catch (PartInitException exception) {
                     PropertiestestsEditorPlugin.INSTANCE.log(exception);
                 }
             }
@@ -608,7 +606,8 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
                 if (diagnostic.getSeverity() != Diagnostic.OK) {
                     try {
                         markerHelper.createMarkers(diagnostic);
-                    } catch (CoreException exception) {
+                    }
+                    catch (CoreException exception) {
                         PropertiestestsEditorPlugin.INSTANCE.log(exception);
                     }
                 }
@@ -623,7 +622,11 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
      * @generated
      */
     protected boolean handleDirtyConflict() {
-        return MessageDialog.openQuestion(getSite().getShell(), PropertiestestsEditor.getString("_UI_FileConflict_label"), PropertiestestsEditor.getString("_WARN_FileConflict"));
+        return
+            MessageDialog.openQuestion
+                (getSite().getShell(),
+                 getString("_UI_FileConflict_label"),
+                 getString("_WARN_FileConflict"));
     }
 
     /**
@@ -638,9 +641,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This sets up the editing domain for the model editor. <!-- begin-user-doc
+     * This sets up the editing domain for the model editor.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected void initializeEditingDomain() {
@@ -652,40 +655,39 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
         adapterFactory.addAdapterFactory(new PropertiestestsItemProviderAdapterFactory());
         adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
 
-        // Create the command stack that will notify this editor as commands are
-        // executed.
+        // Create the command stack that will notify this editor as commands are executed.
         //
         BasicCommandStack commandStack = new BasicCommandStack();
 
-        // Add a listener to set the most recent command's affected objects to
-        // be the selection of the viewer with focus.
+        // Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
         //
-        commandStack.addCommandStackListener(new CommandStackListener() {
-            @Override
-            public void commandStackChanged(final EventObject event) {
-                getContainer().getDisplay().asyncExec(new Runnable() {
-                    @Override
-                    public void run() {
-                        firePropertyChange(IEditorPart.PROP_DIRTY);
-
-                        // Try to select the affected objects.
-                        //
-                        Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();
-                        if (mostRecentCommand != null) {
-                            setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-                        }
-                        for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {
-                            PropertySheetPage propertySheetPage = i.next();
-                            if (propertySheetPage.getControl().isDisposed()) {
-                                i.remove();
-                            } else {
-                                propertySheetPage.refresh();
-                            }
-                        }
-                    }
-                });
-            }
-        });
+        commandStack.addCommandStackListener
+            (new CommandStackListener() {
+                 public void commandStackChanged(final EventObject event) {
+                     getContainer().getDisplay().asyncExec
+                         (new Runnable() {
+                              public void run() {
+                                  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+                                  // Try to select the affected objects.
+                                  //
+                                  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+                                  if (mostRecentCommand != null) {
+                                      setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+                                  }
+                                  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+                                      PropertySheetPage propertySheetPage = i.next();
+                                      if (propertySheetPage.getControl().isDisposed()) {
+                                          i.remove();
+                                      }
+                                      else {
+                                          propertySheetPage.refresh();
+                                      }
+                                  }
+                              }
+                          });
+                 }
+             });
 
         // Create the editing domain with a special command stack.
         //
@@ -693,9 +695,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This is here for the listener to be able to call it. <!-- begin-user-doc
+     * This is here for the listener to be able to call it.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -714,28 +716,25 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
         // Make sure it's okay.
         //
         if (theSelection != null && !theSelection.isEmpty()) {
-            Runnable runnable = new Runnable() {
-                @Override
-                public void run() {
-                    // Try to select the items in the current content viewer of
-                    // the editor.
-                    //
-                    if (currentViewer != null) {
-                        currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+            Runnable runnable =
+                new Runnable() {
+                    public void run() {
+                        // Try to select the items in the current content viewer of the editor.
+                        //
+                        if (currentViewer != null) {
+                            currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+                        }
                     }
-                }
-            };
+                };
             getSite().getShell().getDisplay().asyncExec(runnable);
         }
     }
 
     /**
-     * This returns the editing domain as required by the
-     * {@link IEditingDomainProvider} interface. This is important for
-     * implementing the static methods of {@link AdapterFactoryEditingDomain}
+     * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+     * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
      * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -745,13 +744,11 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
@@ -760,29 +757,26 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         @Override
-        public Object[] getElements(Object object) {
+        public Object [] getElements(Object object) {
             Object parent = super.getParent(object);
             return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
         }
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         @Override
-        public Object[] getChildren(Object object) {
+        public Object [] getChildren(Object object) {
             Object parent = super.getParent(object);
             return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
         }
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         @Override
@@ -793,7 +787,6 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         @Override
@@ -804,7 +797,6 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public void setCurrentViewerPane(ViewerPane viewerPane) {
@@ -831,15 +823,14 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
             if (selectionChangedListener == null) {
                 // Create the listener on demand.
                 //
-                selectionChangedListener = new ISelectionChangedListener() {
-                    // This just notifies those things that are affected by the
-                    // section.
-                    //
-                    @Override
-                    public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
-                        setSelection(selectionChangedEvent.getSelection());
-                    }
-                };
+                selectionChangedListener =
+                    new ISelectionChangedListener() {
+                        // This just notifies those things that are affected by the section.
+                        //
+                        public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+                            setSelection(selectionChangedEvent.getSelection());
+                        }
+                    };
             }
 
             // Stop listening to the old one.
@@ -858,17 +849,15 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
             //
             currentViewer = viewer;
 
-            // Set the editors selection based on the current viewer's
-            // selection.
+            // Set the editors selection based on the current viewer's selection.
             //
             setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
         }
     }
 
     /**
-     * This returns the viewer as required by the {@link IViewerProvider}
-     * interface. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This returns the viewer as required by the {@link IViewerProvider} interface.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -877,10 +866,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This creates a context menu for the viewer and adds a listener as well
-     * registering the menu for extension. <!-- begin-user-doc --> <!--
+     * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected void createContextMenuFor(StructuredViewer viewer) {
@@ -888,7 +876,7 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
         contextMenu.add(new Separator("additions"));
         contextMenu.setRemoveAllWhenShown(true);
         contextMenu.addMenuListener(this);
-        Menu menu = contextMenu.createContextMenu(viewer.getControl());
+        Menu menu= contextMenu.createContextMenu(viewer.getControl());
         viewer.getControl().setMenu(menu);
         getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
 
@@ -899,10 +887,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This is the method called to load a resource into the editing domain's
-     * resource set based on the editor's input. <!-- begin-user-doc --> <!--
+     * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     public void createModel() {
@@ -913,36 +900,49 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
             // Load the resource through the editing domain.
             //
             resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             exception = e;
             resource = editingDomain.getResourceSet().getResource(resourceURI, false);
         }
 
         Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
         if (diagnostic.getSeverity() != Diagnostic.OK) {
-            resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+            resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
         }
         editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
     }
 
     /**
-     * Returns a diagnostic describing the errors and warnings listed in the
-     * resource and the specified exception (if any). <!-- begin-user-doc -->
+     * Returns a diagnostic describing the errors and warnings listed in the resource
+     * and the specified exception (if any).
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
         boolean hasErrors = !resource.getErrors().isEmpty();
         if (hasErrors || !resource.getWarnings().isEmpty()) {
-            BasicDiagnostic basicDiagnostic = new BasicDiagnostic(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING, "org.eclipse.sirius.tests.rcptt.properties.editor", 0,
-                    PropertiestestsEditor.getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object) resource : exception });
+            BasicDiagnostic basicDiagnostic =
+                new BasicDiagnostic
+                    (hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+                     "org.eclipse.sirius.tests.rcptt.properties.editor",
+                     0,
+                     getString("_UI_CreateModelError_message", resource.getURI()),
+                     new Object [] { exception == null ? (Object)resource : exception });
             basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
             return basicDiagnostic;
-        } else if (exception != null) {
-            return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.sirius.tests.rcptt.properties.editor", 0, PropertiestestsEditor.getString("_UI_CreateModelError_message", resource.getURI()),
-                    new Object[] { exception });
-        } else {
+        }
+        else if (exception != null) {
+            return
+                new BasicDiagnostic
+                    (Diagnostic.ERROR,
+                     "org.eclipse.sirius.tests.rcptt.properties.editor",
+                     0,
+                     getString("_UI_CreateModelError_message", resource.getURI()),
+                     new Object[] { exception });
+        }
+        else {
             return Diagnostic.OK_INSTANCE;
         }
     }
@@ -950,7 +950,6 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     /**
      * This is the method used by the framework to install your own controls.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -965,23 +964,23 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
             // Create a page for the selection tree view.
             //
             {
-                ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
-                    @Override
-                    public Viewer createViewer(Composite composite) {
-                        Tree tree = new Tree(composite, SWT.MULTI);
-                        TreeViewer newTreeViewer = new TreeViewer(tree);
-                        return newTreeViewer;
-                    }
-
-                    @Override
-                    public void requestActivation() {
-                        super.requestActivation();
-                        setCurrentViewerPane(this);
-                    }
-                };
+                ViewerPane viewerPane =
+                    new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
+                        @Override
+                        public Viewer createViewer(Composite composite) {
+                            Tree tree = new Tree(composite, SWT.MULTI);
+                            TreeViewer newTreeViewer = new TreeViewer(tree);
+                            return newTreeViewer;
+                        }
+                        @Override
+                        public void requestActivation() {
+                            super.requestActivation();
+                            setCurrentViewerPane(this);
+                        }
+                    };
                 viewerPane.createControl(getContainer());
 
-                selectionViewer = (TreeViewer) viewerPane.getViewer();
+                selectionViewer = (TreeViewer)viewerPane.getViewer();
                 selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
 
                 selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
@@ -993,80 +992,80 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
                 createContextMenuFor(selectionViewer);
                 int pageIndex = addPage(viewerPane.getControl());
-                setPageText(pageIndex, PropertiestestsEditor.getString("_UI_SelectionPage_label"));
+                setPageText(pageIndex, getString("_UI_SelectionPage_label"));
             }
 
             // Create a page for the parent tree view.
             //
             {
-                ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
-                    @Override
-                    public Viewer createViewer(Composite composite) {
-                        Tree tree = new Tree(composite, SWT.MULTI);
-                        TreeViewer newTreeViewer = new TreeViewer(tree);
-                        return newTreeViewer;
-                    }
-
-                    @Override
-                    public void requestActivation() {
-                        super.requestActivation();
-                        setCurrentViewerPane(this);
-                    }
-                };
+                ViewerPane viewerPane =
+                    new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
+                        @Override
+                        public Viewer createViewer(Composite composite) {
+                            Tree tree = new Tree(composite, SWT.MULTI);
+                            TreeViewer newTreeViewer = new TreeViewer(tree);
+                            return newTreeViewer;
+                        }
+                        @Override
+                        public void requestActivation() {
+                            super.requestActivation();
+                            setCurrentViewerPane(this);
+                        }
+                    };
                 viewerPane.createControl(getContainer());
 
-                parentViewer = (TreeViewer) viewerPane.getViewer();
+                parentViewer = (TreeViewer)viewerPane.getViewer();
                 parentViewer.setAutoExpandLevel(30);
                 parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
                 parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
 
                 createContextMenuFor(parentViewer);
                 int pageIndex = addPage(viewerPane.getControl());
-                setPageText(pageIndex, PropertiestestsEditor.getString("_UI_ParentPage_label"));
+                setPageText(pageIndex, getString("_UI_ParentPage_label"));
             }
 
             // This is the page for the list viewer
             //
             {
-                ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
-                    @Override
-                    public Viewer createViewer(Composite composite) {
-                        return new ListViewer(composite);
-                    }
-
-                    @Override
-                    public void requestActivation() {
-                        super.requestActivation();
-                        setCurrentViewerPane(this);
-                    }
-                };
+                ViewerPane viewerPane =
+                    new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
+                        @Override
+                        public Viewer createViewer(Composite composite) {
+                            return new ListViewer(composite);
+                        }
+                        @Override
+                        public void requestActivation() {
+                            super.requestActivation();
+                            setCurrentViewerPane(this);
+                        }
+                    };
                 viewerPane.createControl(getContainer());
-                listViewer = (ListViewer) viewerPane.getViewer();
+                listViewer = (ListViewer)viewerPane.getViewer();
                 listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
                 listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
 
                 createContextMenuFor(listViewer);
                 int pageIndex = addPage(viewerPane.getControl());
-                setPageText(pageIndex, PropertiestestsEditor.getString("_UI_ListPage_label"));
+                setPageText(pageIndex, getString("_UI_ListPage_label"));
             }
 
             // This is the page for the tree viewer
             //
             {
-                ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
-                    @Override
-                    public Viewer createViewer(Composite composite) {
-                        return new TreeViewer(composite);
-                    }
-
-                    @Override
-                    public void requestActivation() {
-                        super.requestActivation();
-                        setCurrentViewerPane(this);
-                    }
-                };
+                ViewerPane viewerPane =
+                    new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
+                        @Override
+                        public Viewer createViewer(Composite composite) {
+                            return new TreeViewer(composite);
+                        }
+                        @Override
+                        public void requestActivation() {
+                            super.requestActivation();
+                            setCurrentViewerPane(this);
+                        }
+                    };
                 viewerPane.createControl(getContainer());
-                treeViewer = (TreeViewer) viewerPane.getViewer();
+                treeViewer = (TreeViewer)viewerPane.getViewer();
                 treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
                 treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
 
@@ -1074,26 +1073,26 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
                 createContextMenuFor(treeViewer);
                 int pageIndex = addPage(viewerPane.getControl());
-                setPageText(pageIndex, PropertiestestsEditor.getString("_UI_TreePage_label"));
+                setPageText(pageIndex, getString("_UI_TreePage_label"));
             }
 
             // This is the page for the table viewer.
             //
             {
-                ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
-                    @Override
-                    public Viewer createViewer(Composite composite) {
-                        return new TableViewer(composite);
-                    }
-
-                    @Override
-                    public void requestActivation() {
-                        super.requestActivation();
-                        setCurrentViewerPane(this);
-                    }
-                };
+                ViewerPane viewerPane =
+                    new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
+                        @Override
+                        public Viewer createViewer(Composite composite) {
+                            return new TableViewer(composite);
+                        }
+                        @Override
+                        public void requestActivation() {
+                            super.requestActivation();
+                            setCurrentViewerPane(this);
+                        }
+                    };
                 viewerPane.createControl(getContainer());
-                tableViewer = (TableViewer) viewerPane.getViewer();
+                tableViewer = (TableViewer)viewerPane.getViewer();
 
                 Table table = tableViewer.getTable();
                 TableLayout layout = new TableLayout();
@@ -1103,41 +1102,41 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
                 TableColumn objectColumn = new TableColumn(table, SWT.NONE);
                 layout.addColumnData(new ColumnWeightData(3, 100, true));
-                objectColumn.setText(PropertiestestsEditor.getString("_UI_ObjectColumn_label"));
+                objectColumn.setText(getString("_UI_ObjectColumn_label"));
                 objectColumn.setResizable(true);
 
                 TableColumn selfColumn = new TableColumn(table, SWT.NONE);
                 layout.addColumnData(new ColumnWeightData(2, 100, true));
-                selfColumn.setText(PropertiestestsEditor.getString("_UI_SelfColumn_label"));
+                selfColumn.setText(getString("_UI_SelfColumn_label"));
                 selfColumn.setResizable(true);
 
-                tableViewer.setColumnProperties(new String[] { "a", "b" });
+                tableViewer.setColumnProperties(new String [] {"a", "b"});
                 tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
                 tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
 
                 createContextMenuFor(tableViewer);
                 int pageIndex = addPage(viewerPane.getControl());
-                setPageText(pageIndex, PropertiestestsEditor.getString("_UI_TablePage_label"));
+                setPageText(pageIndex, getString("_UI_TablePage_label"));
             }
 
             // This is the page for the table tree viewer.
             //
             {
-                ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
-                    @Override
-                    public Viewer createViewer(Composite composite) {
-                        return new TreeViewer(composite);
-                    }
-
-                    @Override
-                    public void requestActivation() {
-                        super.requestActivation();
-                        setCurrentViewerPane(this);
-                    }
-                };
+                ViewerPane viewerPane =
+                    new ViewerPane(getSite().getPage(), PropertiestestsEditor.this) {
+                        @Override
+                        public Viewer createViewer(Composite composite) {
+                            return new TreeViewer(composite);
+                        }
+                        @Override
+                        public void requestActivation() {
+                            super.requestActivation();
+                            setCurrentViewerPane(this);
+                        }
+                    };
                 viewerPane.createControl(getContainer());
 
-                treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();
+                treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
 
                 Tree tree = treeViewerWithColumns.getTree();
                 tree.setLayoutData(new FillLayout());
@@ -1145,67 +1144,67 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
                 tree.setLinesVisible(true);
 
                 TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
-                objectColumn.setText(PropertiestestsEditor.getString("_UI_ObjectColumn_label"));
+                objectColumn.setText(getString("_UI_ObjectColumn_label"));
                 objectColumn.setResizable(true);
                 objectColumn.setWidth(250);
 
                 TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
-                selfColumn.setText(PropertiestestsEditor.getString("_UI_SelfColumn_label"));
+                selfColumn.setText(getString("_UI_SelfColumn_label"));
                 selfColumn.setResizable(true);
                 selfColumn.setWidth(200);
 
-                treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });
+                treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});
                 treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
                 treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
 
                 createContextMenuFor(treeViewerWithColumns);
                 int pageIndex = addPage(viewerPane.getControl());
-                setPageText(pageIndex, PropertiestestsEditor.getString("_UI_TreeWithColumnsPage_label"));
+                setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
             }
 
-            getSite().getShell().getDisplay().asyncExec(new Runnable() {
-                @Override
-                public void run() {
-                    setActivePage(0);
-                }
-            });
+            getSite().getShell().getDisplay().asyncExec
+                (new Runnable() {
+                     public void run() {
+                         setActivePage(0);
+                     }
+                 });
         }
 
         // Ensures that this editor will only display the page's tab
         // area if there are more than one page
         //
-        getContainer().addControlListener(new ControlAdapter() {
-            boolean guard = false;
-
-            @Override
-            public void controlResized(ControlEvent event) {
-                if (!guard) {
-                    guard = true;
-                    hideTabs();
-                    guard = false;
+        getContainer().addControlListener
+            (new ControlAdapter() {
+                boolean guard = false;
+                @Override
+                public void controlResized(ControlEvent event) {
+                    if (!guard) {
+                        guard = true;
+                        hideTabs();
+                        guard = false;
+                    }
                 }
-            }
-        });
-
-        getSite().getShell().getDisplay().asyncExec(new Runnable() {
-            @Override
-            public void run() {
-                updateProblemIndication();
-            }
-        });
+             });
+
+        getSite().getShell().getDisplay().asyncExec
+            (new Runnable() {
+                 public void run() {
+                     updateProblemIndication();
+                 }
+             });
     }
 
     /**
-     * If there is just one page in the multi-page editor part, this hides the
-     * single tab at the bottom. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * If there is just one page in the multi-page editor part,
+     * this hides the single tab at the bottom.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected void hideTabs() {
         if (getPageCount() <= 1) {
             setPageText(0, "");
             if (getContainer() instanceof CTabFolder) {
-                ((CTabFolder) getContainer()).setTabHeight(1);
+                ((CTabFolder)getContainer()).setTabHeight(1);
                 Point point = getContainer().getSize();
                 getContainer().setSize(point.x, point.y + 6);
             }
@@ -1213,16 +1212,16 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * If there is more than one page in the multi-page editor part, this shows
-     * the tabs at the bottom. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * If there is more than one page in the multi-page editor part,
+     * this shows the tabs at the bottom.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected void showTabs() {
         if (getPageCount() > 1) {
-            setPageText(0, PropertiestestsEditor.getString("_UI_SelectionPage_label"));
+            setPageText(0, getString("_UI_SelectionPage_label"));
             if (getContainer() instanceof CTabFolder) {
-                ((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);
+                ((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
                 Point point = getContainer().getSize();
                 getContainer().setSize(point.x, point.y - 6);
             }
@@ -1230,9 +1229,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This is used to track the active viewer. <!-- begin-user-doc --> <!--
+     * This is used to track the active viewer.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -1255,11 +1254,14 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     public Object getAdapter(Class key) {
         if (key.equals(IContentOutlinePage.class)) {
             return showOutlineView() ? getContentOutlinePage() : null;
-        } else if (key.equals(IPropertySheetPage.class)) {
+        }
+        else if (key.equals(IPropertySheetPage.class)) {
             return getPropertySheetPage();
-        } else if (key.equals(IGotoMarker.class)) {
+        }
+        else if (key.equals(IGotoMarker.class)) {
             return this;
-        } else {
+        }
+        else {
             return super.getAdapter(key);
         }
     }
@@ -1292,9 +1294,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
                     createContextMenuFor(contentOutlineViewer);
 
                     if (!editingDomain.getResourceSet().getResources().isEmpty()) {
-                        // Select the root object in the view.
-                        //
-                        contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+                      // Select the root object in the view.
+                      //
+                      contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
                     }
                 }
 
@@ -1315,39 +1317,40 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
             // Listen to selection so that we can handle it is a special way.
             //
-            contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() {
-                // This ensures that we handle selections correctly.
-                //
-                @Override
-                public void selectionChanged(SelectionChangedEvent event) {
-                    handleContentOutlineSelection(event.getSelection());
-                }
-            });
+            contentOutlinePage.addSelectionChangedListener
+                (new ISelectionChangedListener() {
+                     // This ensures that we handle selections correctly.
+                     //
+                     public void selectionChanged(SelectionChangedEvent event) {
+                         handleContentOutlineSelection(event.getSelection());
+                     }
+                 });
         }
 
         return contentOutlinePage;
     }
 
     /**
-     * This accesses a cached version of the property sheet. <!-- begin-user-doc
+     * This accesses a cached version of the property sheet.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public IPropertySheetPage getPropertySheetPage() {
-        PropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
-            @Override
-            public void setSelectionToViewer(List<?> selection) {
-                PropertiestestsEditor.this.setSelectionToViewer(selection);
-                PropertiestestsEditor.this.setFocus();
-            }
+        PropertySheetPage propertySheetPage =
+            new ExtendedPropertySheetPage(editingDomain) {
+                @Override
+                public void setSelectionToViewer(List<?> selection) {
+                    PropertiestestsEditor.this.setSelectionToViewer(selection);
+                    PropertiestestsEditor.this.setFocus();
+                }
 
-            @Override
-            public void setActionBars(IActionBars actionBars) {
-                super.setActionBars(actionBars);
-                getActionBarContributor().shareGlobalActions(this, actionBars);
-            }
-        };
+                @Override
+                public void setActionBars(IActionBars actionBars) {
+                    super.setActionBars(actionBars);
+                    getActionBarContributor().shareGlobalActions(this, actionBars);
+                }
+            };
         propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
         propertySheetPages.add(propertySheetPage);
 
@@ -1355,21 +1358,19 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This deals with how we want selection in the outliner to affect the other
-     * views. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This deals with how we want selection in the outliner to affect the other views.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     public void handleContentOutlineSelection(ISelection selection) {
         if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-            Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();
+            Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
             if (selectedElements.hasNext()) {
                 // Get the first selected element.
                 //
                 Object selectedElement = selectedElements.next();
 
-                // If it's the selection viewer, then we want it to select the
-                // same selection as this selection.
+                // If it's the selection viewer, then we want it to select the same selection as this selection.
                 //
                 if (currentViewerPane.getViewer() == selectionViewer) {
                     ArrayList<Object> selectionList = new ArrayList<Object>();
@@ -1381,7 +1382,8 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
                     // Set the selection to the widget.
                     //
                     selectionViewer.setSelection(new StructuredSelection(selectionList));
-                } else {
+                }
+                else {
                     // Set the input to the widget.
                     //
                     if (currentViewerPane.getViewer().getInput() != selectedElement) {
@@ -1394,20 +1396,18 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This is for implementing {@link IEditorPart} and simply tests the command
-     * stack. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This is for implementing {@link IEditorPart} and simply tests the command stack.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
     public boolean isDirty() {
-        return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();
+        return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
     }
 
     /**
-     * This is for implementing {@link IEditorPart} and simply saves the model
-     * file. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This is for implementing {@link IEditorPart} and simply saves the model file.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -1418,33 +1418,34 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
         saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
         saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
 
-        // Do the work within an operation because this is a long running
-        // activity that modifies the workbench.
+        // Do the work within an operation because this is a long running activity that modifies the workbench.
         //
-        WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-            // This is the method that gets invoked when the operation runs.
-            //
-            @Override
-            public void execute(IProgressMonitor monitor) {
-                // Save the resources to the file system.
+        WorkspaceModifyOperation operation =
+            new WorkspaceModifyOperation() {
+                // This is the method that gets invoked when the operation runs.
                 //
-                boolean first = true;
-                for (Resource resource : editingDomain.getResourceSet().getResources()) {
-                    if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
-                        try {
-                            long timeStamp = resource.getTimeStamp();
-                            resource.save(saveOptions);
-                            if (resource.getTimeStamp() != timeStamp) {
-                                savedResources.add(resource);
+                @Override
+                public void execute(IProgressMonitor monitor) {
+                    // Save the resources to the file system.
+                    //
+                    boolean first = true;
+                    for (Resource resource : editingDomain.getResourceSet().getResources()) {
+                        if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+                            try {
+                                long timeStamp = resource.getTimeStamp();
+                                resource.save(saveOptions);
+                                if (resource.getTimeStamp() != timeStamp) {
+                                    savedResources.add(resource);
+                                }
                             }
-                        } catch (Exception exception) {
-                            resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+                            catch (Exception exception) {
+                                resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+                            }
+                            first = false;
                         }
-                        first = false;
                     }
                 }
-            }
-        };
+            };
 
         updateProblemIndication = false;
         try {
@@ -1454,9 +1455,10 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
             // Refresh the necessary state.
             //
-            ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
+            ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
             firePropertyChange(IEditorPart.PROP_DIRTY);
-        } catch (Exception exception) {
+        }
+        catch (Exception exception) {
             // Something went wrong that shouldn't.
             //
             PropertiestestsEditorPlugin.INSTANCE.log(exception);
@@ -1466,11 +1468,10 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This returns whether something has been persisted to the URI of the
-     * specified resource. The implementation uses the URI converter from the
-     * editor's resource set to try to open an input stream. <!-- begin-user-doc
+     * This returns whether something has been persisted to the URI of the specified resource.
+     * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected boolean isPersisted(Resource resource) {
@@ -1481,7 +1482,8 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
                 result = true;
                 stream.close();
             }
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
             // Ignore
         }
         return result;
@@ -1499,9 +1501,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This also changes the editor's input. <!-- begin-user-doc --> <!--
+     * This also changes the editor's input.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -1519,20 +1521,21 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected void doSaveAs(URI uri, IEditorInput editorInput) {
         (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
         setInputWithNotify(editorInput);
         setPartName(editorInput.getName());
-        IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+        IProgressMonitor progressMonitor =
+            getActionBars().getStatusLineManager() != null ?
+                getActionBars().getStatusLineManager().getProgressMonitor() :
+                new NullProgressMonitor();
         doSave(progressMonitor);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -1561,14 +1564,14 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public void setFocus() {
         if (currentViewerPane != null) {
             currentViewerPane.setFocus();
-        } else {
+        }
+        else {
             getControl(getActivePage()).setFocus();
         }
     }
@@ -1576,7 +1579,6 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     /**
      * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -1587,7 +1589,6 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     /**
      * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -1596,10 +1597,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to
-     * return this editor's overall selection. <!-- begin-user-doc --> <!--
+     * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -1608,10 +1608,9 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
     }
 
     /**
-     * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to
-     * set this editor's overall selection. Calling this result will notify the
-     * listeners. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+     * Calling this result will notify the listeners.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -1626,31 +1625,32 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public void setStatusLineManager(ISelection selection) {
-        IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+        IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+            contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
         if (statusLineManager != null) {
             if (selection instanceof IStructuredSelection) {
-                Collection<?> collection = ((IStructuredSelection) selection).toList();
+                Collection<?> collection = ((IStructuredSelection)selection).toList();
                 switch (collection.size()) {
-                case 0: {
-                    statusLineManager.setMessage(PropertiestestsEditor.getString("_UI_NoObjectSelected"));
-                    break;
-                }
-                case 1: {
-                    String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-                    statusLineManager.setMessage(PropertiestestsEditor.getString("_UI_SingleObjectSelected", text));
-                    break;
-                }
-                default: {
-                    statusLineManager.setMessage(PropertiestestsEditor.getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
-                    break;
-                }
+                    case 0: {
+                        statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
+                        break;
+                    }
+                    case 1: {
+                        String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+                        statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
+                        break;
+                    }
+                    default: {
+                        statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
+                        break;
+                    }
                 }
-            } else {
+            }
+            else {
                 statusLineManager.setMessage("");
             }
         }
@@ -1673,7 +1673,7 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
      * @generated
      */
     private static String getString(String key, Object s1) {
-        return PropertiestestsEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });
+        return PropertiestestsEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
     }
 
     /**
@@ -1685,21 +1685,19 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
      */
     @Override
     public void menuAboutToShow(IMenuManager menuManager) {
-        ((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+        ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public EditingDomainActionBarContributor getActionBarContributor() {
-        return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();
+        return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public IActionBars getActionBars() {
@@ -1708,7 +1706,6 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public AdapterFactory getAdapterFactory() {
@@ -1717,7 +1714,6 @@ public class PropertiestestsEditor extends MultiPageEditorPart implements IEditi
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsEditorPlugin.java b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsEditorPlugin.java
index 2c2a5b8071..9b97c0be0b 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsEditorPlugin.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsEditorPlugin.java
@@ -35,35 +35,37 @@ public final class PropertiestestsEditorPlugin extends EMFPlugin {
     private static Implementation plugin;
 
     /**
-     * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Create the instance.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     public PropertiestestsEditorPlugin() {
-        super(new ResourceLocator[] {});
+        super
+            (new ResourceLocator [] {
+            });
     }
 
     /**
-     * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
+     * Returns the singleton instance of the Eclipse plugin.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @return the singleton instance.
      * @generated
      */
     @Override
     public ResourceLocator getPluginResourceLocator() {
-        return PropertiestestsEditorPlugin.plugin;
+        return plugin;
     }
 
     /**
-     * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
+     * Returns the singleton instance of the Eclipse plugin.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @return the singleton instance.
      * @generated
      */
     public static Implementation getPlugin() {
-        return PropertiestestsEditorPlugin.plugin;
+        return plugin;
     }
 
     /**
@@ -74,16 +76,16 @@ public final class PropertiestestsEditorPlugin extends EMFPlugin {
      */
     public static class Implementation extends EclipseUIPlugin {
         /**
-         * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * Creates an instance.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
         public Implementation() {
             super();
-
+    
             // Remember the static instance.
             //
-            PropertiestestsEditorPlugin.plugin = this;
+            plugin = this;
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsModelWizard.java b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsModelWizard.java
index c5e32e6610..20bd25e9aa 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsModelWizard.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.editor/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/presentation/PropertiestestsModelWizard.java
@@ -64,20 +64,19 @@ import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.ISetSelectionTarget;
 
 /**
- * This is a simple wizard for creating a new model file. <!-- begin-user-doc
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
- *
  * @generated
  */
 public class PropertiestestsModelWizard extends Wizard implements INewWizard {
     /**
-     * The supported extensions for created files. <!-- begin-user-doc --> <!--
+     * The supported extensions for created files.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
-    public static final List<String> FILE_EXTENSIONS = Collections
-            .unmodifiableList(Arrays.asList(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsEditorFilenameExtensions").split("\\s*,\\s*")));
+    public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsEditorFilenameExtensions").split("\\s*,\\s*")));
 
     /**
      * A formatted list of supported file extensions, suitable for display. <!--
@@ -88,17 +87,17 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
     public static final String FORMATTED_FILE_EXTENSIONS = PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
 
     /**
-     * This caches an instance of the model package. <!-- begin-user-doc -->
+     * This caches an instance of the model package.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     protected PropertiestestsPackage propertiestestsPackage = PropertiestestsPackage.eINSTANCE;
 
     /**
-     * This caches an instance of the model factory. <!-- begin-user-doc -->
+     * This caches an instance of the model factory.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     protected PropertiestestsFactory propertiestestsFactory = propertiestestsPackage.getPropertiestestsFactory();
@@ -112,25 +111,24 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
     protected PropertiestestsModelWizardNewFileCreationPage newFileCreationPage;
 
     /**
-     * This is the initial object creation page. <!-- begin-user-doc --> <!--
+     * This is the initial object creation page.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     protected PropertiestestsModelWizardInitialObjectCreationPage initialObjectCreationPage;
 
     /**
-     * Remember the selection during initialization for populating the default
-     * container. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Remember the selection during initialization for populating the default container.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected IStructuredSelection selection;
 
     /**
-     * Remember the workbench during initialization. <!-- begin-user-doc -->
+     * Remember the workbench during initialization.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     protected IWorkbench workbench;
@@ -138,15 +136,14 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
     /**
      * Caches the names of the types that can be created as the root object.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected List<String> initialObjectNames;
 
     /**
-     * This just records the information. <!-- begin-user-doc --> <!--
+     * This just records the information.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -160,7 +157,6 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
     /**
      * Returns the names of the types that can be created as the root object.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected Collection<String> getInitialObjectNames() {
@@ -168,7 +164,7 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
             initialObjectNames = new ArrayList<String>();
             for (EClassifier eClassifier : propertiestestsPackage.getEClassifiers()) {
                 if (eClassifier instanceof EClass) {
-                    EClass eClass = (EClass) eClassifier;
+                    EClass eClass = (EClass)eClassifier;
                     if (!eClass.isAbstract()) {
                         initialObjectNames.add(eClass.getName());
                     }
@@ -180,20 +176,20 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
     }
 
     /**
-     * Create a new model. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Create a new model.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected EObject createInitialModel() {
-        EClass eClass = (EClass) propertiestestsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+        EClass eClass = (EClass)propertiestestsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
         EObject rootObject = propertiestestsFactory.create(eClass);
         return rootObject;
     }
 
     /**
-     * Do the work after everything is specified. <!-- begin-user-doc --> <!--
+     * Do the work after everything is specified.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -205,41 +201,44 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
             // Do the work within an operation.
             //
-            WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-                @Override
-                protected void execute(IProgressMonitor progressMonitor) {
-                    try {
-                        // Create a resource set
-                        //
-                        ResourceSet resourceSet = new ResourceSetImpl();
-
-                        // Get the URI of the model file.
-                        //
-                        URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
-                        // Create a resource for this file.
-                        //
-                        Resource resource = resourceSet.createResource(fileURI);
-
-                        // Add the initial model object to the contents.
-                        //
-                        EObject rootObject = createInitialModel();
-                        if (rootObject != null) {
-                            resource.getContents().add(rootObject);
+            WorkspaceModifyOperation operation =
+                new WorkspaceModifyOperation() {
+                    @Override
+                    protected void execute(IProgressMonitor progressMonitor) {
+                        try {
+                            // Create a resource set
+                            //
+                            ResourceSet resourceSet = new ResourceSetImpl();
+
+                            // Get the URI of the model file.
+                            //
+                            URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+                            // Create a resource for this file.
+                            //
+                            Resource resource = resourceSet.createResource(fileURI);
+
+                            // Add the initial model object to the contents.
+                            //
+                            EObject rootObject = createInitialModel();
+                            if (rootObject != null) {
+                                resource.getContents().add(rootObject);
+                            }
+
+                            // Save the contents of the resource to the file system.
+                            //
+                            Map<Object, Object> options = new HashMap<Object, Object>();
+                            options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+                            resource.save(options);
+                        }
+                        catch (Exception exception) {
+                            PropertiestestsEditorPlugin.INSTANCE.log(exception);
+                        }
+                        finally {
+                            progressMonitor.done();
                         }
-
-                        // Save the contents of the resource to the file system.
-                        //
-                        Map<Object, Object> options = new HashMap<Object, Object>();
-                        options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
-                        resource.save(options);
-                    } catch (Exception exception) {
-                        PropertiestestsEditorPlugin.INSTANCE.log(exception);
-                    } finally {
-                        progressMonitor.done();
                     }
-                }
-            };
+                };
 
             getContainer().run(false, false, operation);
 
@@ -250,40 +249,44 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
             final IWorkbenchPart activePart = page.getActivePart();
             if (activePart instanceof ISetSelectionTarget) {
                 final ISelection targetSelection = new StructuredSelection(modelFile);
-                getShell().getDisplay().asyncExec(new Runnable() {
-                    @Override
-                    public void run() {
-                        ((ISetSelectionTarget) activePart).selectReveal(targetSelection);
-                    }
-                });
+                getShell().getDisplay().asyncExec
+                    (new Runnable() {
+                         public void run() {
+                             ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+                         }
+                     });
             }
 
             // Open an editor on the new file.
             //
             try {
-                page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-            } catch (PartInitException exception) {
+                page.openEditor
+                    (new FileEditorInput(modelFile),
+                     workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+            }
+            catch (PartInitException exception) {
                 MessageDialog.openError(workbenchWindow.getShell(), PropertiestestsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
                 return false;
             }
 
             return true;
-        } catch (Exception exception) {
+        }
+        catch (Exception exception) {
             PropertiestestsEditorPlugin.INSTANCE.log(exception);
             return false;
         }
     }
 
     /**
-     * This is the one page of the wizard. <!-- begin-user-doc --> <!--
+     * This is the one page of the wizard.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     public class PropertiestestsModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
         /**
-         * Pass in the selection. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * Pass in the selection.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
         public PropertiestestsModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
@@ -300,9 +303,9 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
         protected boolean validatePage() {
             if (super.validatePage()) {
                 String extension = new Path(getFileName()).getFileExtension();
-                if (extension == null || !PropertiestestsModelWizard.FILE_EXTENSIONS.contains(extension)) {
-                    String key = PropertiestestsModelWizard.FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
-                    setErrorMessage(PropertiestestsEditorPlugin.INSTANCE.getString(key, new Object[] { PropertiestestsModelWizard.FORMATTED_FILE_EXTENSIONS }));
+                if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+                    String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
+                    setErrorMessage(PropertiestestsEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
                     return false;
                 }
                 return true;
@@ -312,7 +315,6 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         public IFile getModelFile() {
@@ -329,7 +331,6 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
     public class PropertiestestsModelWizardInitialObjectCreationPage extends WizardPage {
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         protected Combo initialObjectField;
@@ -341,14 +342,13 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         protected Combo encodingField;
 
         /**
-         * Pass in the selection. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * Pass in the selection.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
         public PropertiestestsModelWizardInitialObjectCreationPage(String pageId) {
@@ -357,13 +357,11 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         @Override
         public void createControl(Composite parent) {
-            Composite composite = new Composite(parent, SWT.NONE);
-            {
+            Composite composite = new Composite(parent, SWT.NONE); {
                 GridLayout layout = new GridLayout();
                 layout.numColumns = 1;
                 layout.verticalSpacing = 12;
@@ -431,19 +429,16 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         protected ModifyListener validator = new ModifyListener() {
-            @Override
-            public void modifyText(ModifyEvent e) {
-                setPageComplete(validatePage());
-            }
-        };
+                public void modifyText(ModifyEvent e) {
+                    setPageComplete(validatePage());
+                }
+            };
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         protected boolean validatePage() {
@@ -452,7 +447,6 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         @Override
@@ -462,7 +456,8 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
                 if (initialObjectField.getItemCount() == 1) {
                     initialObjectField.clearSelection();
                     encodingField.setFocus();
-                } else {
+                }
+                else {
                     encodingField.clearSelection();
                     initialObjectField.setFocus();
                 }
@@ -471,7 +466,6 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         public String getInitialObjectName() {
@@ -487,7 +481,6 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         public String getEncoding() {
@@ -495,15 +488,16 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
         }
 
         /**
-         * Returns the label for the specified type name. <!-- begin-user-doc
+         * Returns the label for the specified type name.
+         * <!-- begin-user-doc
          * --> <!-- end-user-doc -->
-         *
          * @generated
          */
         protected String getLabel(String typeName) {
             try {
                 return PropertiestestsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
-            } catch (MissingResourceException mre) {
+            }
+            catch(MissingResourceException mre) {
                 PropertiestestsEditorPlugin.INSTANCE.log(mre);
             }
             return typeName;
@@ -511,13 +505,12 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
 
         /**
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
         protected Collection<String> getEncodings() {
             if (encodings == null) {
                 encodings = new ArrayList<String>();
-                for (StringTokenizer stringTokenizer = new StringTokenizer(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) {
+                for (StringTokenizer stringTokenizer = new StringTokenizer(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
                     encodings.add(stringTokenizer.nextToken());
                 }
             }
@@ -538,11 +531,10 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
         newFileCreationPage = new PropertiestestsModelWizardNewFileCreationPage("Whatever", selection);
         newFileCreationPage.setTitle(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsModelWizard_label"));
         newFileCreationPage.setDescription(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsModelWizard_description"));
-        newFileCreationPage.setFileName(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsEditorFilenameDefaultBase") + "." + PropertiestestsModelWizard.FILE_EXTENSIONS.get(0));
+        newFileCreationPage.setFileName(PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
         addPage(newFileCreationPage);
 
-        // Try and get the resource selection to determine a current directory
-        // for the file dialog.
+        // Try and get the resource selection to determine a current directory for the file dialog.
         //
         if (selection != null && !selection.isEmpty()) {
             // Get the resource...
@@ -551,7 +543,7 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
             if (selectedElement instanceof IResource) {
                 // Get the resource parent, if its a file.
                 //
-                IResource selectedResource = (IResource) selectedElement;
+                IResource selectedResource = (IResource)selectedElement;
                 if (selectedResource.getType() == IResource.FILE) {
                     selectedResource = selectedResource.getParent();
                 }
@@ -566,9 +558,9 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
                     // Make up a unique new name here.
                     //
                     String defaultModelBaseFilename = PropertiestestsEditorPlugin.INSTANCE.getString("_UI_PropertiestestsEditorFilenameDefaultBase");
-                    String defaultModelFilenameExtension = PropertiestestsModelWizard.FILE_EXTENSIONS.get(0);
+                    String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
                     String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
-                    for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {
+                    for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
                         modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
                     }
                     newFileCreationPage.setFileName(modelFilename);
@@ -582,8 +574,8 @@ public class PropertiestestsModelWizard extends Wizard implements INewWizard {
     }
 
     /**
-     * Get the file from the page. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Get the file from the page.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     public IFile getModelFile() {
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties.samples/contents/propertiestests/org.eclipse.sirius.tests.rcptt.properties.instance/PropertiesTestsInstance.propertiestests b/plugins/org.eclipse.sirius.tests.rcptt.properties.samples/contents/propertiestests/org.eclipse.sirius.tests.rcptt.properties.instance/PropertiesTestsInstance.propertiestests
index c49dc47f52..7f99e80df0 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties.samples/contents/propertiestests/org.eclipse.sirius.tests.rcptt.properties.instance/PropertiesTestsInstance.propertiestests
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties.samples/contents/propertiestests/org.eclipse.sirius.tests.rcptt.properties.instance/PropertiesTestsInstance.propertiestests
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <propertiestests:TestRoot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:propertiestests="http://www.eclipse.org/sirius/tests/properties/1.0.0">
-  <elements stringAttribute="Element1" intAttribute="1" reference="//@elements.1" references="//@elements.1 //@elements.2" charAttribute="99" dateAttribute="2016-05-24T00:00:00.000+0200" doubleAttribute="42.42" floatAttribute="42.42" longAttribute="1" shortAttribute="42">
+  <elements stringAttribute="Element1" stringAttributeMandatory="Element1" stringAttributeMultiline="First line&#xA;Second line&#xA;Third line" stringAttributeMultilineMandatory="First line&#xA;Second line&#xA;Third line" intAttribute="1" reference="//@elements.1" references="//@elements.1 //@elements.2" referenceMandatory="//@elements.1" charAttribute="99" charAttributeMandatory="99" dateAttribute="2016-05-24T00:00:00.000+0200" dateAttributeMandatory="2016-05-24T00:00:00.000+0200" doubleAttribute="42.42" doubleAttributeMandatory="42.42" floatAttribute="42.42" floatAttributeMandatory="42.42" longAttribute="1" longAttributeMandatory="1" shortAttribute="42" shortAttributeMandatory="42" optionalFeature="Optional">
     <stringAttributes>Element1</stringAttributes>
     <stringAttributes>Element2</stringAttributes>
     <stringAttributes>Element3</stringAttributes>
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/model/propertiestests.ecore b/plugins/org.eclipse.sirius.tests.rcptt.properties/model/propertiestests.ecore
index b53b3fa5c1..a3f654a7e8 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/model/propertiestests.ecore
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/model/propertiestests.ecore
@@ -10,46 +10,76 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringAttributeMultiline"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringAttributeMultilineMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="intAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="intAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="intAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumAttribute" eType="#//TestEnum"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumAttributes" upperBound="-1"
         eType="#//TestEnum"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumAttributeMandatory"
+        lowerBound="1" eType="#//TestEnum"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="containmentReference" eType="#//TestElement"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="containmentReferences"
         upperBound="-1" eType="#//TestElement" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containmentReferenceMandatory"
+        lowerBound="1" eType="#//TestElement" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//TestElement"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="references" upperBound="-1"
         eType="#//TestElement"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referenceMandatory" lowerBound="1"
+        eType="#//TestElement"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="charAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="charAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="charAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dateAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dateAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dateAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="doubleAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="doubleAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="doubleAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="floatAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="floatAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="floatAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="longAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="longAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="longAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortAttributes" upperBound="-1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="deriveAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        derived="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortAttributeMandatory"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="derivedAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+        volatile="true" transient="true" defaultValueLiteral="" derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="transientAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         transient="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="nonChangeableAttribute"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false"
+        defaultValueLiteral="NonChangeable"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optionalFeature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="TestEnum">
     <eLiterals name="Literal1"/>
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/model/propertiestests.genmodel b/plugins/org.eclipse.sirius.tests.rcptt.properties/model/propertiestests.genmodel
index 0e6330c15b..523d285d6b 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/model/propertiestests.genmodel
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/model/propertiestests.genmodel
@@ -9,11 +9,67 @@
   <foreignModel>propertiestests.ecore</foreignModel>
   <genPackages prefix="Propertiestests" basePackage="org.eclipse.sirius.tests.rcptt.properties"
       disposableProviderFactory="true" ecorePackage="propertiestests.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="propertiestests.ecore#//TestEnum">
+      <genEnumLiterals ecoreEnumLiteral="propertiestests.ecore#//TestEnum/Literal1"/>
+      <genEnumLiterals ecoreEnumLiteral="propertiestests.ecore#//TestEnum/Literal2"/>
+      <genEnumLiterals ecoreEnumLiteral="propertiestests.ecore#//TestEnum/Literal3"/>
+    </genEnums>
     <genClasses ecoreClass="propertiestests.ecore#//TestRoot">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference propertiestests.ecore#//TestRoot/elements"/>
     </genClasses>
     <genClasses ecoreClass="propertiestests.ecore#//TestElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/stringMonoValuedAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Text" propertyDescription="String attribute Description"
+          ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/stringAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Text" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/stringAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Text" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/stringAttributeMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Text" propertyMultiLine="true"
+          ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/stringAttributeMultiline"/>
+      <genFeatures createChild="false" propertyCategory="Text" propertyMultiLine="true"
+          ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/stringAttributeMultilineMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/intAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/intAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/intAttributeMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Boolean" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/booleanAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Boolean" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/booleanAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Boolean" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/booleanAttributeMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Enum" propertyDescription=""
+          ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/enumAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Enum" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/enumAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Enum" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/enumAttributeMandatory"/>
+      <genFeatures property="None" children="true" createChild="true" propertyCategory="Reference"
+          ecoreFeature="ecore:EReference propertiestests.ecore#//TestElement/containmentReference"/>
+      <genFeatures property="None" children="true" createChild="true" propertyCategory="Reference"
+          ecoreFeature="ecore:EReference propertiestests.ecore#//TestElement/containmentReferences"/>
+      <genFeatures property="None" children="true" createChild="true" propertyCategory="Reference"
+          ecoreFeature="ecore:EReference propertiestests.ecore#//TestElement/containmentReferenceMandatory"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Reference"
+          propertySortChoices="true" ecoreFeature="ecore:EReference propertiestests.ecore#//TestElement/reference"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Reference"
+          propertySortChoices="true" ecoreFeature="ecore:EReference propertiestests.ecore#//TestElement/references"/>
+      <genFeatures notify="false" createChild="false" propertyCategory="Reference"
+          propertySortChoices="true" ecoreFeature="ecore:EReference propertiestests.ecore#//TestElement/referenceMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Text" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/charAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Text" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/charAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Text" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/charAttributeMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Text" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/dateAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Text" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/dateAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Text" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/dateAttributeMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/doubleAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/doubleAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/doubleAttributeMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/floatAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/floatAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/floatAttributeMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/longAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/longAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/longAttributeMandatory"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/shortAttribute"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/shortAttributes"/>
+      <genFeatures createChild="false" propertyCategory="Number" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/shortAttributeMandatory"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/derivedAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/transientAttribute"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/nonChangeableAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute propertiestests.ecore#//TestElement/optionalFeature"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/PropertiestestsFactory.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/PropertiestestsFactory.java
index b88e0ee42d..2a0bf3c63f 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/PropertiestestsFactory.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/PropertiestestsFactory.java
@@ -12,23 +12,22 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
- *
  * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage
  * @generated
  */
 public interface PropertiestestsFactory extends EFactory {
     /**
-     * The singleton instance of the factory. <!-- begin-user-doc --> <!--
+     * The singleton instance of the factory.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     PropertiestestsFactory eINSTANCE = org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.PropertiestestsFactoryImpl.init();
 
     /**
-     * Returns a new object of class '<em>Test Root</em>'. <!-- begin-user-doc
+     * Returns a new object of class '<em>Test Root</em>'.
+     * <!-- begin-user-doc
      * --> <!-- end-user-doc -->
-     *
      * @return a new object of class '<em>Test Root</em>'.
      * @generated
      */
@@ -44,9 +43,9 @@ public interface PropertiestestsFactory extends EFactory {
     TestElement createTestElement();
 
     /**
-     * Returns the package supported by this factory. <!-- begin-user-doc -->
+     * Returns the package supported by this factory.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @return the package supported by this factory.
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/PropertiestestsPackage.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/PropertiestestsPackage.java
index 04de671681..889cd9d520 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/PropertiestestsPackage.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/PropertiestestsPackage.java
@@ -24,46 +24,43 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
  * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsFactory
  * @model kind="package"
  * @generated
  */
 public interface PropertiestestsPackage extends EPackage {
     /**
-     * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The package name.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     String eNAME = "propertiestests";
 
     /**
-     * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The package namespace URI.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     String eNS_URI = "http://www.eclipse.org/sirius/tests/properties/1.0.0";
 
     /**
-     * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The package namespace name.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     String eNS_PREFIX = "propertiestests";
 
     /**
-     * The singleton instance of the package. <!-- begin-user-doc --> <!--
+     * The singleton instance of the package.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     PropertiestestsPackage eINSTANCE = org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.PropertiestestsPackageImpl.init();
 
     /**
-     * The meta object id for the '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestRootImpl
-     * <em>Test Root</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The meta object id for the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestRootImpl <em>Test Root</em>}' class.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestRootImpl
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.PropertiestestsPackageImpl#getTestRoot()
      * @generated
@@ -71,9 +68,8 @@ public interface PropertiestestsPackage extends EPackage {
     int TEST_ROOT = 0;
 
     /**
-     * The feature id for the '<em><b>Elements</b></em>' containment reference
-     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The feature id for the '<em><b>Elements</b></em>' containment reference list.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      * @ordered
      */
@@ -119,49 +115,90 @@ public interface PropertiestestsPackage extends EPackage {
     int TEST_ELEMENT__STRING_ATTRIBUTE = 0;
 
     /**
-     * The feature id for the '<em><b>String Attributes</b></em>' attribute
-     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The feature id for the '<em><b>String Attributes</b></em>' attribute list.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      * @ordered
      */
     int TEST_ELEMENT__STRING_ATTRIBUTES = 1;
 
     /**
+     * The feature id for the '<em><b>String Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY = 2;
+
+    /**
+     * The feature id for the '<em><b>String Attribute Multiline</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE = 3;
+
+    /**
+     * The feature id for the '<em><b>String Attribute Multiline Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY = 4;
+
+    /**
      * The feature id for the '<em><b>Int Attribute</b></em>' attribute. <!--
      * begin-user-doc --> <!-- end-user-doc -->
      *
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__INT_ATTRIBUTE = 2;
+    int TEST_ELEMENT__INT_ATTRIBUTE = 5;
 
     /**
      * The feature id for the '<em><b>Int Attributes</b></em>' attribute list.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__INT_ATTRIBUTES = 3;
+    int TEST_ELEMENT__INT_ATTRIBUTES = 6;
+
+    /**
+     * The feature id for the '<em><b>Int Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY = 7;
 
     /**
      * The feature id for the '<em><b>Boolean Attribute</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__BOOLEAN_ATTRIBUTE = 4;
+    int TEST_ELEMENT__BOOLEAN_ATTRIBUTE = 8;
 
     /**
-     * The feature id for the '<em><b>Boolean Attributes</b></em>' attribute
-     * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The feature id for the '<em><b>Boolean Attributes</b></em>' attribute list.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__BOOLEAN_ATTRIBUTES = 9;
+
+    /**
+     * The feature id for the '<em><b>Boolean Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__BOOLEAN_ATTRIBUTES = 5;
+    int TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY = 10;
 
     /**
      * The feature id for the '<em><b>Enum Attribute</b></em>' attribute. <!--
@@ -170,34 +207,49 @@ public interface PropertiestestsPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__ENUM_ATTRIBUTE = 6;
+    int TEST_ELEMENT__ENUM_ATTRIBUTE = 11;
 
     /**
      * The feature id for the '<em><b>Enum Attributes</b></em>' attribute list.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__ENUM_ATTRIBUTES = 7;
+    int TEST_ELEMENT__ENUM_ATTRIBUTES = 12;
 
     /**
-     * The feature id for the '<em><b>Containment Reference</b></em>'
-     * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The feature id for the '<em><b>Enum Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__CONTAINMENT_REFERENCE = 8;
+    int TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY = 13;
 
     /**
-     * The feature id for the '<em><b>Containment References</b></em>'
-     * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The feature id for the '<em><b>Containment Reference</b></em>' containment reference.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__CONTAINMENT_REFERENCES = 9;
+    int TEST_ELEMENT__CONTAINMENT_REFERENCE = 14;
+
+    /**
+     * The feature id for the '<em><b>Containment References</b></em>' containment reference list.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__CONTAINMENT_REFERENCES = 15;
+
+    /**
+     * The feature id for the '<em><b>Containment Reference Mandatory</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY = 16;
 
     /**
      * The feature id for the '<em><b>Reference</b></em>' reference. <!--
@@ -206,7 +258,7 @@ public interface PropertiestestsPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__REFERENCE = 10;
+    int TEST_ELEMENT__REFERENCE = 17;
 
     /**
      * The feature id for the '<em><b>References</b></em>' reference list. <!--
@@ -215,16 +267,222 @@ public interface PropertiestestsPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT__REFERENCES = 11;
+    int TEST_ELEMENT__REFERENCES = 18;
+
+    /**
+     * The feature id for the '<em><b>Reference Mandatory</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__REFERENCE_MANDATORY = 19;
+
+    /**
+     * The feature id for the '<em><b>Char Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__CHAR_ATTRIBUTE = 20;
+
+    /**
+     * The feature id for the '<em><b>Char Attributes</b></em>' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__CHAR_ATTRIBUTES = 21;
+
+    /**
+     * The feature id for the '<em><b>Char Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY = 22;
+
+    /**
+     * The feature id for the '<em><b>Date Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__DATE_ATTRIBUTE = 23;
+
+    /**
+     * The feature id for the '<em><b>Date Attributes</b></em>' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__DATE_ATTRIBUTES = 24;
+
+    /**
+     * The feature id for the '<em><b>Date Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY = 25;
+
+    /**
+     * The feature id for the '<em><b>Double Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__DOUBLE_ATTRIBUTE = 26;
+
+    /**
+     * The feature id for the '<em><b>Double Attributes</b></em>' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__DOUBLE_ATTRIBUTES = 27;
+
+    /**
+     * The feature id for the '<em><b>Double Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY = 28;
+
+    /**
+     * The feature id for the '<em><b>Float Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__FLOAT_ATTRIBUTE = 29;
+
+    /**
+     * The feature id for the '<em><b>Float Attributes</b></em>' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__FLOAT_ATTRIBUTES = 30;
+
+    /**
+     * The feature id for the '<em><b>Float Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY = 31;
+
+    /**
+     * The feature id for the '<em><b>Long Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__LONG_ATTRIBUTE = 32;
+
+    /**
+     * The feature id for the '<em><b>Long Attributes</b></em>' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__LONG_ATTRIBUTES = 33;
+
+    /**
+     * The feature id for the '<em><b>Long Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY = 34;
+
+    /**
+     * The feature id for the '<em><b>Short Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__SHORT_ATTRIBUTE = 35;
+
+    /**
+     * The feature id for the '<em><b>Short Attributes</b></em>' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__SHORT_ATTRIBUTES = 36;
+
+    /**
+     * The feature id for the '<em><b>Short Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY = 37;
+
+    /**
+     * The feature id for the '<em><b>Derived Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__DERIVED_ATTRIBUTE = 38;
+
+    /**
+     * The feature id for the '<em><b>Transient Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__TRANSIENT_ATTRIBUTE = 39;
+
+    /**
+     * The feature id for the '<em><b>Non Changeable Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__NON_CHANGEABLE_ATTRIBUTE = 40;
+
+    /**
+     * The feature id for the '<em><b>Optional Feature</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int TEST_ELEMENT__OPTIONAL_FEATURE = 41;
 
     /**
      * The number of structural features of the '<em>Test Element</em>' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      * @ordered
      */
-    int TEST_ELEMENT_FEATURE_COUNT = 12;
+    int TEST_ELEMENT_FEATURE_COUNT = 42;
 
     /**
      * The number of operations of the '<em>Test Element</em>' class. <!--
@@ -236,10 +494,8 @@ public interface PropertiestestsPackage extends EPackage {
     int TEST_ELEMENT_OPERATION_COUNT = 0;
 
     /**
-     * The meta object id for the '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
-     * <em>Test Enum</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The meta object id for the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum <em>Test Enum</em>}' enum.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.PropertiestestsPackageImpl#getTestEnum()
      * @generated
@@ -247,10 +503,8 @@ public interface PropertiestestsPackage extends EPackage {
     int TEST_ENUM = 2;
 
     /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot
-     * <em>Test Root</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the meta object for class '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot <em>Test Root</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @return the meta object for class '<em>Test Root</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot
      * @generated
@@ -258,12 +512,9 @@ public interface PropertiestestsPackage extends EPackage {
     EClass getTestRoot();
 
     /**
-     * Returns the meta object for the containment reference list '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot#getElements
-     * <em>Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the meta object for the containment reference list '
-     *         <em>Elements</em>'.
+     * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot#getElements <em>Elements</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>Elements</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot#getElements()
      * @see #getTestRoot()
      * @generated
@@ -271,10 +522,8 @@ public interface PropertiestestsPackage extends EPackage {
     EReference getTestRoot_Elements();
 
     /**
-     * Returns the meta object for class '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement
-     * <em>Test Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the meta object for class '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement <em>Test Element</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @return the meta object for class '<em>Test Element</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement
      * @generated
@@ -309,10 +558,41 @@ public interface PropertiestestsPackage extends EPackage {
     EAttribute getTestElement_StringAttributes();
 
     /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttribute
-     * <em>Int Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMandatory <em>String Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>String Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_StringAttributeMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMultiline <em>String Attribute Multiline</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>String Attribute Multiline</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMultiline()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_StringAttributeMultiline();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMultilineMandatory <em>String Attribute Multiline Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>String Attribute Multiline Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMultilineMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_StringAttributeMultilineMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttribute <em>Int Attribute</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Int Attribute</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttribute()
      * @see #getTestElement()
@@ -321,10 +601,8 @@ public interface PropertiestestsPackage extends EPackage {
     EAttribute getTestElement_IntAttribute();
 
     /**
-     * Returns the meta object for the attribute list '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributes
-     * <em>Int Attributes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the meta object for the attribute list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributes <em>Int Attributes</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @return the meta object for the attribute list '<em>Int Attributes</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributes()
      * @see #getTestElement()
@@ -333,6 +611,17 @@ public interface PropertiestestsPackage extends EPackage {
     EAttribute getTestElement_IntAttributes();
 
     /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributeMandatory <em>Int Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Int Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_IntAttributeMandatory();
+
+    /**
      * Returns the meta object for the attribute '
      * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttribute
      * <em>Boolean Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -360,10 +649,19 @@ public interface PropertiestestsPackage extends EPackage {
     EAttribute getTestElement_BooleanAttributes();
 
     /**
-     * Returns the meta object for the attribute '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttribute
-     * <em>Enum Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttributeMandatory <em>Boolean Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Boolean Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_BooleanAttributeMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttribute <em>Enum Attribute</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @return the meta object for the attribute '<em>Enum Attribute</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttribute()
      * @see #getTestElement()
@@ -372,12 +670,9 @@ public interface PropertiestestsPackage extends EPackage {
     EAttribute getTestElement_EnumAttribute();
 
     /**
-     * Returns the meta object for the attribute list '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributes
-     * <em>Enum Attributes</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @return the meta object for the attribute list '<em>Enum Attributes</em>
-     *         '.
+     * Returns the meta object for the attribute list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributes <em>Enum Attributes</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @return the meta object for the attribute list '<em>Enum Attributes</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributes()
      * @see #getTestElement()
      * @generated
@@ -385,13 +680,21 @@ public interface PropertiestestsPackage extends EPackage {
     EAttribute getTestElement_EnumAttributes();
 
     /**
-     * Returns the meta object for the containment reference '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReference
-     * <em>Containment Reference</em>}'. <!-- begin-user-doc --> <!--
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributeMandatory <em>Enum Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Enum Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_EnumAttributeMandatory();
+
+    /**
+     * Returns the meta object for the containment reference '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReference <em>Containment Reference</em>}'.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
-     * @return the meta object for the containment reference '
-     *         <em>Containment Reference</em>'.
+     * @return the meta object for the containment reference '<em>Containment Reference</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReference()
      * @see #getTestElement()
      * @generated
@@ -399,13 +702,10 @@ public interface PropertiestestsPackage extends EPackage {
     EReference getTestElement_ContainmentReference();
 
     /**
-     * Returns the meta object for the containment reference list '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferences
-     * <em>Containment References</em>}'. <!-- begin-user-doc --> <!--
+     * Returns the meta object for the containment reference list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferences <em>Containment References</em>}'.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
-     * @return the meta object for the containment reference list '
-     *         <em>Containment References</em>'.
+     * @return the meta object for the containment reference list '<em>Containment References</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferences()
      * @see #getTestElement()
      * @generated
@@ -413,10 +713,19 @@ public interface PropertiestestsPackage extends EPackage {
     EReference getTestElement_ContainmentReferences();
 
     /**
-     * Returns the meta object for the reference '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReference
-     * <em>Reference</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the meta object for the containment reference '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferenceMandatory <em>Containment Reference Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference '<em>Containment Reference Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferenceMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EReference getTestElement_ContainmentReferenceMandatory();
+
+    /**
+     * Returns the meta object for the reference '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReference <em>Reference</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @return the meta object for the reference '<em>Reference</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReference()
      * @see #getTestElement()
@@ -425,10 +734,8 @@ public interface PropertiestestsPackage extends EPackage {
     EReference getTestElement_Reference();
 
     /**
-     * Returns the meta object for the reference list '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferences
-     * <em>References</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the meta object for the reference list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferences <em>References</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @return the meta object for the reference list '<em>References</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferences()
      * @see #getTestElement()
@@ -437,10 +744,261 @@ public interface PropertiestestsPackage extends EPackage {
     EReference getTestElement_References();
 
     /**
-     * Returns the meta object for enum '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
-     * <em>Test Enum</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the meta object for the reference '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferenceMandatory <em>Reference Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the reference '<em>Reference Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferenceMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EReference getTestElement_ReferenceMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttribute <em>Char Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Char Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_CharAttribute();
+
+    /**
+     * Returns the meta object for the attribute list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttributes <em>Char Attributes</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute list '<em>Char Attributes</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttributes()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_CharAttributes();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttributeMandatory <em>Char Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Char Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_CharAttributeMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttribute <em>Date Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Date Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_DateAttribute();
+
+    /**
+     * Returns the meta object for the attribute list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttributes <em>Date Attributes</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute list '<em>Date Attributes</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttributes()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_DateAttributes();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttributeMandatory <em>Date Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Date Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_DateAttributeMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttribute <em>Double Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Double Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_DoubleAttribute();
+
+    /**
+     * Returns the meta object for the attribute list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttributes <em>Double Attributes</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute list '<em>Double Attributes</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttributes()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_DoubleAttributes();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttributeMandatory <em>Double Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Double Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_DoubleAttributeMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttribute <em>Float Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Float Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_FloatAttribute();
+
+    /**
+     * Returns the meta object for the attribute list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttributes <em>Float Attributes</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute list '<em>Float Attributes</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttributes()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_FloatAttributes();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttributeMandatory <em>Float Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Float Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_FloatAttributeMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttribute <em>Long Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Long Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_LongAttribute();
+
+    /**
+     * Returns the meta object for the attribute list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttributes <em>Long Attributes</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute list '<em>Long Attributes</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttributes()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_LongAttributes();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttributeMandatory <em>Long Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Long Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_LongAttributeMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttribute <em>Short Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Short Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_ShortAttribute();
+
+    /**
+     * Returns the meta object for the attribute list '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttributes <em>Short Attributes</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute list '<em>Short Attributes</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttributes()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_ShortAttributes();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttributeMandatory <em>Short Attribute Mandatory</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Short Attribute Mandatory</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttributeMandatory()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_ShortAttributeMandatory();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDerivedAttribute <em>Derived Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Derived Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDerivedAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_DerivedAttribute();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getTransientAttribute <em>Transient Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Transient Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getTransientAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_TransientAttribute();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getNonChangeableAttribute <em>Non Changeable Attribute</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Non Changeable Attribute</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getNonChangeableAttribute()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_NonChangeableAttribute();
+
+    /**
+     * Returns the meta object for the attribute '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getOptionalFeature <em>Optional Feature</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Optional Feature</em>'.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getOptionalFeature()
+     * @see #getTestElement()
+     * @generated
+     */
+    EAttribute getTestElement_OptionalFeature();
+
+    /**
+     * Returns the meta object for enum '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum <em>Test Enum</em>}'.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @return the meta object for enum '<em>Test Enum</em>'.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
      * @generated
@@ -467,7 +1025,6 @@ public interface PropertiestestsPackage extends EPackage {
      * <li>and each data type</li>
      * </ul>
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     interface Literals {
@@ -481,126 +1038,349 @@ public interface PropertiestestsPackage extends EPackage {
          * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.PropertiestestsPackageImpl#getTestRoot()
          * @generated
          */
-        EClass TEST_ROOT = PropertiestestsPackage.eINSTANCE.getTestRoot();
+        EClass TEST_ROOT = eINSTANCE.getTestRoot();
 
         /**
-         * The meta object literal for the '<em><b>Elements</b></em>'
-         * containment reference list feature. <!-- begin-user-doc --> <!--
+         * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature.
+         * <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         *
          * @generated
          */
-        EReference TEST_ROOT__ELEMENTS = PropertiestestsPackage.eINSTANCE.getTestRoot_Elements();
+        EReference TEST_ROOT__ELEMENTS = eINSTANCE.getTestRoot_Elements();
 
         /**
-         * The meta object literal for the '
-         * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl
-         * <em>Test Element</em>}' class. <!-- begin-user-doc --> <!--
+         * The meta object literal for the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl <em>Test Element</em>}' class.
+         * <!-- begin-user-doc --> <!--
          * end-user-doc -->
-         *
          * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl
          * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.PropertiestestsPackageImpl#getTestElement()
          * @generated
          */
-        EClass TEST_ELEMENT = PropertiestestsPackage.eINSTANCE.getTestElement();
+        EClass TEST_ELEMENT = eINSTANCE.getTestElement();
 
         /**
-         * The meta object literal for the '<em><b>String Attribute</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>String Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TEST_ELEMENT__STRING_ATTRIBUTE = PropertiestestsPackage.eINSTANCE.getTestElement_StringAttribute();
+        EAttribute TEST_ELEMENT__STRING_ATTRIBUTE = eINSTANCE.getTestElement_StringAttribute();
 
         /**
-         * The meta object literal for the '<em><b>String Attributes</b></em>'
-         * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>String Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TEST_ELEMENT__STRING_ATTRIBUTES = PropertiestestsPackage.eINSTANCE.getTestElement_StringAttributes();
+        EAttribute TEST_ELEMENT__STRING_ATTRIBUTES = eINSTANCE.getTestElement_StringAttributes();
 
         /**
-         * The meta object literal for the '<em><b>Int Attribute</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>String Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TEST_ELEMENT__INT_ATTRIBUTE = PropertiestestsPackage.eINSTANCE.getTestElement_IntAttribute();
+        EAttribute TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_StringAttributeMandatory();
 
         /**
-         * The meta object literal for the '<em><b>Int Attributes</b></em>'
-         * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>String Attribute Multiline</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TEST_ELEMENT__INT_ATTRIBUTES = PropertiestestsPackage.eINSTANCE.getTestElement_IntAttributes();
+        EAttribute TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE = eINSTANCE.getTestElement_StringAttributeMultiline();
 
         /**
-         * The meta object literal for the '<em><b>Boolean Attribute</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>String Attribute Multiline Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TEST_ELEMENT__BOOLEAN_ATTRIBUTE = PropertiestestsPackage.eINSTANCE.getTestElement_BooleanAttribute();
+        EAttribute TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY = eINSTANCE.getTestElement_StringAttributeMultilineMandatory();
 
         /**
-         * The meta object literal for the '<em><b>Boolean Attributes</b></em>'
-         * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>Int Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TEST_ELEMENT__BOOLEAN_ATTRIBUTES = PropertiestestsPackage.eINSTANCE.getTestElement_BooleanAttributes();
+        EAttribute TEST_ELEMENT__INT_ATTRIBUTE = eINSTANCE.getTestElement_IntAttribute();
 
         /**
-         * The meta object literal for the '<em><b>Enum Attribute</b></em>'
-         * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>Int Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TEST_ELEMENT__ENUM_ATTRIBUTE = PropertiestestsPackage.eINSTANCE.getTestElement_EnumAttribute();
+        EAttribute TEST_ELEMENT__INT_ATTRIBUTES = eINSTANCE.getTestElement_IntAttributes();
 
         /**
-         * The meta object literal for the '<em><b>Enum Attributes</b></em>'
-         * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>Int Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
-        EAttribute TEST_ELEMENT__ENUM_ATTRIBUTES = PropertiestestsPackage.eINSTANCE.getTestElement_EnumAttributes();
+        EAttribute TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_IntAttributeMandatory();
 
         /**
-         * The meta object literal for the '
-         * <em><b>Containment Reference</b></em>' containment reference feature.
+         * The meta object literal for the '<em><b>Boolean Attribute</b></em>' attribute feature.
          * <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
          * @generated
          */
-        EReference TEST_ELEMENT__CONTAINMENT_REFERENCE = PropertiestestsPackage.eINSTANCE.getTestElement_ContainmentReference();
+        EAttribute TEST_ELEMENT__BOOLEAN_ATTRIBUTE = eINSTANCE.getTestElement_BooleanAttribute();
 
         /**
-         * The meta object literal for the '
-         * <em><b>Containment References</b></em>' containment reference list
-         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>Boolean Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
          * @generated
          */
-        EReference TEST_ELEMENT__CONTAINMENT_REFERENCES = PropertiestestsPackage.eINSTANCE.getTestElement_ContainmentReferences();
+        EAttribute TEST_ELEMENT__BOOLEAN_ATTRIBUTES = eINSTANCE.getTestElement_BooleanAttributes();
 
         /**
-         * The meta object literal for the '<em><b>Reference</b></em>' reference
-         * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>Boolean Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
-        EReference TEST_ELEMENT__REFERENCE = PropertiestestsPackage.eINSTANCE.getTestElement_Reference();
+        EAttribute TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_BooleanAttributeMandatory();
 
         /**
-         * The meta object literal for the '<em><b>References</b></em>'
-         * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-         *
+         * The meta object literal for the '<em><b>Enum Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__ENUM_ATTRIBUTE = eINSTANCE.getTestElement_EnumAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Enum Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__ENUM_ATTRIBUTES = eINSTANCE.getTestElement_EnumAttributes();
+
+        /**
+         * The meta object literal for the '<em><b>Enum Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_EnumAttributeMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Containment Reference</b></em>' containment reference feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * @generated
+         */
+        EReference TEST_ELEMENT__CONTAINMENT_REFERENCE = eINSTANCE.getTestElement_ContainmentReference();
+
+        /**
+         * The meta object literal for the '<em><b>Containment References</b></em>' containment reference list feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * @generated
+         */
+        EReference TEST_ELEMENT__CONTAINMENT_REFERENCES = eINSTANCE.getTestElement_ContainmentReferences();
+
+        /**
+         * The meta object literal for the '<em><b>Containment Reference Mandatory</b></em>' containment reference feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY = eINSTANCE.getTestElement_ContainmentReferenceMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Reference</b></em>' reference feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * @generated
+         */
+        EReference TEST_ELEMENT__REFERENCE = eINSTANCE.getTestElement_Reference();
+
+        /**
+         * The meta object literal for the '<em><b>References</b></em>' reference list feature.
+         * <!-- begin-user-doc --> <!-- end-user-doc -->
+         * @generated
+         */
+        EReference TEST_ELEMENT__REFERENCES = eINSTANCE.getTestElement_References();
+
+        /**
+         * The meta object literal for the '<em><b>Reference Mandatory</b></em>' reference feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EReference TEST_ELEMENT__REFERENCE_MANDATORY = eINSTANCE.getTestElement_ReferenceMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Char Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__CHAR_ATTRIBUTE = eINSTANCE.getTestElement_CharAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Char Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__CHAR_ATTRIBUTES = eINSTANCE.getTestElement_CharAttributes();
+
+        /**
+         * The meta object literal for the '<em><b>Char Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_CharAttributeMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Date Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__DATE_ATTRIBUTE = eINSTANCE.getTestElement_DateAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Date Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__DATE_ATTRIBUTES = eINSTANCE.getTestElement_DateAttributes();
+
+        /**
+         * The meta object literal for the '<em><b>Date Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_DateAttributeMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Double Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__DOUBLE_ATTRIBUTE = eINSTANCE.getTestElement_DoubleAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Double Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__DOUBLE_ATTRIBUTES = eINSTANCE.getTestElement_DoubleAttributes();
+
+        /**
+         * The meta object literal for the '<em><b>Double Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_DoubleAttributeMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Float Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__FLOAT_ATTRIBUTE = eINSTANCE.getTestElement_FloatAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Float Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__FLOAT_ATTRIBUTES = eINSTANCE.getTestElement_FloatAttributes();
+
+        /**
+         * The meta object literal for the '<em><b>Float Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_FloatAttributeMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Long Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__LONG_ATTRIBUTE = eINSTANCE.getTestElement_LongAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Long Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__LONG_ATTRIBUTES = eINSTANCE.getTestElement_LongAttributes();
+
+        /**
+         * The meta object literal for the '<em><b>Long Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_LongAttributeMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Short Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__SHORT_ATTRIBUTE = eINSTANCE.getTestElement_ShortAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Short Attributes</b></em>' attribute list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__SHORT_ATTRIBUTES = eINSTANCE.getTestElement_ShortAttributes();
+
+        /**
+         * The meta object literal for the '<em><b>Short Attribute Mandatory</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY = eINSTANCE.getTestElement_ShortAttributeMandatory();
+
+        /**
+         * The meta object literal for the '<em><b>Derived Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__DERIVED_ATTRIBUTE = eINSTANCE.getTestElement_DerivedAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Transient Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__TRANSIENT_ATTRIBUTE = eINSTANCE.getTestElement_TransientAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Non Changeable Attribute</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute TEST_ELEMENT__NON_CHANGEABLE_ATTRIBUTE = eINSTANCE.getTestElement_NonChangeableAttribute();
+
+        /**
+         * The meta object literal for the '<em><b>Optional Feature</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
          * @generated
          */
-        EReference TEST_ELEMENT__REFERENCES = PropertiestestsPackage.eINSTANCE.getTestElement_References();
+        EAttribute TEST_ELEMENT__OPTIONAL_FEATURE = eINSTANCE.getTestElement_OptionalFeature();
 
         /**
          * The meta object literal for the '
@@ -612,7 +1392,7 @@ public interface PropertiestestsPackage extends EPackage {
          * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.PropertiestestsPackageImpl#getTestEnum()
          * @generated
          */
-        EEnum TEST_ENUM = PropertiestestsPackage.eINSTANCE.getTestEnum();
+        EEnum TEST_ENUM = eINSTANCE.getTestEnum();
 
     }
 
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestElement.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestElement.java
index c0f427971a..dcaeb7fa1d 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestElement.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestElement.java
@@ -7,6 +7,7 @@
  */
 package org.eclipse.sirius.tests.rcptt.properties.propertiestests;
 
+import java.util.Date;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
@@ -18,42 +19,48 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttribute
- * <em>String Attribute</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributes
- * <em>String Attributes</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttribute
- * <em>Int Attribute</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributes
- * <em>Int Attributes</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttribute
- * <em>Boolean Attribute</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getBooleanAttributes
- * <em>Boolean Attributes</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttribute
- * <em>Enum Attribute</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributes
- * <em>Enum Attributes</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReference
- * <em>Containment Reference</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferences
- * <em>Containment References</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReference
- * <em>Reference</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferences
- * <em>References</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttribute <em>String Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributes <em>String Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMandatory <em>String Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMultiline <em>String Attribute Multiline</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMultilineMandatory <em>String Attribute Multiline Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttribute <em>Int Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributes <em>Int Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributeMandatory <em>Int Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttribute <em>Boolean Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getBooleanAttributes <em>Boolean Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttributeMandatory <em>Boolean Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttribute <em>Enum Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributes <em>Enum Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributeMandatory <em>Enum Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReference <em>Containment Reference</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferences <em>Containment References</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferenceMandatory <em>Containment Reference Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReference <em>Reference</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferences <em>References</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferenceMandatory <em>Reference Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttribute <em>Char Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttributes <em>Char Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttributeMandatory <em>Char Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttribute <em>Date Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttributes <em>Date Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttributeMandatory <em>Date Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttribute <em>Double Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttributes <em>Double Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttributeMandatory <em>Double Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttribute <em>Float Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttributes <em>Float Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttributeMandatory <em>Float Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttribute <em>Long Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttributes <em>Long Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttributeMandatory <em>Long Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttribute <em>Short Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttributes <em>Short Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttributeMandatory <em>Short Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDerivedAttribute <em>Derived Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getTransientAttribute <em>Transient Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getNonChangeableAttribute <em>Non Changeable Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getOptionalFeature <em>Optional Feature</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement()
@@ -69,7 +76,6 @@ public interface TestElement extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @return the value of the '<em>String Attribute</em>' attribute.
      * @see #setStringAttribute(String)
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_StringAttribute()
@@ -79,13 +85,10 @@ public interface TestElement extends EObject {
     String getStringAttribute();
 
     /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttribute
-     * <em>String Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttribute <em>String Attribute</em>}' attribute.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
-     * @param value
-     *            the new value of the '<em>String Attribute</em>' attribute.
+     * @param value the new value of the '<em>String Attribute</em>' attribute.
      * @see #getStringAttribute()
      * @generated
      */
@@ -109,6 +112,84 @@ public interface TestElement extends EObject {
     EList<String> getStringAttributes();
 
     /**
+     * Returns the value of the '<em><b>String Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>String Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>String Attribute Mandatory</em>' attribute.
+     * @see #setStringAttributeMandatory(String)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_StringAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    String getStringAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMandatory <em>String Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>String Attribute Mandatory</em>' attribute.
+     * @see #getStringAttributeMandatory()
+     * @generated
+     */
+    void setStringAttributeMandatory(String value);
+
+    /**
+     * Returns the value of the '<em><b>String Attribute Multiline</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>String Attribute Multiline</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>String Attribute Multiline</em>' attribute.
+     * @see #setStringAttributeMultiline(String)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_StringAttributeMultiline()
+     * @model
+     * @generated
+     */
+    String getStringAttributeMultiline();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMultiline <em>String Attribute Multiline</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>String Attribute Multiline</em>' attribute.
+     * @see #getStringAttributeMultiline()
+     * @generated
+     */
+    void setStringAttributeMultiline(String value);
+
+    /**
+     * Returns the value of the '<em><b>String Attribute Multiline Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>String Attribute Multiline Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>String Attribute Multiline Mandatory</em>' attribute.
+     * @see #setStringAttributeMultilineMandatory(String)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_StringAttributeMultilineMandatory()
+     * @model required="true"
+     * @generated
+     */
+    String getStringAttributeMultilineMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getStringAttributeMultilineMandatory <em>String Attribute Multiline Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>String Attribute Multiline Mandatory</em>' attribute.
+     * @see #getStringAttributeMultilineMandatory()
+     * @generated
+     */
+    void setStringAttributeMultilineMandatory(String value);
+
+    /**
      * Returns the value of the '<em><b>Int Attribute</b></em>' attribute. <!--
      * begin-user-doc -->
      * <p>
@@ -126,13 +207,10 @@ public interface TestElement extends EObject {
     int getIntAttribute();
 
     /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttribute
-     * <em>Int Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttribute <em>Int Attribute</em>}' attribute.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
-     * @param value
-     *            the new value of the '<em>Int Attribute</em>' attribute.
+     * @param value the new value of the '<em>Int Attribute</em>' attribute.
      * @see #getIntAttribute()
      * @generated
      */
@@ -156,6 +234,32 @@ public interface TestElement extends EObject {
     EList<Integer> getIntAttributes();
 
     /**
+     * Returns the value of the '<em><b>Int Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Int Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Int Attribute Mandatory</em>' attribute.
+     * @see #setIntAttributeMandatory(int)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_IntAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    int getIntAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getIntAttributeMandatory <em>Int Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Int Attribute Mandatory</em>' attribute.
+     * @see #getIntAttributeMandatory()
+     * @generated
+     */
+    void setIntAttributeMandatory(int value);
+
+    /**
      * Returns the value of the '<em><b>Boolean Attribute</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <p>
@@ -163,7 +267,6 @@ public interface TestElement extends EObject {
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @return the value of the '<em>Boolean Attribute</em>' attribute.
      * @see #setBooleanAttribute(boolean)
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_BooleanAttribute()
@@ -173,13 +276,10 @@ public interface TestElement extends EObject {
     boolean isBooleanAttribute();
 
     /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttribute
-     * <em>Boolean Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttribute <em>Boolean Attribute</em>}' attribute.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
-     * @param value
-     *            the new value of the '<em>Boolean Attribute</em>' attribute.
+     * @param value the new value of the '<em>Boolean Attribute</em>' attribute.
      * @see #isBooleanAttribute()
      * @generated
      */
@@ -203,16 +303,40 @@ public interface TestElement extends EObject {
     EList<Boolean> getBooleanAttributes();
 
     /**
-     * Returns the value of the '<em><b>Enum Attribute</b></em>' attribute. The
-     * literals are from the enumeration
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum}
-     * . <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Boolean Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Boolean Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Boolean Attribute Mandatory</em>' attribute.
+     * @see #setBooleanAttributeMandatory(boolean)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_BooleanAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    boolean isBooleanAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#isBooleanAttributeMandatory <em>Boolean Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Boolean Attribute Mandatory</em>' attribute.
+     * @see #isBooleanAttributeMandatory()
+     * @generated
+     */
+    void setBooleanAttributeMandatory(boolean value);
+
+    /**
+     * Returns the value of the '<em><b>Enum Attribute</b></em>' attribute.
+     * The literals are from the enumeration {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum}.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Enum Attribute</em>' attribute isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @return the value of the '<em>Enum Attribute</em>' attribute.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
      * @see #setEnumAttribute(TestEnum)
@@ -223,13 +347,10 @@ public interface TestElement extends EObject {
     TestEnum getEnumAttribute();
 
     /**
-     * Sets the value of the '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttribute
-     * <em>Enum Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttribute <em>Enum Attribute</em>}' attribute.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
-     * @param value
-     *            the new value of the '<em>Enum Attribute</em>' attribute.
+     * @param value the new value of the '<em>Enum Attribute</em>' attribute.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
      * @see #getEnumAttribute()
      * @generated
@@ -237,18 +358,15 @@ public interface TestElement extends EObject {
     void setEnumAttribute(TestEnum value);
 
     /**
-     * Returns the value of the '<em><b>Enum Attributes</b></em>' attribute
-     * list. The list contents are of type
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum}
-     * . The literals are from the enumeration
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum}
-     * . <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Enum Attributes</b></em>' attribute list.
+     * The list contents are of type {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum}.
+     * The literals are from the enumeration {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum}.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Enum Attributes</em>' attribute list isn't
      * clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @return the value of the '<em>Enum Attributes</em>' attribute list.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_EnumAttributes()
@@ -258,17 +376,44 @@ public interface TestElement extends EObject {
     EList<TestEnum> getEnumAttributes();
 
     /**
-     * Returns the value of the '<em><b>Containment Reference</b></em>'
-     * containment reference. <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Enum Attribute Mandatory</b></em>' attribute.
+     * The literals are from the enumeration {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Enum Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Enum Attribute Mandatory</em>' attribute.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
+     * @see #setEnumAttributeMandatory(TestEnum)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_EnumAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    TestEnum getEnumAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getEnumAttributeMandatory <em>Enum Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Enum Attribute Mandatory</em>' attribute.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum
+     * @see #getEnumAttributeMandatory()
+     * @generated
+     */
+    void setEnumAttributeMandatory(TestEnum value);
+
+    /**
+     * Returns the value of the '<em><b>Containment Reference</b></em>' containment reference.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Containment Reference</em>' containment
      * reference isn't clear, there really should be more of a description
      * here...
      * </p>
      * <!-- end-user-doc -->
-     *
-     * @return the value of the '<em>Containment Reference</em>' containment
-     *         reference.
+     * @return the value of the '<em>Containment Reference</em>' containment reference.
      * @see #setContainmentReference(TestElement)
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_ContainmentReference()
      * @model containment="true"
@@ -291,19 +436,16 @@ public interface TestElement extends EObject {
     void setContainmentReference(TestElement value);
 
     /**
-     * Returns the value of the '<em><b>Containment References</b></em>'
-     * containment reference list. The list contents are of type
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}
-     * . <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Containment References</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Containment References</em>' containment
      * reference list isn't clear, there really should be more of a description
      * here...
      * </p>
      * <!-- end-user-doc -->
-     *
-     * @return the value of the '<em>Containment References</em>' containment
-     *         reference list.
+     * @return the value of the '<em>Containment References</em>' containment reference list.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_ContainmentReferences()
      * @model containment="true"
      * @generated
@@ -311,6 +453,32 @@ public interface TestElement extends EObject {
     EList<TestElement> getContainmentReferences();
 
     /**
+     * Returns the value of the '<em><b>Containment Reference Mandatory</b></em>' containment reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Containment Reference Mandatory</em>' containment reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Containment Reference Mandatory</em>' containment reference.
+     * @see #setContainmentReferenceMandatory(TestElement)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_ContainmentReferenceMandatory()
+     * @model containment="true" required="true"
+     * @generated
+     */
+    TestElement getContainmentReferenceMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getContainmentReferenceMandatory <em>Containment Reference Mandatory</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Containment Reference Mandatory</em>' containment reference.
+     * @see #getContainmentReferenceMandatory()
+     * @generated
+     */
+    void setContainmentReferenceMandatory(TestElement value);
+
+    /**
      * Returns the value of the '<em><b>Reference</b></em>' reference. <!--
      * begin-user-doc -->
      * <p>
@@ -341,16 +509,14 @@ public interface TestElement extends EObject {
     void setReference(TestElement value);
 
     /**
-     * Returns the value of the '<em><b>References</b></em>' reference list. The
-     * list contents are of type
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}
-     * . <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>References</b></em>' reference list.
+     * The list contents are of type {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>References</em>' reference list isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @return the value of the '<em>References</em>' reference list.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_References()
      * @model
@@ -358,4 +524,533 @@ public interface TestElement extends EObject {
      */
     EList<TestElement> getReferences();
 
+    /**
+     * Returns the value of the '<em><b>Reference Mandatory</b></em>' reference.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Reference Mandatory</em>' reference isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Reference Mandatory</em>' reference.
+     * @see #setReferenceMandatory(TestElement)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_ReferenceMandatory()
+     * @model required="true"
+     * @generated
+     */
+    TestElement getReferenceMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getReferenceMandatory <em>Reference Mandatory</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Reference Mandatory</em>' reference.
+     * @see #getReferenceMandatory()
+     * @generated
+     */
+    void setReferenceMandatory(TestElement value);
+
+    /**
+     * Returns the value of the '<em><b>Char Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Char Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Char Attribute</em>' attribute.
+     * @see #setCharAttribute(char)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_CharAttribute()
+     * @model
+     * @generated
+     */
+    char getCharAttribute();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttribute <em>Char Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Char Attribute</em>' attribute.
+     * @see #getCharAttribute()
+     * @generated
+     */
+    void setCharAttribute(char value);
+
+    /**
+     * Returns the value of the '<em><b>Char Attributes</b></em>' attribute list.
+     * The list contents are of type {@link java.lang.Character}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Char Attributes</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Char Attributes</em>' attribute list.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_CharAttributes()
+     * @model
+     * @generated
+     */
+    EList<Character> getCharAttributes();
+
+    /**
+     * Returns the value of the '<em><b>Char Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Char Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Char Attribute Mandatory</em>' attribute.
+     * @see #setCharAttributeMandatory(char)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_CharAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    char getCharAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getCharAttributeMandatory <em>Char Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Char Attribute Mandatory</em>' attribute.
+     * @see #getCharAttributeMandatory()
+     * @generated
+     */
+    void setCharAttributeMandatory(char value);
+
+    /**
+     * Returns the value of the '<em><b>Date Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Date Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Date Attribute</em>' attribute.
+     * @see #setDateAttribute(Date)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_DateAttribute()
+     * @model
+     * @generated
+     */
+    Date getDateAttribute();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttribute <em>Date Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Date Attribute</em>' attribute.
+     * @see #getDateAttribute()
+     * @generated
+     */
+    void setDateAttribute(Date value);
+
+    /**
+     * Returns the value of the '<em><b>Date Attributes</b></em>' attribute list.
+     * The list contents are of type {@link java.util.Date}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Date Attributes</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Date Attributes</em>' attribute list.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_DateAttributes()
+     * @model
+     * @generated
+     */
+    EList<Date> getDateAttributes();
+
+    /**
+     * Returns the value of the '<em><b>Date Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Date Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Date Attribute Mandatory</em>' attribute.
+     * @see #setDateAttributeMandatory(Date)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_DateAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    Date getDateAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDateAttributeMandatory <em>Date Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Date Attribute Mandatory</em>' attribute.
+     * @see #getDateAttributeMandatory()
+     * @generated
+     */
+    void setDateAttributeMandatory(Date value);
+
+    /**
+     * Returns the value of the '<em><b>Double Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Double Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Double Attribute</em>' attribute.
+     * @see #setDoubleAttribute(double)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_DoubleAttribute()
+     * @model
+     * @generated
+     */
+    double getDoubleAttribute();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttribute <em>Double Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Double Attribute</em>' attribute.
+     * @see #getDoubleAttribute()
+     * @generated
+     */
+    void setDoubleAttribute(double value);
+
+    /**
+     * Returns the value of the '<em><b>Double Attributes</b></em>' attribute list.
+     * The list contents are of type {@link java.lang.Double}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Double Attributes</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Double Attributes</em>' attribute list.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_DoubleAttributes()
+     * @model
+     * @generated
+     */
+    EList<Double> getDoubleAttributes();
+
+    /**
+     * Returns the value of the '<em><b>Double Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Double Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Double Attribute Mandatory</em>' attribute.
+     * @see #setDoubleAttributeMandatory(double)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_DoubleAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    double getDoubleAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDoubleAttributeMandatory <em>Double Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Double Attribute Mandatory</em>' attribute.
+     * @see #getDoubleAttributeMandatory()
+     * @generated
+     */
+    void setDoubleAttributeMandatory(double value);
+
+    /**
+     * Returns the value of the '<em><b>Float Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Float Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Float Attribute</em>' attribute.
+     * @see #setFloatAttribute(float)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_FloatAttribute()
+     * @model
+     * @generated
+     */
+    float getFloatAttribute();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttribute <em>Float Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Float Attribute</em>' attribute.
+     * @see #getFloatAttribute()
+     * @generated
+     */
+    void setFloatAttribute(float value);
+
+    /**
+     * Returns the value of the '<em><b>Float Attributes</b></em>' attribute list.
+     * The list contents are of type {@link java.lang.Float}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Float Attributes</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Float Attributes</em>' attribute list.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_FloatAttributes()
+     * @model
+     * @generated
+     */
+    EList<Float> getFloatAttributes();
+
+    /**
+     * Returns the value of the '<em><b>Float Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Float Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Float Attribute Mandatory</em>' attribute.
+     * @see #setFloatAttributeMandatory(float)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_FloatAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    float getFloatAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getFloatAttributeMandatory <em>Float Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Float Attribute Mandatory</em>' attribute.
+     * @see #getFloatAttributeMandatory()
+     * @generated
+     */
+    void setFloatAttributeMandatory(float value);
+
+    /**
+     * Returns the value of the '<em><b>Long Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Long Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Long Attribute</em>' attribute.
+     * @see #setLongAttribute(long)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_LongAttribute()
+     * @model
+     * @generated
+     */
+    long getLongAttribute();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttribute <em>Long Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Long Attribute</em>' attribute.
+     * @see #getLongAttribute()
+     * @generated
+     */
+    void setLongAttribute(long value);
+
+    /**
+     * Returns the value of the '<em><b>Long Attributes</b></em>' attribute list.
+     * The list contents are of type {@link java.lang.Long}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Long Attributes</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Long Attributes</em>' attribute list.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_LongAttributes()
+     * @model
+     * @generated
+     */
+    EList<Long> getLongAttributes();
+
+    /**
+     * Returns the value of the '<em><b>Long Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Long Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Long Attribute Mandatory</em>' attribute.
+     * @see #setLongAttributeMandatory(long)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_LongAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    long getLongAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getLongAttributeMandatory <em>Long Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Long Attribute Mandatory</em>' attribute.
+     * @see #getLongAttributeMandatory()
+     * @generated
+     */
+    void setLongAttributeMandatory(long value);
+
+    /**
+     * Returns the value of the '<em><b>Short Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Short Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Short Attribute</em>' attribute.
+     * @see #setShortAttribute(short)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_ShortAttribute()
+     * @model
+     * @generated
+     */
+    short getShortAttribute();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttribute <em>Short Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Short Attribute</em>' attribute.
+     * @see #getShortAttribute()
+     * @generated
+     */
+    void setShortAttribute(short value);
+
+    /**
+     * Returns the value of the '<em><b>Short Attributes</b></em>' attribute list.
+     * The list contents are of type {@link java.lang.Short}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Short Attributes</em>' attribute list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Short Attributes</em>' attribute list.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_ShortAttributes()
+     * @model
+     * @generated
+     */
+    EList<Short> getShortAttributes();
+
+    /**
+     * Returns the value of the '<em><b>Short Attribute Mandatory</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Short Attribute Mandatory</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Short Attribute Mandatory</em>' attribute.
+     * @see #setShortAttributeMandatory(short)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_ShortAttributeMandatory()
+     * @model required="true"
+     * @generated
+     */
+    short getShortAttributeMandatory();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getShortAttributeMandatory <em>Short Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Short Attribute Mandatory</em>' attribute.
+     * @see #getShortAttributeMandatory()
+     * @generated
+     */
+    void setShortAttributeMandatory(short value);
+
+    /**
+     * Returns the value of the '<em><b>Derived Attribute</b></em>' attribute.
+     * The default value is <code>""</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Derived Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Derived Attribute</em>' attribute.
+     * @see #setDerivedAttribute(String)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_DerivedAttribute()
+     * @model default="" transient="true" volatile="true" derived="true"
+     * @generated
+     */
+    String getDerivedAttribute();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getDerivedAttribute <em>Derived Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Derived Attribute</em>' attribute.
+     * @see #getDerivedAttribute()
+     * @generated
+     */
+    void setDerivedAttribute(String value);
+
+    /**
+     * Returns the value of the '<em><b>Transient Attribute</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Transient Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Transient Attribute</em>' attribute.
+     * @see #setTransientAttribute(String)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_TransientAttribute()
+     * @model transient="true"
+     * @generated
+     */
+    String getTransientAttribute();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getTransientAttribute <em>Transient Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Transient Attribute</em>' attribute.
+     * @see #getTransientAttribute()
+     * @generated
+     */
+    void setTransientAttribute(String value);
+
+    /**
+     * Returns the value of the '<em><b>Non Changeable Attribute</b></em>' attribute.
+     * The default value is <code>"NonChangeable"</code>.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Non Changeable Attribute</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Non Changeable Attribute</em>' attribute.
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_NonChangeableAttribute()
+     * @model default="NonChangeable" changeable="false"
+     * @generated
+     */
+    String getNonChangeableAttribute();
+
+    /**
+     * Returns the value of the '<em><b>Optional Feature</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Optional Feature</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Optional Feature</em>' attribute.
+     * @see #setOptionalFeature(String)
+     * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestElement_OptionalFeature()
+     * @model
+     * @generated
+     */
+    String getOptionalFeature();
+
+    /**
+     * Sets the value of the '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement#getOptionalFeature <em>Optional Feature</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Optional Feature</em>' attribute.
+     * @see #getOptionalFeature()
+     * @generated
+     */
+    void setOptionalFeature(String value);
+
 } // TestElement
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestEnum.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestEnum.java
index 71b286188e..e0714675da 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestEnum.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestEnum.java
@@ -17,16 +17,15 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '
  * <em><b>Test Enum</b></em>', and utility methods for working with them. <!--
  * end-user-doc -->
- *
  * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestEnum()
  * @model
  * @generated
  */
 public enum TestEnum implements Enumerator {
     /**
-     * The '<em><b>Literal1</b></em>' literal object. <!-- begin-user-doc -->
+     * The '<em><b>Literal1</b></em>' literal object.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @see #LITERAL1_VALUE
      * @generated
      * @ordered
@@ -34,9 +33,9 @@ public enum TestEnum implements Enumerator {
     LITERAL1(0, "Literal1", "Literal1"),
 
     /**
-     * The '<em><b>Literal2</b></em>' literal object. <!-- begin-user-doc -->
+     * The '<em><b>Literal2</b></em>' literal object.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @see #LITERAL2_VALUE
      * @generated
      * @ordered
@@ -44,9 +43,9 @@ public enum TestEnum implements Enumerator {
     LITERAL2(1, "Literal2", "Literal2"),
 
     /**
-     * The '<em><b>Literal3</b></em>' literal object. <!-- begin-user-doc -->
+     * The '<em><b>Literal3</b></em>' literal object.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @see #LITERAL3_VALUE
      * @generated
      * @ordered
@@ -54,13 +53,13 @@ public enum TestEnum implements Enumerator {
     LITERAL3(2, "Literal3", "Literal3");
 
     /**
-     * The '<em><b>Literal1</b></em>' literal value. <!-- begin-user-doc -->
+     * The '<em><b>Literal1</b></em>' literal value.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of '<em><b>Literal1</b></em>' literal object isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @see #LITERAL1
      * @model name="Literal1"
      * @generated
@@ -69,13 +68,13 @@ public enum TestEnum implements Enumerator {
     public static final int LITERAL1_VALUE = 0;
 
     /**
-     * The '<em><b>Literal2</b></em>' literal value. <!-- begin-user-doc -->
+     * The '<em><b>Literal2</b></em>' literal value.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of '<em><b>Literal2</b></em>' literal object isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @see #LITERAL2
      * @model name="Literal2"
      * @generated
@@ -84,13 +83,13 @@ public enum TestEnum implements Enumerator {
     public static final int LITERAL2_VALUE = 1;
 
     /**
-     * The '<em><b>Literal3</b></em>' literal value. <!-- begin-user-doc -->
+     * The '<em><b>Literal3</b></em>' literal value.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of '<em><b>Literal3</b></em>' literal object isn't clear,
      * there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @see #LITERAL3
      * @model name="Literal3"
      * @generated
@@ -104,27 +103,29 @@ public enum TestEnum implements Enumerator {
      *
      * @generated
      */
-    private static final TestEnum[] VALUES_ARRAY = new TestEnum[] { LITERAL1, LITERAL2, LITERAL3, };
+    private static final TestEnum[] VALUES_ARRAY = new TestEnum[] {
+            LITERAL1,
+            LITERAL2,
+            LITERAL3,
+        };
 
     /**
-     * A public read-only list of all the '<em><b>Test Enum</b></em>'
-     * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * A public read-only list of all the '<em><b>Test Enum</b></em>' enumerators.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
-    public static final List<TestEnum> VALUES = Collections.unmodifiableList(Arrays.asList(TestEnum.VALUES_ARRAY));
+    public static final List<TestEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
     /**
-     * Returns the '<em><b>Test Enum</b></em>' literal with the specified
-     * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @param literal
-     *            the literal.
+     * Returns the '<em><b>Test Enum</b></em>' literal with the specified literal value.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param literal the literal.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
     public static TestEnum get(String literal) {
-        for (TestEnum result : TestEnum.VALUES_ARRAY) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            TestEnum result = VALUES_ARRAY[i];
             if (result.toString().equals(literal)) {
                 return result;
             }
@@ -135,14 +136,13 @@ public enum TestEnum implements Enumerator {
     /**
      * Returns the '<em><b>Test Enum</b></em>' literal with the specified name.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @param name
-     *            the name.
+     * @param name the name.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
     public static TestEnum getByName(String name) {
-        for (TestEnum result : TestEnum.VALUES_ARRAY) {
+        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+            TestEnum result = VALUES_ARRAY[i];
             if (result.getName().equals(name)) {
                 return result;
             }
@@ -151,51 +151,43 @@ public enum TestEnum implements Enumerator {
     }
 
     /**
-     * Returns the '<em><b>Test Enum</b></em>' literal with the specified
-     * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
-     * @param value
-     *            the integer value.
+     * Returns the '<em><b>Test Enum</b></em>' literal with the specified integer value.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @param value the integer value.
      * @return the matching enumerator or <code>null</code>.
      * @generated
      */
     public static TestEnum get(int value) {
         switch (value) {
-        case LITERAL1_VALUE:
-            return LITERAL1;
-        case LITERAL2_VALUE:
-            return LITERAL2;
-        case LITERAL3_VALUE:
-            return LITERAL3;
+            case LITERAL1_VALUE: return LITERAL1;
+            case LITERAL2_VALUE: return LITERAL2;
+            case LITERAL3_VALUE: return LITERAL3;
         }
         return null;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private final int value;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private final String name;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private final String literal;
 
     /**
-     * Only this class can construct instances. <!-- begin-user-doc --> <!--
+     * Only this class can construct instances.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     private TestEnum(int value, String name, String literal) {
@@ -206,38 +198,34 @@ public enum TestEnum implements Enumerator {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public int getValue() {
-        return value;
+      return value;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public String getName() {
-        return name;
+      return name;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public String getLiteral() {
-        return literal;
+      return literal;
     }
 
     /**
-     * Returns the literal value of the enumerator, which is its string
-     * representation. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * Returns the literal value of the enumerator, which is its string representation.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     @Override
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestRoot.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestRoot.java
index ebe039bc49..2b1c38ce4b 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestRoot.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/TestRoot.java
@@ -18,9 +18,7 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot#getElements
- * <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot#getElements <em>Elements</em>}</li>
  * </ul>
  *
  * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestRoot()
@@ -29,16 +27,14 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface TestRoot extends EObject {
     /**
-     * Returns the value of the '<em><b>Elements</b></em>' containment reference
-     * list. The list contents are of type
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}
-     * . <!-- begin-user-doc -->
+     * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
+     * The list contents are of type {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement}.
+     * <!-- begin-user-doc -->
      * <p>
      * If the meaning of the '<em>Elements</em>' containment reference list
      * isn't clear, there really should be more of a description here...
      * </p>
      * <!-- end-user-doc -->
-     *
      * @return the value of the '<em>Elements</em>' containment reference list.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage#getTestRoot_Elements()
      * @model containment="true"
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/PropertiestestsFactoryImpl.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/PropertiestestsFactoryImpl.java
index c095ab9c3a..220e3a8d08 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/PropertiestestsFactoryImpl.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/PropertiestestsFactoryImpl.java
@@ -22,32 +22,32 @@ import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
- *
  * @generated
  */
 public class PropertiestestsFactoryImpl extends EFactoryImpl implements PropertiestestsFactory {
     /**
-     * Creates the default factory implementation. <!-- begin-user-doc --> <!--
+     * Creates the default factory implementation.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     public static PropertiestestsFactory init() {
         try {
-            PropertiestestsFactory thePropertiestestsFactory = (PropertiestestsFactory) EPackage.Registry.INSTANCE.getEFactory(PropertiestestsPackage.eNS_URI);
+            PropertiestestsFactory thePropertiestestsFactory = (PropertiestestsFactory)EPackage.Registry.INSTANCE.getEFactory(PropertiestestsPackage.eNS_URI);
             if (thePropertiestestsFactory != null) {
                 return thePropertiestestsFactory;
             }
-        } catch (Exception exception) {
+        }
+        catch (Exception exception) {
             EcorePlugin.INSTANCE.log(exception);
         }
         return new PropertiestestsFactoryImpl();
     }
 
     /**
-     * Creates an instance of the factory. <!-- begin-user-doc --> <!--
+     * Creates an instance of the factory.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     public PropertiestestsFactoryImpl() {
@@ -56,54 +56,48 @@ public class PropertiestestsFactoryImpl extends EFactoryImpl implements Properti
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EObject create(EClass eClass) {
         switch (eClass.getClassifierID()) {
-        case PropertiestestsPackage.TEST_ROOT:
-            return createTestRoot();
-        case PropertiestestsPackage.TEST_ELEMENT:
-            return createTestElement();
-        default:
-            throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+            case PropertiestestsPackage.TEST_ROOT: return createTestRoot();
+            case PropertiestestsPackage.TEST_ELEMENT: return createTestElement();
+            default:
+                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
         }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public Object createFromString(EDataType eDataType, String initialValue) {
         switch (eDataType.getClassifierID()) {
-        case PropertiestestsPackage.TEST_ENUM:
-            return createTestEnumFromString(eDataType, initialValue);
-        default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            case PropertiestestsPackage.TEST_ENUM:
+                return createTestEnumFromString(eDataType, initialValue);
+            default:
+                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
         }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public String convertToString(EDataType eDataType, Object instanceValue) {
         switch (eDataType.getClassifierID()) {
-        case PropertiestestsPackage.TEST_ENUM:
-            return convertTestEnumToString(eDataType, instanceValue);
-        default:
-            throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+            case PropertiestestsPackage.TEST_ENUM:
+                return convertTestEnumToString(eDataType, instanceValue);
+            default:
+                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
         }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -114,7 +108,6 @@ public class PropertiestestsFactoryImpl extends EFactoryImpl implements Properti
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -125,20 +118,16 @@ public class PropertiestestsFactoryImpl extends EFactoryImpl implements Properti
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public TestEnum createTestEnumFromString(EDataType eDataType, String initialValue) {
         TestEnum result = TestEnum.get(initialValue);
-        if (result == null) {
-            throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-        }
+        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
         return result;
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     public String convertTestEnumToString(EDataType eDataType, Object instanceValue) {
@@ -147,17 +136,15 @@ public class PropertiestestsFactoryImpl extends EFactoryImpl implements Properti
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public PropertiestestsPackage getPropertiestestsPackage() {
-        return (PropertiestestsPackage) getEPackage();
+        return (PropertiestestsPackage)getEPackage();
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @deprecated
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/PropertiestestsPackageImpl.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/PropertiestestsPackageImpl.java
index 6a31c1ee37..f24489c8b2 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/PropertiestestsPackageImpl.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/PropertiestestsPackageImpl.java
@@ -22,27 +22,23 @@ import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
- *
  * @generated
  */
 public class PropertiestestsPackageImpl extends EPackageImpl implements PropertiestestsPackage {
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private EClass testRootEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private EClass testElementEClass = null;
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private EEnum testEnumEEnum = null;
@@ -63,42 +59,34 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
      * @generated
      */
     private PropertiestestsPackageImpl() {
-        super(PropertiestestsPackage.eNS_URI, PropertiestestsFactory.eINSTANCE);
+        super(eNS_URI, PropertiestestsFactory.eINSTANCE);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private static boolean isInited = false;
 
     /**
-     * Creates, registers, and initializes the <b>Package</b> for this model,
-     * and for any others upon which it depends.
-     *
-     * <p>
-     * This method is used to initialize
-     * {@link PropertiestestsPackage#eINSTANCE} when that field is accessed.
-     * Clients should not invoke it directly. Instead, they should simply access
-     * that field to obtain the package. <!-- begin-user-doc --> <!--
+     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+     * 
+     * <p>This method is used to initialize {@link PropertiestestsPackage#eINSTANCE} when that field is accessed.
+     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @see #eNS_URI
      * @see #createPackageContents()
      * @see #initializePackageContents()
      * @generated
      */
     public static PropertiestestsPackage init() {
-        if (PropertiestestsPackageImpl.isInited) {
-            return (PropertiestestsPackage) EPackage.Registry.INSTANCE.getEPackage(PropertiestestsPackage.eNS_URI);
-        }
+        if (isInited) return (PropertiestestsPackage)EPackage.Registry.INSTANCE.getEPackage(PropertiestestsPackage.eNS_URI);
 
         // Obtain or create and register package
-        PropertiestestsPackageImpl thePropertiestestsPackage = (PropertiestestsPackageImpl) (EPackage.Registry.INSTANCE.get(PropertiestestsPackage.eNS_URI) instanceof PropertiestestsPackageImpl
-                ? EPackage.Registry.INSTANCE.get(PropertiestestsPackage.eNS_URI) : new PropertiestestsPackageImpl());
+        PropertiestestsPackageImpl thePropertiestestsPackage = (PropertiestestsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PropertiestestsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PropertiestestsPackageImpl());
 
-        PropertiestestsPackageImpl.isInited = true;
+        isInited = true;
 
         // Create package meta-data objects
         thePropertiestestsPackage.createPackageContents();
@@ -109,6 +97,7 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
         // Mark meta-data to indicate it can't be changed
         thePropertiestestsPackage.freeze();
 
+  
         // Update the registry and return the package
         EPackage.Registry.INSTANCE.put(PropertiestestsPackage.eNS_URI, thePropertiestestsPackage);
         return thePropertiestestsPackage;
@@ -116,7 +105,6 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -126,17 +114,15 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EReference getTestRoot_Elements() {
-        return (EReference) testRootEClass.getEStructuralFeatures().get(0);
+        return (EReference)testRootEClass.getEStructuralFeatures().get(0);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -146,127 +132,384 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EAttribute getTestElement_StringAttribute() {
-        return (EAttribute) testElementEClass.getEStructuralFeatures().get(0);
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(0);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EAttribute getTestElement_StringAttributes() {
-        return (EAttribute) testElementEClass.getEStructuralFeatures().get(1);
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_StringAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(2);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_StringAttributeMultiline() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(3);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_StringAttributeMultilineMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(4);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EAttribute getTestElement_IntAttribute() {
-        return (EAttribute) testElementEClass.getEStructuralFeatures().get(2);
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(5);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EAttribute getTestElement_IntAttributes() {
-        return (EAttribute) testElementEClass.getEStructuralFeatures().get(3);
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(6);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_IntAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(7);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EAttribute getTestElement_BooleanAttribute() {
-        return (EAttribute) testElementEClass.getEStructuralFeatures().get(4);
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(8);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EAttribute getTestElement_BooleanAttributes() {
-        return (EAttribute) testElementEClass.getEStructuralFeatures().get(5);
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(9);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_BooleanAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(10);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EAttribute getTestElement_EnumAttribute() {
-        return (EAttribute) testElementEClass.getEStructuralFeatures().get(6);
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(11);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EAttribute getTestElement_EnumAttributes() {
-        return (EAttribute) testElementEClass.getEStructuralFeatures().get(7);
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(12);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_EnumAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(13);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EReference getTestElement_ContainmentReference() {
-        return (EReference) testElementEClass.getEStructuralFeatures().get(8);
+        return (EReference)testElementEClass.getEStructuralFeatures().get(14);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EReference getTestElement_ContainmentReferences() {
-        return (EReference) testElementEClass.getEStructuralFeatures().get(9);
+        return (EReference)testElementEClass.getEStructuralFeatures().get(15);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getTestElement_ContainmentReferenceMandatory() {
+        return (EReference)testElementEClass.getEStructuralFeatures().get(16);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EReference getTestElement_Reference() {
-        return (EReference) testElementEClass.getEStructuralFeatures().get(10);
+        return (EReference)testElementEClass.getEStructuralFeatures().get(17);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public EReference getTestElement_References() {
-        return (EReference) testElementEClass.getEStructuralFeatures().get(11);
+        return (EReference)testElementEClass.getEStructuralFeatures().get(18);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EReference getTestElement_ReferenceMandatory() {
+        return (EReference)testElementEClass.getEStructuralFeatures().get(19);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_CharAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(20);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_CharAttributes() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(21);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_CharAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(22);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_DateAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(23);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_DateAttributes() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(24);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_DateAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(25);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_DoubleAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(26);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_DoubleAttributes() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(27);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_DoubleAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(28);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_FloatAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(29);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_FloatAttributes() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(30);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_FloatAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(31);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_LongAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(32);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_LongAttributes() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(33);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_LongAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(34);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_ShortAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(35);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_ShortAttributes() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(36);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_ShortAttributeMandatory() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(37);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_DerivedAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(38);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_TransientAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(39);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_NonChangeableAttribute() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(40);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EAttribute getTestElement_OptionalFeature() {
+        return (EAttribute)testElementEClass.getEStructuralFeatures().get(41);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -276,59 +519,84 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public PropertiestestsFactory getPropertiestestsFactory() {
-        return (PropertiestestsFactory) getEFactoryInstance();
+        return (PropertiestestsFactory)getEFactoryInstance();
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private boolean isCreated = false;
 
     /**
-     * Creates the meta-model objects for the package. This method is guarded to
-     * have no affect on any invocation but its first. <!-- begin-user-doc -->
+     * Creates the meta-model objects for the package.  This method is
+     * guarded to have no affect on any invocation but its first.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @generated
      */
     public void createPackageContents() {
-        if (isCreated) {
-            return;
-        }
+        if (isCreated) return;
         isCreated = true;
 
         // Create classes and their features
-        testRootEClass = createEClass(PropertiestestsPackage.TEST_ROOT);
-        createEReference(testRootEClass, PropertiestestsPackage.TEST_ROOT__ELEMENTS);
-
-        testElementEClass = createEClass(PropertiestestsPackage.TEST_ELEMENT);
-        createEAttribute(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE);
-        createEAttribute(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES);
-        createEAttribute(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE);
-        createEAttribute(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES);
-        createEAttribute(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE);
-        createEAttribute(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES);
-        createEAttribute(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE);
-        createEAttribute(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES);
-        createEReference(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE);
-        createEReference(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES);
-        createEReference(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__REFERENCE);
-        createEReference(testElementEClass, PropertiestestsPackage.TEST_ELEMENT__REFERENCES);
+        testRootEClass = createEClass(TEST_ROOT);
+        createEReference(testRootEClass, TEST_ROOT__ELEMENTS);
+
+        testElementEClass = createEClass(TEST_ELEMENT);
+        createEAttribute(testElementEClass, TEST_ELEMENT__STRING_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__STRING_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__INT_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__INT_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__BOOLEAN_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__BOOLEAN_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__ENUM_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__ENUM_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY);
+        createEReference(testElementEClass, TEST_ELEMENT__CONTAINMENT_REFERENCE);
+        createEReference(testElementEClass, TEST_ELEMENT__CONTAINMENT_REFERENCES);
+        createEReference(testElementEClass, TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY);
+        createEReference(testElementEClass, TEST_ELEMENT__REFERENCE);
+        createEReference(testElementEClass, TEST_ELEMENT__REFERENCES);
+        createEReference(testElementEClass, TEST_ELEMENT__REFERENCE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__CHAR_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__CHAR_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__DATE_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__DATE_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__DOUBLE_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__DOUBLE_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__FLOAT_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__FLOAT_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__LONG_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__LONG_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__SHORT_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__SHORT_ATTRIBUTES);
+        createEAttribute(testElementEClass, TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY);
+        createEAttribute(testElementEClass, TEST_ELEMENT__DERIVED_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__TRANSIENT_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__NON_CHANGEABLE_ATTRIBUTE);
+        createEAttribute(testElementEClass, TEST_ELEMENT__OPTIONAL_FEATURE);
 
         // Create enums
-        testEnumEEnum = createEEnum(PropertiestestsPackage.TEST_ENUM);
+        testEnumEEnum = createEEnum(TEST_ENUM);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     private boolean isInitialized = false;
@@ -341,15 +609,13 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
      * @generated
      */
     public void initializePackageContents() {
-        if (isInitialized) {
-            return;
-        }
+        if (isInitialized) return;
         isInitialized = true;
 
         // Initialize package
-        setName(PropertiestestsPackage.eNAME);
-        setNsPrefix(PropertiestestsPackage.eNS_PREFIX);
-        setNsURI(PropertiestestsPackage.eNS_URI);
+        setName(eNAME);
+        setNsPrefix(eNS_PREFIX);
+        setNsURI(eNS_URI);
 
         // Create type parameters
 
@@ -358,39 +624,52 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
         // Add supertypes to classes
 
         // Initialize classes, features, and operations; add parameters
-        initEClass(testRootEClass, TestRoot.class, "TestRoot", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getTestRoot_Elements(), this.getTestElement(), null, "elements", null, 0, -1, TestRoot.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE,
-                EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-
-        initEClass(testElementEClass, TestElement.class, "TestElement", !EPackageImpl.IS_ABSTRACT, !EPackageImpl.IS_INTERFACE, EPackageImpl.IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTestElement_StringAttribute(), ecorePackage.getEString(), "stringAttribute", null, 0, 1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTestElement_StringAttributes(), ecorePackage.getEString(), "stringAttributes", null, 0, -1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTestElement_IntAttribute(), ecorePackage.getEInt(), "intAttribute", null, 0, 1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTestElement_IntAttributes(), ecorePackage.getEInt(), "intAttributes", null, 0, -1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTestElement_BooleanAttribute(), ecorePackage.getEBoolean(), "booleanAttribute", null, 0, 1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTestElement_BooleanAttributes(), ecorePackage.getEBoolean(), "booleanAttributes", null, 0, -1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTestElement_EnumAttribute(), this.getTestEnum(), "enumAttribute", null, 0, 1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEAttribute(getTestElement_EnumAttributes(), this.getTestEnum(), "enumAttributes", null, 0, -1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_UNSETTABLE, !EPackageImpl.IS_ID, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTestElement_ContainmentReference(), this.getTestElement(), null, "containmentReference", null, 0, 1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTestElement_ContainmentReferences(), this.getTestElement(), null, "containmentReferences", null, 0, -1, TestElement.class, !EPackageImpl.IS_TRANSIENT,
-                !EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, EPackageImpl.IS_COMPOSITE, !EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE,
-                !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED);
-        initEReference(getTestElement_Reference(), this.getTestElement(), null, "reference", null, 0, 1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
-        initEReference(getTestElement_References(), this.getTestElement(), null, "references", null, 0, -1, TestElement.class, !EPackageImpl.IS_TRANSIENT, !EPackageImpl.IS_VOLATILE,
-                EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, !EPackageImpl.IS_DERIVED,
-                EPackageImpl.IS_ORDERED);
+        initEClass(testRootEClass, TestRoot.class, "TestRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getTestRoot_Elements(), this.getTestElement(), null, "elements", null, 0, -1, TestRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+        initEClass(testElementEClass, TestElement.class, "TestElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getTestElement_StringAttribute(), ecorePackage.getEString(), "stringAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_StringAttributes(), ecorePackage.getEString(), "stringAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_StringAttributeMandatory(), ecorePackage.getEString(), "stringAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_StringAttributeMultiline(), ecorePackage.getEString(), "stringAttributeMultiline", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_StringAttributeMultilineMandatory(), ecorePackage.getEString(), "stringAttributeMultilineMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_IntAttribute(), ecorePackage.getEInt(), "intAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_IntAttributes(), ecorePackage.getEInt(), "intAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_IntAttributeMandatory(), ecorePackage.getEInt(), "intAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_BooleanAttribute(), ecorePackage.getEBoolean(), "booleanAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_BooleanAttributes(), ecorePackage.getEBoolean(), "booleanAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_BooleanAttributeMandatory(), ecorePackage.getEBoolean(), "booleanAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_EnumAttribute(), this.getTestEnum(), "enumAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_EnumAttributes(), this.getTestEnum(), "enumAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_EnumAttributeMandatory(), this.getTestEnum(), "enumAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getTestElement_ContainmentReference(), this.getTestElement(), null, "containmentReference", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getTestElement_ContainmentReferences(), this.getTestElement(), null, "containmentReferences", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getTestElement_ContainmentReferenceMandatory(), this.getTestElement(), null, "containmentReferenceMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getTestElement_Reference(), this.getTestElement(), null, "reference", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getTestElement_References(), this.getTestElement(), null, "references", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getTestElement_ReferenceMandatory(), this.getTestElement(), null, "referenceMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_CharAttribute(), ecorePackage.getEChar(), "charAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_CharAttributes(), ecorePackage.getEChar(), "charAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_CharAttributeMandatory(), ecorePackage.getEChar(), "charAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_DateAttribute(), ecorePackage.getEDate(), "dateAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_DateAttributes(), ecorePackage.getEDate(), "dateAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_DateAttributeMandatory(), ecorePackage.getEDate(), "dateAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_DoubleAttribute(), ecorePackage.getEDouble(), "doubleAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_DoubleAttributes(), ecorePackage.getEDouble(), "doubleAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_DoubleAttributeMandatory(), ecorePackage.getEDouble(), "doubleAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_FloatAttribute(), ecorePackage.getEFloat(), "floatAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_FloatAttributes(), ecorePackage.getEFloat(), "floatAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_FloatAttributeMandatory(), ecorePackage.getEFloat(), "floatAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_LongAttribute(), ecorePackage.getELong(), "longAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_LongAttributes(), ecorePackage.getELong(), "longAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_LongAttributeMandatory(), ecorePackage.getELong(), "longAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_ShortAttribute(), ecorePackage.getEShort(), "shortAttribute", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_ShortAttributes(), ecorePackage.getEShort(), "shortAttributes", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_ShortAttributeMandatory(), ecorePackage.getEShort(), "shortAttributeMandatory", null, 1, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_DerivedAttribute(), ecorePackage.getEString(), "derivedAttribute", "", 0, 1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_TransientAttribute(), ecorePackage.getEString(), "transientAttribute", null, 0, 1, TestElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_NonChangeableAttribute(), ecorePackage.getEString(), "nonChangeableAttribute", "NonChangeable", 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getTestElement_OptionalFeature(), ecorePackage.getEString(), "optionalFeature", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         // Initialize enums and add enum literals
         initEEnum(testEnumEEnum, TestEnum.class, "TestEnum");
@@ -399,7 +678,7 @@ public class PropertiestestsPackageImpl extends EPackageImpl implements Properti
         addEEnumLiteral(testEnumEEnum, TestEnum.LITERAL3);
 
         // Create resource
-        createResource(PropertiestestsPackage.eNS_URI);
+        createResource(eNS_URI);
     }
 
 } // PropertiestestsPackageImpl
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/TestElementImpl.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/TestElementImpl.java
index 681ffa0bab..b2c63b6132 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/TestElementImpl.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/TestElementImpl.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2015 Obeo.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.htm
@@ -8,6 +8,7 @@
 package org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl;
 
 import java.util.Collection;
+import java.util.Date;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -25,58 +26,64 @@ import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement;
 import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestEnum;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Test Element</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Element</b></em>'.
+ * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getStringAttribute
- * <em>String Attribute</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getStringAttributes
- * <em>String Attributes</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getIntAttribute
- * <em>Int Attribute</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getIntAttributes
- * <em>Int Attributes</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#isBooleanAttribute
- * <em>Boolean Attribute</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getBooleanAttributes
- * <em>Boolean Attributes</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getEnumAttribute
- * <em>Enum Attribute</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getEnumAttributes
- * <em>Enum Attributes</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getContainmentReference
- * <em>Containment Reference</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getContainmentReferences
- * <em>Containment References</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getReference
- * <em>Reference</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getReferences
- * <em>References</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getStringAttribute <em>String Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getStringAttributes <em>String Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getStringAttributeMandatory <em>String Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getStringAttributeMultiline <em>String Attribute Multiline</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getStringAttributeMultilineMandatory <em>String Attribute Multiline Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getIntAttribute <em>Int Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getIntAttributes <em>Int Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getIntAttributeMandatory <em>Int Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#isBooleanAttribute <em>Boolean Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getBooleanAttributes <em>Boolean Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#isBooleanAttributeMandatory <em>Boolean Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getEnumAttribute <em>Enum Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getEnumAttributes <em>Enum Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getEnumAttributeMandatory <em>Enum Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getContainmentReference <em>Containment Reference</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getContainmentReferences <em>Containment References</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getContainmentReferenceMandatory <em>Containment Reference Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getReference <em>Reference</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getReferences <em>References</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getReferenceMandatory <em>Reference Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getCharAttribute <em>Char Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getCharAttributes <em>Char Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getCharAttributeMandatory <em>Char Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getDateAttribute <em>Date Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getDateAttributes <em>Date Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getDateAttributeMandatory <em>Date Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getDoubleAttribute <em>Double Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getDoubleAttributes <em>Double Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getDoubleAttributeMandatory <em>Double Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getFloatAttribute <em>Float Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getFloatAttributes <em>Float Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getFloatAttributeMandatory <em>Float Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getLongAttribute <em>Long Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getLongAttributes <em>Long Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getLongAttributeMandatory <em>Long Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getShortAttribute <em>Short Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getShortAttributes <em>Short Attributes</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getShortAttributeMandatory <em>Short Attribute Mandatory</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getDerivedAttribute <em>Derived Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getTransientAttribute <em>Transient Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getNonChangeableAttribute <em>Non Changeable Attribute</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestElementImpl#getOptionalFeature <em>Optional Feature</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class TestElementImpl extends MinimalEObjectImpl.Container implements TestElement {
     /**
-     * The default value of the '{@link #getStringAttribute()
-     * <em>String Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The default value of the '{@link #getStringAttribute() <em>String Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getStringAttribute()
      * @generated
      * @ordered
@@ -84,21 +91,19 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected static final String STRING_ATTRIBUTE_EDEFAULT = null;
 
     /**
-     * The cached value of the '{@link #getStringAttribute()
-     * <em>String Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The cached value of the '{@link #getStringAttribute() <em>String Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getStringAttribute()
      * @generated
      * @ordered
      */
-    protected String stringAttribute = TestElementImpl.STRING_ATTRIBUTE_EDEFAULT;
+    protected String stringAttribute = STRING_ATTRIBUTE_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getStringAttributes()
-     * <em>String Attributes</em>}' attribute list. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The cached value of the '{@link #getStringAttributes() <em>String Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getStringAttributes()
      * @generated
      * @ordered
@@ -106,10 +111,69 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected EList<String> stringAttributes;
 
     /**
-     * The default value of the '{@link #getIntAttribute()
-     * <em>Int Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The default value of the '{@link #getStringAttributeMandatory() <em>String Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getStringAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final String STRING_ATTRIBUTE_MANDATORY_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getStringAttributeMandatory() <em>String Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getStringAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected String stringAttributeMandatory = STRING_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getStringAttributeMultiline() <em>String Attribute Multiline</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getStringAttributeMultiline()
+     * @generated
+     * @ordered
+     */
+    protected static final String STRING_ATTRIBUTE_MULTILINE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getStringAttributeMultiline() <em>String Attribute Multiline</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getStringAttributeMultiline()
+     * @generated
+     * @ordered
+     */
+    protected String stringAttributeMultiline = STRING_ATTRIBUTE_MULTILINE_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getStringAttributeMultilineMandatory() <em>String Attribute Multiline Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getStringAttributeMultilineMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final String STRING_ATTRIBUTE_MULTILINE_MANDATORY_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getStringAttributeMultilineMandatory() <em>String Attribute Multiline Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getStringAttributeMultilineMandatory()
+     * @generated
+     * @ordered
+     */
+    protected String stringAttributeMultilineMandatory = STRING_ATTRIBUTE_MULTILINE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getIntAttribute() <em>Int Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIntAttribute()
      * @generated
      * @ordered
@@ -117,20 +181,19 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected static final int INT_ATTRIBUTE_EDEFAULT = 0;
 
     /**
-     * The cached value of the '{@link #getIntAttribute() <em>Int Attribute</em>
-     * }' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The cached value of the '{@link #getIntAttribute() <em>Int Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIntAttribute()
      * @generated
      * @ordered
      */
-    protected int intAttribute = TestElementImpl.INT_ATTRIBUTE_EDEFAULT;
+    protected int intAttribute = INT_ATTRIBUTE_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getIntAttributes()
-     * <em>Int Attributes</em>}' attribute list. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The cached value of the '{@link #getIntAttributes() <em>Int Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getIntAttributes()
      * @generated
      * @ordered
@@ -138,10 +201,29 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected EList<Integer> intAttributes;
 
     /**
-     * The default value of the '{@link #isBooleanAttribute()
-     * <em>Boolean Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The default value of the '{@link #getIntAttributeMandatory() <em>Int Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getIntAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final int INT_ATTRIBUTE_MANDATORY_EDEFAULT = 0;
+
+    /**
+     * The cached value of the '{@link #getIntAttributeMandatory() <em>Int Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getIntAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected int intAttributeMandatory = INT_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #isBooleanAttribute() <em>Boolean Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #isBooleanAttribute()
      * @generated
      * @ordered
@@ -149,21 +231,19 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected static final boolean BOOLEAN_ATTRIBUTE_EDEFAULT = false;
 
     /**
-     * The cached value of the '{@link #isBooleanAttribute()
-     * <em>Boolean Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The cached value of the '{@link #isBooleanAttribute() <em>Boolean Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #isBooleanAttribute()
      * @generated
      * @ordered
      */
-    protected boolean booleanAttribute = TestElementImpl.BOOLEAN_ATTRIBUTE_EDEFAULT;
+    protected boolean booleanAttribute = BOOLEAN_ATTRIBUTE_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getBooleanAttributes()
-     * <em>Boolean Attributes</em>}' attribute list. <!-- begin-user-doc -->
+     * The cached value of the '{@link #getBooleanAttributes() <em>Boolean Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
      * @see #getBooleanAttributes()
      * @generated
      * @ordered
@@ -171,10 +251,29 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected EList<Boolean> booleanAttributes;
 
     /**
-     * The default value of the '{@link #getEnumAttribute()
-     * <em>Enum Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The default value of the '{@link #isBooleanAttributeMandatory() <em>Boolean Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isBooleanAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final boolean BOOLEAN_ATTRIBUTE_MANDATORY_EDEFAULT = false;
+
+    /**
+     * The cached value of the '{@link #isBooleanAttributeMandatory() <em>Boolean Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #isBooleanAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected boolean booleanAttributeMandatory = BOOLEAN_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getEnumAttribute() <em>Enum Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getEnumAttribute()
      * @generated
      * @ordered
@@ -182,21 +281,19 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected static final TestEnum ENUM_ATTRIBUTE_EDEFAULT = TestEnum.LITERAL1;
 
     /**
-     * The cached value of the '{@link #getEnumAttribute()
-     * <em>Enum Attribute</em>}' attribute. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The cached value of the '{@link #getEnumAttribute() <em>Enum Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getEnumAttribute()
      * @generated
      * @ordered
      */
-    protected TestEnum enumAttribute = TestElementImpl.ENUM_ATTRIBUTE_EDEFAULT;
+    protected TestEnum enumAttribute = ENUM_ATTRIBUTE_EDEFAULT;
 
     /**
-     * The cached value of the '{@link #getEnumAttributes()
-     * <em>Enum Attributes</em>}' attribute list. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     *
+     * The cached value of the '{@link #getEnumAttributes() <em>Enum Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getEnumAttributes()
      * @generated
      * @ordered
@@ -204,10 +301,29 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected EList<TestEnum> enumAttributes;
 
     /**
-     * The cached value of the '{@link #getContainmentReference()
-     * <em>Containment Reference</em>}' containment reference. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The default value of the '{@link #getEnumAttributeMandatory() <em>Enum Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getEnumAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final TestEnum ENUM_ATTRIBUTE_MANDATORY_EDEFAULT = TestEnum.LITERAL1;
+
+    /**
+     * The cached value of the '{@link #getEnumAttributeMandatory() <em>Enum Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getEnumAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected TestEnum enumAttributeMandatory = ENUM_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getContainmentReference() <em>Containment Reference</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getContainmentReference()
      * @generated
      * @ordered
@@ -215,10 +331,9 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected TestElement containmentReference;
 
     /**
-     * The cached value of the '{@link #getContainmentReferences()
-     * <em>Containment References</em>}' containment reference list. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The cached value of the '{@link #getContainmentReferences() <em>Containment References</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getContainmentReferences()
      * @generated
      * @ordered
@@ -226,9 +341,19 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected EList<TestElement> containmentReferences;
 
     /**
-     * The cached value of the '{@link #getReference() <em>Reference</em>}'
-     * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The cached value of the '{@link #getContainmentReferenceMandatory() <em>Containment Reference Mandatory</em>}' containment reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getContainmentReferenceMandatory()
+     * @generated
+     * @ordered
+     */
+    protected TestElement containmentReferenceMandatory;
+
+    /**
+     * The cached value of the '{@link #getReference() <em>Reference</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getReference()
      * @generated
      * @ordered
@@ -236,9 +361,9 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected TestElement reference;
 
     /**
-     * The cached value of the '{@link #getReferences() <em>References</em>}'
-     * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The cached value of the '{@link #getReferences() <em>References</em>}' reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @see #getReferences()
      * @generated
      * @ordered
@@ -246,8 +371,388 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     protected EList<TestElement> references;
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The cached value of the '{@link #getReferenceMandatory() <em>Reference Mandatory</em>}' reference.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getReferenceMandatory()
+     * @generated
+     * @ordered
+     */
+    protected TestElement referenceMandatory;
+
+    /**
+     * The default value of the '{@link #getCharAttribute() <em>Char Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getCharAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final char CHAR_ATTRIBUTE_EDEFAULT = '\u0000';
+
+    /**
+     * The cached value of the '{@link #getCharAttribute() <em>Char Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getCharAttribute()
+     * @generated
+     * @ordered
+     */
+    protected char charAttribute = CHAR_ATTRIBUTE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getCharAttributes() <em>Char Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getCharAttributes()
+     * @generated
+     * @ordered
+     */
+    protected EList<Character> charAttributes;
+
+    /**
+     * The default value of the '{@link #getCharAttributeMandatory() <em>Char Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getCharAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final char CHAR_ATTRIBUTE_MANDATORY_EDEFAULT = '\u0000';
+
+    /**
+     * The cached value of the '{@link #getCharAttributeMandatory() <em>Char Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getCharAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected char charAttributeMandatory = CHAR_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getDateAttribute() <em>Date Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDateAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final Date DATE_ATTRIBUTE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getDateAttribute() <em>Date Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDateAttribute()
+     * @generated
+     * @ordered
+     */
+    protected Date dateAttribute = DATE_ATTRIBUTE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getDateAttributes() <em>Date Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDateAttributes()
+     * @generated
+     * @ordered
+     */
+    protected EList<Date> dateAttributes;
+
+    /**
+     * The default value of the '{@link #getDateAttributeMandatory() <em>Date Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDateAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final Date DATE_ATTRIBUTE_MANDATORY_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getDateAttributeMandatory() <em>Date Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDateAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected Date dateAttributeMandatory = DATE_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getDoubleAttribute() <em>Double Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDoubleAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final double DOUBLE_ATTRIBUTE_EDEFAULT = 0.0;
+
+    /**
+     * The cached value of the '{@link #getDoubleAttribute() <em>Double Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDoubleAttribute()
+     * @generated
+     * @ordered
+     */
+    protected double doubleAttribute = DOUBLE_ATTRIBUTE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getDoubleAttributes() <em>Double Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDoubleAttributes()
+     * @generated
+     * @ordered
+     */
+    protected EList<Double> doubleAttributes;
+
+    /**
+     * The default value of the '{@link #getDoubleAttributeMandatory() <em>Double Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDoubleAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final double DOUBLE_ATTRIBUTE_MANDATORY_EDEFAULT = 0.0;
+
+    /**
+     * The cached value of the '{@link #getDoubleAttributeMandatory() <em>Double Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDoubleAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected double doubleAttributeMandatory = DOUBLE_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getFloatAttribute() <em>Float Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getFloatAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final float FLOAT_ATTRIBUTE_EDEFAULT = 0.0F;
+
+    /**
+     * The cached value of the '{@link #getFloatAttribute() <em>Float Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getFloatAttribute()
+     * @generated
+     * @ordered
+     */
+    protected float floatAttribute = FLOAT_ATTRIBUTE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getFloatAttributes() <em>Float Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getFloatAttributes()
+     * @generated
+     * @ordered
+     */
+    protected EList<Float> floatAttributes;
+
+    /**
+     * The default value of the '{@link #getFloatAttributeMandatory() <em>Float Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getFloatAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final float FLOAT_ATTRIBUTE_MANDATORY_EDEFAULT = 0.0F;
+
+    /**
+     * The cached value of the '{@link #getFloatAttributeMandatory() <em>Float Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getFloatAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected float floatAttributeMandatory = FLOAT_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getLongAttribute() <em>Long Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getLongAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final long LONG_ATTRIBUTE_EDEFAULT = 0L;
+
+    /**
+     * The cached value of the '{@link #getLongAttribute() <em>Long Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getLongAttribute()
+     * @generated
+     * @ordered
+     */
+    protected long longAttribute = LONG_ATTRIBUTE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getLongAttributes() <em>Long Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getLongAttributes()
+     * @generated
+     * @ordered
+     */
+    protected EList<Long> longAttributes;
+
+    /**
+     * The default value of the '{@link #getLongAttributeMandatory() <em>Long Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getLongAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final long LONG_ATTRIBUTE_MANDATORY_EDEFAULT = 0L;
+
+    /**
+     * The cached value of the '{@link #getLongAttributeMandatory() <em>Long Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getLongAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected long longAttributeMandatory = LONG_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getShortAttribute() <em>Short Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getShortAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final short SHORT_ATTRIBUTE_EDEFAULT = 0;
+
+    /**
+     * The cached value of the '{@link #getShortAttribute() <em>Short Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getShortAttribute()
+     * @generated
+     * @ordered
+     */
+    protected short shortAttribute = SHORT_ATTRIBUTE_EDEFAULT;
+
+    /**
+     * The cached value of the '{@link #getShortAttributes() <em>Short Attributes</em>}' attribute list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getShortAttributes()
+     * @generated
+     * @ordered
+     */
+    protected EList<Short> shortAttributes;
+
+    /**
+     * The default value of the '{@link #getShortAttributeMandatory() <em>Short Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getShortAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected static final short SHORT_ATTRIBUTE_MANDATORY_EDEFAULT = 0;
+
+    /**
+     * The cached value of the '{@link #getShortAttributeMandatory() <em>Short Attribute Mandatory</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getShortAttributeMandatory()
+     * @generated
+     * @ordered
+     */
+    protected short shortAttributeMandatory = SHORT_ATTRIBUTE_MANDATORY_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getDerivedAttribute() <em>Derived Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getDerivedAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final String DERIVED_ATTRIBUTE_EDEFAULT = "";
+
+    /**
+     * The default value of the '{@link #getTransientAttribute() <em>Transient Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getTransientAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final String TRANSIENT_ATTRIBUTE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getTransientAttribute() <em>Transient Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getTransientAttribute()
+     * @generated
+     * @ordered
+     */
+    protected String transientAttribute = TRANSIENT_ATTRIBUTE_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getNonChangeableAttribute() <em>Non Changeable Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getNonChangeableAttribute()
+     * @generated
+     * @ordered
+     */
+    protected static final String NON_CHANGEABLE_ATTRIBUTE_EDEFAULT = "NonChangeable";
+
+    /**
+     * The cached value of the '{@link #getNonChangeableAttribute() <em>Non Changeable Attribute</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getNonChangeableAttribute()
+     * @generated
+     * @ordered
+     */
+    protected String nonChangeableAttribute = NON_CHANGEABLE_ATTRIBUTE_EDEFAULT;
+
+    /**
+     * The default value of the '{@link #getOptionalFeature() <em>Optional Feature</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getOptionalFeature()
+     * @generated
+     * @ordered
+     */
+    protected static final String OPTIONAL_FEATURE_EDEFAULT = null;
+
+    /**
+     * The cached value of the '{@link #getOptionalFeature() <em>Optional Feature</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getOptionalFeature()
+     * @generated
+     * @ordered
+     */
+    protected String optionalFeature = OPTIONAL_FEATURE_EDEFAULT;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     protected TestElementImpl() {
@@ -255,8 +760,8 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
@@ -265,35 +770,31 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public String getStringAttribute() {
         return stringAttribute;
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public void setStringAttribute(String newStringAttribute) {
         String oldStringAttribute = stringAttribute;
         stringAttribute = newStringAttribute;
-        if (eNotificationRequired()) {
+        if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE, oldStringAttribute, stringAttribute));
-        }
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public EList<String> getStringAttributes() {
         if (stringAttributes == null) {
             stringAttributes = new EDataTypeUniqueEList<String>(String.class, this, PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES);
@@ -302,35 +803,94 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getStringAttributeMandatory() {
+        return stringAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setStringAttributeMandatory(String newStringAttributeMandatory) {
+        String oldStringAttributeMandatory = stringAttributeMandatory;
+        stringAttributeMandatory = newStringAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY, oldStringAttributeMandatory, stringAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getStringAttributeMultiline() {
+        return stringAttributeMultiline;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setStringAttributeMultiline(String newStringAttributeMultiline) {
+        String oldStringAttributeMultiline = stringAttributeMultiline;
+        stringAttributeMultiline = newStringAttributeMultiline;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE, oldStringAttributeMultiline, stringAttributeMultiline));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getStringAttributeMultilineMandatory() {
+        return stringAttributeMultilineMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setStringAttributeMultilineMandatory(String newStringAttributeMultilineMandatory) {
+        String oldStringAttributeMultilineMandatory = stringAttributeMultilineMandatory;
+        stringAttributeMultilineMandatory = newStringAttributeMultilineMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY, oldStringAttributeMultilineMandatory, stringAttributeMultilineMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public int getIntAttribute() {
         return intAttribute;
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public void setIntAttribute(int newIntAttribute) {
         int oldIntAttribute = intAttribute;
         intAttribute = newIntAttribute;
-        if (eNotificationRequired()) {
+        if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE, oldIntAttribute, intAttribute));
-        }
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public EList<Integer> getIntAttributes() {
         if (intAttributes == null) {
             intAttributes = new EDataTypeUniqueEList<Integer>(Integer.class, this, PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES);
@@ -339,35 +899,52 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int getIntAttributeMandatory() {
+        return intAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setIntAttributeMandatory(int newIntAttributeMandatory) {
+        int oldIntAttributeMandatory = intAttributeMandatory;
+        intAttributeMandatory = newIntAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY, oldIntAttributeMandatory, intAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public boolean isBooleanAttribute() {
         return booleanAttribute;
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public void setBooleanAttribute(boolean newBooleanAttribute) {
         boolean oldBooleanAttribute = booleanAttribute;
         booleanAttribute = newBooleanAttribute;
-        if (eNotificationRequired()) {
+        if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE, oldBooleanAttribute, booleanAttribute));
-        }
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public EList<Boolean> getBooleanAttributes() {
         if (booleanAttributes == null) {
             booleanAttributes = new EDataTypeUniqueEList<Boolean>(Boolean.class, this, PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES);
@@ -376,35 +953,52 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean isBooleanAttributeMandatory() {
+        return booleanAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setBooleanAttributeMandatory(boolean newBooleanAttributeMandatory) {
+        boolean oldBooleanAttributeMandatory = booleanAttributeMandatory;
+        booleanAttributeMandatory = newBooleanAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY, oldBooleanAttributeMandatory, booleanAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public TestEnum getEnumAttribute() {
         return enumAttribute;
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public void setEnumAttribute(TestEnum newEnumAttribute) {
         TestEnum oldEnumAttribute = enumAttribute;
-        enumAttribute = newEnumAttribute == null ? TestElementImpl.ENUM_ATTRIBUTE_EDEFAULT : newEnumAttribute;
-        if (eNotificationRequired()) {
+        enumAttribute = newEnumAttribute == null ? ENUM_ATTRIBUTE_EDEFAULT : newEnumAttribute;
+        if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE, oldEnumAttribute, enumAttribute));
-        }
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public EList<TestEnum> getEnumAttributes() {
         if (enumAttributes == null) {
             enumAttributes = new EDataTypeUniqueEList<TestEnum>(TestEnum.class, this, PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES);
@@ -413,65 +1007,74 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public TestEnum getEnumAttributeMandatory() {
+        return enumAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setEnumAttributeMandatory(TestEnum newEnumAttributeMandatory) {
+        TestEnum oldEnumAttributeMandatory = enumAttributeMandatory;
+        enumAttributeMandatory = newEnumAttributeMandatory == null ? ENUM_ATTRIBUTE_MANDATORY_EDEFAULT : newEnumAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY, oldEnumAttributeMandatory, enumAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public TestElement getContainmentReference() {
         return containmentReference;
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public NotificationChain basicSetContainmentReference(TestElement newContainmentReference, NotificationChain msgs) {
         TestElement oldContainmentReference = containmentReference;
         containmentReference = newContainmentReference;
         if (eNotificationRequired()) {
-            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE, oldContainmentReference,
-                    newContainmentReference);
-            if (msgs == null) {
-                msgs = notification;
-            } else {
-                msgs.add(notification);
-            }
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE, oldContainmentReference, newContainmentReference);
+            if (msgs == null) msgs = notification; else msgs.add(notification);
         }
         return msgs;
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public void setContainmentReference(TestElement newContainmentReference) {
         if (newContainmentReference != containmentReference) {
             NotificationChain msgs = null;
-            if (containmentReference != null) {
-                msgs = ((InternalEObject) containmentReference).eInverseRemove(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE, null, msgs);
-            }
-            if (newContainmentReference != null) {
-                msgs = ((InternalEObject) newContainmentReference).eInverseAdd(this, InternalEObject.EOPPOSITE_FEATURE_BASE - PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE, null, msgs);
-            }
+            if (containmentReference != null)
+                msgs = ((InternalEObject)containmentReference).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE, null, msgs);
+            if (newContainmentReference != null)
+                msgs = ((InternalEObject)newContainmentReference).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE, null, msgs);
             msgs = basicSetContainmentReference(newContainmentReference, msgs);
-            if (msgs != null) {
-                msgs.dispatch();
-            }
-        } else if (eNotificationRequired()) {
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE, newContainmentReference, newContainmentReference));
+            if (msgs != null) msgs.dispatch();
         }
+        else if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE, newContainmentReference, newContainmentReference));
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public EList<TestElement> getContainmentReferences() {
         if (containmentReferences == null) {
             containmentReferences = new EObjectContainmentEList<TestElement>(TestElement.class, this, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES);
@@ -480,27 +1083,68 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public TestElement getContainmentReferenceMandatory() {
+        return containmentReferenceMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public NotificationChain basicSetContainmentReferenceMandatory(TestElement newContainmentReferenceMandatory, NotificationChain msgs) {
+        TestElement oldContainmentReferenceMandatory = containmentReferenceMandatory;
+        containmentReferenceMandatory = newContainmentReferenceMandatory;
+        if (eNotificationRequired()) {
+            ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY, oldContainmentReferenceMandatory, newContainmentReferenceMandatory);
+            if (msgs == null) msgs = notification; else msgs.add(notification);
+        }
+        return msgs;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setContainmentReferenceMandatory(TestElement newContainmentReferenceMandatory) {
+        if (newContainmentReferenceMandatory != containmentReferenceMandatory) {
+            NotificationChain msgs = null;
+            if (containmentReferenceMandatory != null)
+                msgs = ((InternalEObject)containmentReferenceMandatory).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY, null, msgs);
+            if (newContainmentReferenceMandatory != null)
+                msgs = ((InternalEObject)newContainmentReferenceMandatory).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY, null, msgs);
+            msgs = basicSetContainmentReferenceMandatory(newContainmentReferenceMandatory, msgs);
+            if (msgs != null) msgs.dispatch();
+        }
+        else if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY, newContainmentReferenceMandatory, newContainmentReferenceMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public TestElement getReference() {
         if (reference != null && reference.eIsProxy()) {
-            InternalEObject oldReference = (InternalEObject) reference;
-            reference = (TestElement) eResolveProxy(oldReference);
+            InternalEObject oldReference = (InternalEObject)reference;
+            reference = (TestElement)eResolveProxy(oldReference);
             if (reference != oldReference) {
-                if (eNotificationRequired()) {
+                if (eNotificationRequired())
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiestestsPackage.TEST_ELEMENT__REFERENCE, oldReference, reference));
-                }
             }
         }
         return reference;
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     public TestElement basicGetReference() {
@@ -508,25 +1152,22 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public void setReference(TestElement newReference) {
         TestElement oldReference = reference;
         reference = newReference;
-        if (eNotificationRequired()) {
+        if (eNotificationRequired())
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__REFERENCE, oldReference, reference));
-        }
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
-    @Override
     public EList<TestElement> getReferences() {
         if (references == null) {
             references = new EObjectResolvingEList<TestElement>(TestElement.class, this, PropertiestestsPackage.TEST_ELEMENT__REFERENCES);
@@ -535,229 +1176,1015 @@ public class TestElementImpl extends MinimalEObjectImpl.Container implements Tes
     }
 
     /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public TestElement getReferenceMandatory() {
+        if (referenceMandatory != null && referenceMandatory.eIsProxy()) {
+            InternalEObject oldReferenceMandatory = (InternalEObject)referenceMandatory;
+            referenceMandatory = (TestElement)eResolveProxy(oldReferenceMandatory);
+            if (referenceMandatory != oldReferenceMandatory) {
+                if (eNotificationRequired())
+                    eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiestestsPackage.TEST_ELEMENT__REFERENCE_MANDATORY, oldReferenceMandatory, referenceMandatory));
+            }
+        }
+        return referenceMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public TestElement basicGetReferenceMandatory() {
+        return referenceMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setReferenceMandatory(TestElement newReferenceMandatory) {
+        TestElement oldReferenceMandatory = referenceMandatory;
+        referenceMandatory = newReferenceMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__REFERENCE_MANDATORY, oldReferenceMandatory, referenceMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public char getCharAttribute() {
+        return charAttribute;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setCharAttribute(char newCharAttribute) {
+        char oldCharAttribute = charAttribute;
+        charAttribute = newCharAttribute;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE, oldCharAttribute, charAttribute));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<Character> getCharAttributes() {
+        if (charAttributes == null) {
+            charAttributes = new EDataTypeUniqueEList<Character>(Character.class, this, PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTES);
+        }
+        return charAttributes;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public char getCharAttributeMandatory() {
+        return charAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setCharAttributeMandatory(char newCharAttributeMandatory) {
+        char oldCharAttributeMandatory = charAttributeMandatory;
+        charAttributeMandatory = newCharAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY, oldCharAttributeMandatory, charAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Date getDateAttribute() {
+        return dateAttribute;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setDateAttribute(Date newDateAttribute) {
+        Date oldDateAttribute = dateAttribute;
+        dateAttribute = newDateAttribute;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE, oldDateAttribute, dateAttribute));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<Date> getDateAttributes() {
+        if (dateAttributes == null) {
+            dateAttributes = new EDataTypeUniqueEList<Date>(Date.class, this, PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTES);
+        }
+        return dateAttributes;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Date getDateAttributeMandatory() {
+        return dateAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setDateAttributeMandatory(Date newDateAttributeMandatory) {
+        Date oldDateAttributeMandatory = dateAttributeMandatory;
+        dateAttributeMandatory = newDateAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY, oldDateAttributeMandatory, dateAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public double getDoubleAttribute() {
+        return doubleAttribute;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setDoubleAttribute(double newDoubleAttribute) {
+        double oldDoubleAttribute = doubleAttribute;
+        doubleAttribute = newDoubleAttribute;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE, oldDoubleAttribute, doubleAttribute));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<Double> getDoubleAttributes() {
+        if (doubleAttributes == null) {
+            doubleAttributes = new EDataTypeUniqueEList<Double>(Double.class, this, PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTES);
+        }
+        return doubleAttributes;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public double getDoubleAttributeMandatory() {
+        return doubleAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setDoubleAttributeMandatory(double newDoubleAttributeMandatory) {
+        double oldDoubleAttributeMandatory = doubleAttributeMandatory;
+        doubleAttributeMandatory = newDoubleAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY, oldDoubleAttributeMandatory, doubleAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public float getFloatAttribute() {
+        return floatAttribute;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setFloatAttribute(float newFloatAttribute) {
+        float oldFloatAttribute = floatAttribute;
+        floatAttribute = newFloatAttribute;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE, oldFloatAttribute, floatAttribute));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<Float> getFloatAttributes() {
+        if (floatAttributes == null) {
+            floatAttributes = new EDataTypeUniqueEList<Float>(Float.class, this, PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTES);
+        }
+        return floatAttributes;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public float getFloatAttributeMandatory() {
+        return floatAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setFloatAttributeMandatory(float newFloatAttributeMandatory) {
+        float oldFloatAttributeMandatory = floatAttributeMandatory;
+        floatAttributeMandatory = newFloatAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY, oldFloatAttributeMandatory, floatAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public long getLongAttribute() {
+        return longAttribute;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setLongAttribute(long newLongAttribute) {
+        long oldLongAttribute = longAttribute;
+        longAttribute = newLongAttribute;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE, oldLongAttribute, longAttribute));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<Long> getLongAttributes() {
+        if (longAttributes == null) {
+            longAttributes = new EDataTypeUniqueEList<Long>(Long.class, this, PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTES);
+        }
+        return longAttributes;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public long getLongAttributeMandatory() {
+        return longAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setLongAttributeMandatory(long newLongAttributeMandatory) {
+        long oldLongAttributeMandatory = longAttributeMandatory;
+        longAttributeMandatory = newLongAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY, oldLongAttributeMandatory, longAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public short getShortAttribute() {
+        return shortAttribute;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setShortAttribute(short newShortAttribute) {
+        short oldShortAttribute = shortAttribute;
+        shortAttribute = newShortAttribute;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE, oldShortAttribute, shortAttribute));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public EList<Short> getShortAttributes() {
+        if (shortAttributes == null) {
+            shortAttributes = new EDataTypeUniqueEList<Short>(Short.class, this, PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTES);
+        }
+        return shortAttributes;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public short getShortAttributeMandatory() {
+        return shortAttributeMandatory;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setShortAttributeMandatory(short newShortAttributeMandatory) {
+        short oldShortAttributeMandatory = shortAttributeMandatory;
+        shortAttributeMandatory = newShortAttributeMandatory;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY, oldShortAttributeMandatory, shortAttributeMandatory));
+    }
+
+    /**
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @generated NOT
+     */
+    public String getDerivedAttribute() {
+        return stringAttribute + " derived value";
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setDerivedAttribute(String newDerivedAttribute) {
+        // TODO: implement this method to set the 'Derived Attribute' attribute
+        // Ensure that you remove @generated or mark it @generated NOT
+        throw new UnsupportedOperationException();
+    }
+
+    /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * 
+     * @generated NOT
+     */
+    public String getTransientAttribute() {
+        return stringAttribute.length() + " transient";
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setTransientAttribute(String newTransientAttribute) {
+        String oldTransientAttribute = transientAttribute;
+        transientAttribute = newTransientAttribute;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__TRANSIENT_ATTRIBUTE, oldTransientAttribute, transientAttribute));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getNonChangeableAttribute() {
+        return nonChangeableAttribute;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getOptionalFeature() {
+        return optionalFeature;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setOptionalFeature(String newOptionalFeature) {
+        String oldOptionalFeature = optionalFeature;
+        optionalFeature = newOptionalFeature;
+        if (eNotificationRequired())
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiestestsPackage.TEST_ELEMENT__OPTIONAL_FEATURE, oldOptionalFeature, optionalFeature));
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
-            return basicSetContainmentReference(null, msgs);
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
-            return ((InternalEList<?>) getContainmentReferences()).basicRemove(otherEnd, msgs);
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
+                return basicSetContainmentReference(null, msgs);
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
+                return ((InternalEList<?>)getContainmentReferences()).basicRemove(otherEnd, msgs);
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY:
+                return basicSetContainmentReferenceMandatory(null, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
-            return getStringAttribute();
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
-            return getStringAttributes();
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
-            return getIntAttribute();
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
-            return getIntAttributes();
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
-            return isBooleanAttribute();
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
-            return getBooleanAttributes();
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
-            return getEnumAttribute();
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
-            return getEnumAttributes();
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
-            return getContainmentReference();
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
-            return getContainmentReferences();
-        case PropertiestestsPackage.TEST_ELEMENT__REFERENCE:
-            if (resolve) {
-                return getReference();
-            }
-            return basicGetReference();
-        case PropertiestestsPackage.TEST_ELEMENT__REFERENCES:
-            return getReferences();
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
+                return getStringAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
+                return getStringAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY:
+                return getStringAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE:
+                return getStringAttributeMultiline();
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY:
+                return getStringAttributeMultilineMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
+                return getIntAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
+                return getIntAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY:
+                return getIntAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
+                return isBooleanAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
+                return getBooleanAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY:
+                return isBooleanAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
+                return getEnumAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
+                return getEnumAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY:
+                return getEnumAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
+                return getContainmentReference();
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
+                return getContainmentReferences();
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY:
+                return getContainmentReferenceMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCE:
+                if (resolve) return getReference();
+                return basicGetReference();
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCES:
+                return getReferences();
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCE_MANDATORY:
+                if (resolve) return getReferenceMandatory();
+                return basicGetReferenceMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE:
+                return getCharAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTES:
+                return getCharAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY:
+                return getCharAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE:
+                return getDateAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTES:
+                return getDateAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY:
+                return getDateAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE:
+                return getDoubleAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTES:
+                return getDoubleAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY:
+                return getDoubleAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE:
+                return getFloatAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTES:
+                return getFloatAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY:
+                return getFloatAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE:
+                return getLongAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTES:
+                return getLongAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY:
+                return getLongAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE:
+                return getShortAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTES:
+                return getShortAttributes();
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY:
+                return getShortAttributeMandatory();
+            case PropertiestestsPackage.TEST_ELEMENT__DERIVED_ATTRIBUTE:
+                return getDerivedAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__TRANSIENT_ATTRIBUTE:
+                return getTransientAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__NON_CHANGEABLE_ATTRIBUTE:
+                return getNonChangeableAttribute();
+            case PropertiestestsPackage.TEST_ELEMENT__OPTIONAL_FEATURE:
+                return getOptionalFeature();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
-            setStringAttribute((String) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
-            getStringAttributes().clear();
-            getStringAttributes().addAll((Collection<? extends String>) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
-            setIntAttribute((Integer) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
-            getIntAttributes().clear();
-            getIntAttributes().addAll((Collection<? extends Integer>) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
-            setBooleanAttribute((Boolean) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
-            getBooleanAttributes().clear();
-            getBooleanAttributes().addAll((Collection<? extends Boolean>) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
-            setEnumAttribute((TestEnum) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
-            getEnumAttributes().clear();
-            getEnumAttributes().addAll((Collection<? extends TestEnum>) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
-            setContainmentReference((TestElement) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
-            getContainmentReferences().clear();
-            getContainmentReferences().addAll((Collection<? extends TestElement>) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__REFERENCE:
-            setReference((TestElement) newValue);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__REFERENCES:
-            getReferences().clear();
-            getReferences().addAll((Collection<? extends TestElement>) newValue);
-            return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
+                setStringAttribute((String)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
+                getStringAttributes().clear();
+                getStringAttributes().addAll((Collection<? extends String>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY:
+                setStringAttributeMandatory((String)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE:
+                setStringAttributeMultiline((String)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY:
+                setStringAttributeMultilineMandatory((String)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
+                setIntAttribute((Integer)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
+                getIntAttributes().clear();
+                getIntAttributes().addAll((Collection<? extends Integer>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY:
+                setIntAttributeMandatory((Integer)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
+                setBooleanAttribute((Boolean)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
+                getBooleanAttributes().clear();
+                getBooleanAttributes().addAll((Collection<? extends Boolean>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY:
+                setBooleanAttributeMandatory((Boolean)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
+                setEnumAttribute((TestEnum)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
+                getEnumAttributes().clear();
+                getEnumAttributes().addAll((Collection<? extends TestEnum>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY:
+                setEnumAttributeMandatory((TestEnum)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
+                setContainmentReference((TestElement)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
+                getContainmentReferences().clear();
+                getContainmentReferences().addAll((Collection<? extends TestElement>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY:
+                setContainmentReferenceMandatory((TestElement)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCE:
+                setReference((TestElement)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCES:
+                getReferences().clear();
+                getReferences().addAll((Collection<? extends TestElement>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCE_MANDATORY:
+                setReferenceMandatory((TestElement)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE:
+                setCharAttribute((Character)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTES:
+                getCharAttributes().clear();
+                getCharAttributes().addAll((Collection<? extends Character>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY:
+                setCharAttributeMandatory((Character)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE:
+                setDateAttribute((Date)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTES:
+                getDateAttributes().clear();
+                getDateAttributes().addAll((Collection<? extends Date>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY:
+                setDateAttributeMandatory((Date)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE:
+                setDoubleAttribute((Double)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTES:
+                getDoubleAttributes().clear();
+                getDoubleAttributes().addAll((Collection<? extends Double>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY:
+                setDoubleAttributeMandatory((Double)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE:
+                setFloatAttribute((Float)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTES:
+                getFloatAttributes().clear();
+                getFloatAttributes().addAll((Collection<? extends Float>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY:
+                setFloatAttributeMandatory((Float)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE:
+                setLongAttribute((Long)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTES:
+                getLongAttributes().clear();
+                getLongAttributes().addAll((Collection<? extends Long>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY:
+                setLongAttributeMandatory((Long)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE:
+                setShortAttribute((Short)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTES:
+                getShortAttributes().clear();
+                getShortAttributes().addAll((Collection<? extends Short>)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY:
+                setShortAttributeMandatory((Short)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DERIVED_ATTRIBUTE:
+                setDerivedAttribute((String)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__TRANSIENT_ATTRIBUTE:
+                setTransientAttribute((String)newValue);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__OPTIONAL_FEATURE:
+                setOptionalFeature((String)newValue);
+                return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
-            setStringAttribute(TestElementImpl.STRING_ATTRIBUTE_EDEFAULT);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
-            getStringAttributes().clear();
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
-            setIntAttribute(TestElementImpl.INT_ATTRIBUTE_EDEFAULT);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
-            getIntAttributes().clear();
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
-            setBooleanAttribute(TestElementImpl.BOOLEAN_ATTRIBUTE_EDEFAULT);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
-            getBooleanAttributes().clear();
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
-            setEnumAttribute(TestElementImpl.ENUM_ATTRIBUTE_EDEFAULT);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
-            getEnumAttributes().clear();
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
-            setContainmentReference((TestElement) null);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
-            getContainmentReferences().clear();
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__REFERENCE:
-            setReference((TestElement) null);
-            return;
-        case PropertiestestsPackage.TEST_ELEMENT__REFERENCES:
-            getReferences().clear();
-            return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
+                setStringAttribute(STRING_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
+                getStringAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY:
+                setStringAttributeMandatory(STRING_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE:
+                setStringAttributeMultiline(STRING_ATTRIBUTE_MULTILINE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY:
+                setStringAttributeMultilineMandatory(STRING_ATTRIBUTE_MULTILINE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
+                setIntAttribute(INT_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
+                getIntAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY:
+                setIntAttributeMandatory(INT_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
+                setBooleanAttribute(BOOLEAN_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
+                getBooleanAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY:
+                setBooleanAttributeMandatory(BOOLEAN_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
+                setEnumAttribute(ENUM_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
+                getEnumAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY:
+                setEnumAttributeMandatory(ENUM_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
+                setContainmentReference((TestElement)null);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
+                getContainmentReferences().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY:
+                setContainmentReferenceMandatory((TestElement)null);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCE:
+                setReference((TestElement)null);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCES:
+                getReferences().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCE_MANDATORY:
+                setReferenceMandatory((TestElement)null);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE:
+                setCharAttribute(CHAR_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTES:
+                getCharAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY:
+                setCharAttributeMandatory(CHAR_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE:
+                setDateAttribute(DATE_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTES:
+                getDateAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY:
+                setDateAttributeMandatory(DATE_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE:
+                setDoubleAttribute(DOUBLE_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTES:
+                getDoubleAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY:
+                setDoubleAttributeMandatory(DOUBLE_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE:
+                setFloatAttribute(FLOAT_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTES:
+                getFloatAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY:
+                setFloatAttributeMandatory(FLOAT_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE:
+                setLongAttribute(LONG_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTES:
+                getLongAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY:
+                setLongAttributeMandatory(LONG_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE:
+                setShortAttribute(SHORT_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTES:
+                getShortAttributes().clear();
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY:
+                setShortAttributeMandatory(SHORT_ATTRIBUTE_MANDATORY_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__DERIVED_ATTRIBUTE:
+                setDerivedAttribute(DERIVED_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__TRANSIENT_ATTRIBUTE:
+                setTransientAttribute(TRANSIENT_ATTRIBUTE_EDEFAULT);
+                return;
+            case PropertiestestsPackage.TEST_ELEMENT__OPTIONAL_FEATURE:
+                setOptionalFeature(OPTIONAL_FEATURE_EDEFAULT);
+                return;
         }
         super.eUnset(featureID);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
-            return TestElementImpl.STRING_ATTRIBUTE_EDEFAULT == null ? stringAttribute != null : !TestElementImpl.STRING_ATTRIBUTE_EDEFAULT.equals(stringAttribute);
-        case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
-            return stringAttributes != null && !stringAttributes.isEmpty();
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
-            return intAttribute != TestElementImpl.INT_ATTRIBUTE_EDEFAULT;
-        case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
-            return intAttributes != null && !intAttributes.isEmpty();
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
-            return booleanAttribute != TestElementImpl.BOOLEAN_ATTRIBUTE_EDEFAULT;
-        case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
-            return booleanAttributes != null && !booleanAttributes.isEmpty();
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
-            return enumAttribute != TestElementImpl.ENUM_ATTRIBUTE_EDEFAULT;
-        case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
-            return enumAttributes != null && !enumAttributes.isEmpty();
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
-            return containmentReference != null;
-        case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
-            return containmentReferences != null && !containmentReferences.isEmpty();
-        case PropertiestestsPackage.TEST_ELEMENT__REFERENCE:
-            return reference != null;
-        case PropertiestestsPackage.TEST_ELEMENT__REFERENCES:
-            return references != null && !references.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE:
+                return STRING_ATTRIBUTE_EDEFAULT == null ? stringAttribute != null : !STRING_ATTRIBUTE_EDEFAULT.equals(stringAttribute);
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTES:
+                return stringAttributes != null && !stringAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MANDATORY:
+                return STRING_ATTRIBUTE_MANDATORY_EDEFAULT == null ? stringAttributeMandatory != null : !STRING_ATTRIBUTE_MANDATORY_EDEFAULT.equals(stringAttributeMandatory);
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE:
+                return STRING_ATTRIBUTE_MULTILINE_EDEFAULT == null ? stringAttributeMultiline != null : !STRING_ATTRIBUTE_MULTILINE_EDEFAULT.equals(stringAttributeMultiline);
+            case PropertiestestsPackage.TEST_ELEMENT__STRING_ATTRIBUTE_MULTILINE_MANDATORY:
+                return STRING_ATTRIBUTE_MULTILINE_MANDATORY_EDEFAULT == null ? stringAttributeMultilineMandatory != null : !STRING_ATTRIBUTE_MULTILINE_MANDATORY_EDEFAULT.equals(stringAttributeMultilineMandatory);
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE:
+                return intAttribute != INT_ATTRIBUTE_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTES:
+                return intAttributes != null && !intAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__INT_ATTRIBUTE_MANDATORY:
+                return intAttributeMandatory != INT_ATTRIBUTE_MANDATORY_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE:
+                return booleanAttribute != BOOLEAN_ATTRIBUTE_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTES:
+                return booleanAttributes != null && !booleanAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__BOOLEAN_ATTRIBUTE_MANDATORY:
+                return booleanAttributeMandatory != BOOLEAN_ATTRIBUTE_MANDATORY_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE:
+                return enumAttribute != ENUM_ATTRIBUTE_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTES:
+                return enumAttributes != null && !enumAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__ENUM_ATTRIBUTE_MANDATORY:
+                return enumAttributeMandatory != ENUM_ATTRIBUTE_MANDATORY_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE:
+                return containmentReference != null;
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCES:
+                return containmentReferences != null && !containmentReferences.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__CONTAINMENT_REFERENCE_MANDATORY:
+                return containmentReferenceMandatory != null;
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCE:
+                return reference != null;
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCES:
+                return references != null && !references.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__REFERENCE_MANDATORY:
+                return referenceMandatory != null;
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE:
+                return charAttribute != CHAR_ATTRIBUTE_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTES:
+                return charAttributes != null && !charAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__CHAR_ATTRIBUTE_MANDATORY:
+                return charAttributeMandatory != CHAR_ATTRIBUTE_MANDATORY_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE:
+                return DATE_ATTRIBUTE_EDEFAULT == null ? dateAttribute != null : !DATE_ATTRIBUTE_EDEFAULT.equals(dateAttribute);
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTES:
+                return dateAttributes != null && !dateAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__DATE_ATTRIBUTE_MANDATORY:
+                return DATE_ATTRIBUTE_MANDATORY_EDEFAULT == null ? dateAttributeMandatory != null : !DATE_ATTRIBUTE_MANDATORY_EDEFAULT.equals(dateAttributeMandatory);
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE:
+                return doubleAttribute != DOUBLE_ATTRIBUTE_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTES:
+                return doubleAttributes != null && !doubleAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__DOUBLE_ATTRIBUTE_MANDATORY:
+                return doubleAttributeMandatory != DOUBLE_ATTRIBUTE_MANDATORY_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE:
+                return floatAttribute != FLOAT_ATTRIBUTE_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTES:
+                return floatAttributes != null && !floatAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__FLOAT_ATTRIBUTE_MANDATORY:
+                return floatAttributeMandatory != FLOAT_ATTRIBUTE_MANDATORY_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE:
+                return longAttribute != LONG_ATTRIBUTE_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTES:
+                return longAttributes != null && !longAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__LONG_ATTRIBUTE_MANDATORY:
+                return longAttributeMandatory != LONG_ATTRIBUTE_MANDATORY_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE:
+                return shortAttribute != SHORT_ATTRIBUTE_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTES:
+                return shortAttributes != null && !shortAttributes.isEmpty();
+            case PropertiestestsPackage.TEST_ELEMENT__SHORT_ATTRIBUTE_MANDATORY:
+                return shortAttributeMandatory != SHORT_ATTRIBUTE_MANDATORY_EDEFAULT;
+            case PropertiestestsPackage.TEST_ELEMENT__DERIVED_ATTRIBUTE:
+                return DERIVED_ATTRIBUTE_EDEFAULT == null ? getDerivedAttribute() != null : !DERIVED_ATTRIBUTE_EDEFAULT.equals(getDerivedAttribute());
+            case PropertiestestsPackage.TEST_ELEMENT__TRANSIENT_ATTRIBUTE:
+                return TRANSIENT_ATTRIBUTE_EDEFAULT == null ? transientAttribute != null : !TRANSIENT_ATTRIBUTE_EDEFAULT.equals(transientAttribute);
+            case PropertiestestsPackage.TEST_ELEMENT__NON_CHANGEABLE_ATTRIBUTE:
+                return NON_CHANGEABLE_ATTRIBUTE_EDEFAULT == null ? nonChangeableAttribute != null : !NON_CHANGEABLE_ATTRIBUTE_EDEFAULT.equals(nonChangeableAttribute);
+            case PropertiestestsPackage.TEST_ELEMENT__OPTIONAL_FEATURE:
+                return OPTIONAL_FEATURE_EDEFAULT == null ? optionalFeature != null : !OPTIONAL_FEATURE_EDEFAULT.equals(optionalFeature);
         }
         return super.eIsSet(featureID);
     }
 
     /**
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
      * @generated
      */
     @Override
     public String toString() {
-        if (eIsProxy()) {
-            return super.toString();
-        }
+        if (eIsProxy()) return super.toString();
 
         StringBuffer result = new StringBuffer(super.toString());
         result.append(" (stringAttribute: ");
         result.append(stringAttribute);
         result.append(", stringAttributes: ");
         result.append(stringAttributes);
+        result.append(", stringAttributeMandatory: ");
+        result.append(stringAttributeMandatory);
+        result.append(", stringAttributeMultiline: ");
+        result.append(stringAttributeMultiline);
+        result.append(", stringAttributeMultilineMandatory: ");
+        result.append(stringAttributeMultilineMandatory);
         result.append(", intAttribute: ");
         result.append(intAttribute);
         result.append(", intAttributes: ");
         result.append(intAttributes);
+        result.append(", intAttributeMandatory: ");
+        result.append(intAttributeMandatory);
         result.append(", booleanAttribute: ");
         result.append(booleanAttribute);
         result.append(", booleanAttributes: ");
         result.append(booleanAttributes);
+        result.append(", booleanAttributeMandatory: ");
+        result.append(booleanAttributeMandatory);
         result.append(", enumAttribute: ");
         result.append(enumAttribute);
         result.append(", enumAttributes: ");
         result.append(enumAttributes);
+        result.append(", enumAttributeMandatory: ");
+        result.append(enumAttributeMandatory);
+        result.append(", charAttribute: ");
+        result.append(charAttribute);
+        result.append(", charAttributes: ");
+        result.append(charAttributes);
+        result.append(", charAttributeMandatory: ");
+        result.append(charAttributeMandatory);
+        result.append(", dateAttribute: ");
+        result.append(dateAttribute);
+        result.append(", dateAttributes: ");
+        result.append(dateAttributes);
+        result.append(", dateAttributeMandatory: ");
+        result.append(dateAttributeMandatory);
+        result.append(", doubleAttribute: ");
+        result.append(doubleAttribute);
+        result.append(", doubleAttributes: ");
+        result.append(doubleAttributes);
+        result.append(", doubleAttributeMandatory: ");
+        result.append(doubleAttributeMandatory);
+        result.append(", floatAttribute: ");
+        result.append(floatAttribute);
+        result.append(", floatAttributes: ");
+        result.append(floatAttributes);
+        result.append(", floatAttributeMandatory: ");
+        result.append(floatAttributeMandatory);
+        result.append(", longAttribute: ");
+        result.append(longAttribute);
+        result.append(", longAttributes: ");
+        result.append(longAttributes);
+        result.append(", longAttributeMandatory: ");
+        result.append(longAttributeMandatory);
+        result.append(", shortAttribute: ");
+        result.append(shortAttribute);
+        result.append(", shortAttributes: ");
+        result.append(shortAttributes);
+        result.append(", shortAttributeMandatory: ");
+        result.append(shortAttributeMandatory);
+        result.append(", transientAttribute: ");
+        result.append(transientAttribute);
+        result.append(", nonChangeableAttribute: ");
+        result.append(nonChangeableAttribute);
+        result.append(", optionalFeature: ");
+        result.append(optionalFeature);
         result.append(')');
         return result.toString();
     }
 
-} // TestElementImpl
+} //TestElementImpl
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/TestRootImpl.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/TestRootImpl.java
index 973be82a2b..2009efd42d 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/TestRootImpl.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/impl/TestRootImpl.java
@@ -27,18 +27,15 @@ import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot;
  * The following features are implemented:
  * </p>
  * <ul>
- * <li>
- * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestRootImpl#getElements
- * <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.impl.TestRootImpl#getElements <em>Elements</em>}</li>
  * </ul>
  *
  * @generated
  */
 public class TestRootImpl extends MinimalEObjectImpl.Container implements TestRoot {
     /**
-     * The cached value of the '{@link #getElements() <em>Elements</em>}'
-     * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @see #getElements()
      * @generated
      * @ordered
@@ -47,7 +44,6 @@ public class TestRootImpl extends MinimalEObjectImpl.Container implements TestRo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     protected TestRootImpl() {
@@ -56,7 +52,6 @@ public class TestRootImpl extends MinimalEObjectImpl.Container implements TestRo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -66,7 +61,6 @@ public class TestRootImpl extends MinimalEObjectImpl.Container implements TestRo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
@@ -79,74 +73,69 @@ public class TestRootImpl extends MinimalEObjectImpl.Container implements TestRo
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
-            return ((InternalEList<?>) getElements()).basicRemove(otherEnd, msgs);
+            case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
+                return ((InternalEList<?>)getElements()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
-            return getElements();
+            case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
+                return getElements();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @SuppressWarnings("unchecked")
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
-            getElements().clear();
-            getElements().addAll((Collection<? extends TestElement>) newValue);
-            return;
+            case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
+                getElements().clear();
+                getElements().addAll((Collection<? extends TestElement>)newValue);
+                return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
-            getElements().clear();
-            return;
+            case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
+                getElements().clear();
+                return;
         }
         super.eUnset(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-        case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
-            return elements != null && !elements.isEmpty();
+            case PropertiestestsPackage.TEST_ROOT__ELEMENTS:
+                return elements != null && !elements.isEmpty();
         }
         return super.eIsSet(featureID);
     }
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/util/PropertiestestsAdapterFactory.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/util/PropertiestestsAdapterFactory.java
index 0b28c0a95e..49c52e986d 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/util/PropertiestestsAdapterFactory.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/util/PropertiestestsAdapterFactory.java
@@ -19,27 +19,26 @@ import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
- *
  * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage
  * @generated
  */
 public class PropertiestestsAdapterFactory extends AdapterFactoryImpl {
     /**
-     * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The cached model package.
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected static PropertiestestsPackage modelPackage;
 
     /**
-     * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
+     * Creates an instance of the adapter factory.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     public PropertiestestsAdapterFactory() {
-        if (PropertiestestsAdapterFactory.modelPackage == null) {
-            PropertiestestsAdapterFactory.modelPackage = PropertiestestsPackage.eINSTANCE;
+        if (modelPackage == null) {
+            modelPackage = PropertiestestsPackage.eINSTANCE;
         }
     }
 
@@ -48,17 +47,16 @@ public class PropertiestestsAdapterFactory extends AdapterFactoryImpl {
      * <!-- begin-user-doc --> This implementation returns <code>true</code> if
      * the object is either the model's package or is an instance object of the
      * model. <!-- end-user-doc -->
-     *
      * @return whether this factory is applicable for the type of the object.
      * @generated
      */
     @Override
     public boolean isFactoryForType(Object object) {
-        if (object == PropertiestestsAdapterFactory.modelPackage) {
+        if (object == modelPackage) {
             return true;
         }
         if (object instanceof EObject) {
-            return ((EObject) object).eClass().getEPackage() == PropertiestestsAdapterFactory.modelPackage;
+            return ((EObject)object).eClass().getEPackage() == modelPackage;
         }
         return false;
     }
@@ -70,34 +68,31 @@ public class PropertiestestsAdapterFactory extends AdapterFactoryImpl {
      * @generated
      */
     protected PropertiestestsSwitch<Adapter> modelSwitch = new PropertiestestsSwitch<Adapter>() {
-        @Override
-        public Adapter caseTestRoot(TestRoot object) {
-            return createTestRootAdapter();
-        }
-
-        @Override
-        public Adapter caseTestElement(TestElement object) {
-            return createTestElementAdapter();
-        }
-
-        @Override
-        public Adapter defaultCase(EObject object) {
-            return createEObjectAdapter();
-        }
-    };
+            @Override
+            public Adapter caseTestRoot(TestRoot object) {
+                return createTestRootAdapter();
+            }
+            @Override
+            public Adapter caseTestElement(TestElement object) {
+                return createTestElementAdapter();
+            }
+            @Override
+            public Adapter defaultCase(EObject object) {
+                return createEObjectAdapter();
+            }
+        };
 
     /**
-     * Creates an adapter for the <code>target</code>. <!-- begin-user-doc -->
+     * Creates an adapter for the <code>target</code>.
+     * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     *
-     * @param target
-     *            the object to adapt.
+     * @param target the object to adapt.
      * @return the adapter for the <code>target</code>.
      * @generated
      */
     @Override
     public Adapter createAdapter(Notifier target) {
-        return modelSwitch.doSwitch((EObject) target);
+        return modelSwitch.doSwitch((EObject)target);
     }
 
     /**
@@ -117,13 +112,11 @@ public class PropertiestestsAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for an object of class '
-     * {@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement
-     * <em>Test Element</em>}'. <!-- begin-user-doc --> This default
+     * Creates a new adapter for an object of class '{@link org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement <em>Test Element</em>}'.
+     * <!-- begin-user-doc --> This default
      * implementation returns null so that we can easily ignore cases; it's
      * useful to ignore a case when inheritance will catch all the cases anyway.
      * <!-- end-user-doc -->
-     *
      * @return the new adapter.
      * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestElement
      * @generated
@@ -133,9 +126,9 @@ public class PropertiestestsAdapterFactory extends AdapterFactoryImpl {
     }
 
     /**
-     * Creates a new adapter for the default case. <!-- begin-user-doc --> This
+     * Creates a new adapter for the default case.
+     * <!-- begin-user-doc --> This
      * default implementation returns null. <!-- end-user-doc -->
-     *
      * @return the new adapter.
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/util/PropertiestestsSwitch.java b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/util/PropertiestestsSwitch.java
index 64e9066db5..fc0baf8e3a 100644
--- a/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/util/PropertiestestsSwitch.java
+++ b/plugins/org.eclipse.sirius.tests.rcptt.properties/src-gen/org/eclipse/sirius/tests/rcptt/properties/propertiestests/util/PropertiestestsSwitch.java
@@ -21,27 +21,26 @@ import org.eclipse.sirius.tests.rcptt.properties.propertiestests.TestRoot;
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
- *
  * @see org.eclipse.sirius.tests.rcptt.properties.propertiestests.PropertiestestsPackage
  * @generated
  */
 public class PropertiestestsSwitch<T> extends Switch<T> {
     /**
-     * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-     *
+     * The cached model package
+     * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @generated
      */
     protected static PropertiestestsPackage modelPackage;
 
     /**
-     * Creates an instance of the switch. <!-- begin-user-doc --> <!--
+     * Creates an instance of the switch.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
      * @generated
      */
     public PropertiestestsSwitch() {
-        if (PropertiestestsSwitch.modelPackage == null) {
-            PropertiestestsSwitch.modelPackage = PropertiestestsPackage.eINSTANCE;
+        if (modelPackage == null) {
+            modelPackage = PropertiestestsPackage.eINSTANCE;
         }
     }
 
@@ -56,52 +55,42 @@ public class PropertiestestsSwitch<T> extends Switch<T> {
      */
     @Override
     protected boolean isSwitchFor(EPackage ePackage) {
-        return ePackage == PropertiestestsSwitch.modelPackage;
+        return ePackage == modelPackage;
     }
 
     /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns
-     * a non null result; it yields that result. <!-- begin-user-doc --> <!--
+     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+     * <!-- begin-user-doc --> <!--
      * end-user-doc -->
-     *
-     * @return the first non-null result returned by a <code>caseXXX</code>
-     *         call.
+     * @return the first non-null result returned by a <code>caseXXX</code> call.
      * @generated
      */
     @Override
     protected T doSwitch(int classifierID, EObject theEObject) {
         switch (classifierID) {
-        case PropertiestestsPackage.TEST_ROOT: {
-            TestRoot testRoot = (TestRoot) theEObject;
-            T result = caseTestRoot(testRoot);
-            if (result == null) {
-                result = defaultCase(theEObject);
+            case PropertiestestsPackage.TEST_ROOT: {
+                TestRoot testRoot = (TestRoot)theEObject;
+                T result = caseTestRoot(testRoot);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
             }
-            return result;
-        }
-        case PropertiestestsPackage.TEST_ELEMENT: {
-            TestElement testElement = (TestElement) theEObject;
-            T result = caseTestElement(testElement);
-            if (result == null) {
-                result = defaultCase(theEObject);
+            case PropertiestestsPackage.TEST_ELEMENT: {
+                TestElement testElement = (TestElement)theEObject;
+                T result = caseTestElement(testElement);
+                if (result == null) result = defaultCase(theEObject);
+                return result;
             }
-            return result;
-        }
-        default:
-            return defaultCase(theEObject);
+            default: return defaultCase(theEObject);
         }
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '
-     * <em>Test Root</em>'. <!-- begin-user-doc --> This implementation returns
+     * Returns the result of interpreting the object as an instance of '<em>Test Root</em>'.
+     * <!-- begin-user-doc --> This implementation returns
      * null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
-     *
-     * @param object
-     *            the target of the switch.
-     * @return the result of interpreting the object as an instance of '
-     *         <em>Test Root</em>'.
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Test Root</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -110,15 +99,12 @@ public class PropertiestestsSwitch<T> extends Switch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '
-     * <em>Test Element</em>'. <!-- begin-user-doc --> This implementation
+     * Returns the result of interpreting the object as an instance of '<em>Test Element</em>'.
+     * <!-- begin-user-doc --> This implementation
      * returns null; returning a non-null result will terminate the switch. <!--
      * end-user-doc -->
-     *
-     * @param object
-     *            the target of the switch.
-     * @return the result of interpreting the object as an instance of '
-     *         <em>Test Element</em>'.
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>Test Element</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
      * @generated
      */
@@ -127,15 +113,12 @@ public class PropertiestestsSwitch<T> extends Switch<T> {
     }
 
     /**
-     * Returns the result of interpreting the object as an instance of '
-     * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
+     * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+     * <!-- begin-user-doc --> This implementation returns
      * null; returning a non-null result will terminate the switch, but this is
      * the last case anyway. <!-- end-user-doc -->
-     *
-     * @param object
-     *            the target of the switch.
-     * @return the result of interpreting the object as an instance of '
-     *         <em>EObject</em>'.
+     * @param object the target of the switch.
+     * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
      * @see #doSwitch(org.eclipse.emf.ecore.EObject)
      * @generated
      */
diff --git a/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/plugin.xml b/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/plugin.xml
index 5ff7e89a26..83eae928fc 100644
--- a/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/plugin.xml
@@ -21,12 +21,6 @@
             id="org.eclipse.sirius.ui.properties.ext.widgets.reference.descriptionConditionalStyleConverter"
             label="%referenceDescriptionConditionalStyleConverter.Label">
       </descriptor>
-      <descriptor
-            class="org.eclipse.sirius.ui.properties.ext.widgets.reference.internal.DefaultRulesReferenceDescriptionConverter"
-            description="%defaultRulesReferenceDescriptionConverter.Description"
-            id="org.eclipse.sirius.ui.properties.ext.widgets.reference.defaultrules.descriptionConverter"
-            label="%defaultRulesReferenceDescriptionConverter.Label">
-      </descriptor>
    </extension>
    <extension
          point="org.eclipse.eef.ide.ui.ext.widgets.reference.eefExtReferenceViewerFilterProvider">
diff --git a/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/src/org/eclipse/sirius/ui/properties/ext/widgets/reference/internal/DefaultRulesReferenceDescriptionConverter.java b/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/src/org/eclipse/sirius/ui/properties/ext/widgets/reference/internal/DefaultRulesReferenceDescriptionConverter.java
deleted file mode 100644
index a0aca77dde..0000000000
--- a/plugins/org.eclipse.sirius.ui.properties.ext.widgets.reference/src/org/eclipse/sirius/ui/properties/ext/widgets/reference/internal/DefaultRulesReferenceDescriptionConverter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright (c) 2016 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Obeo - initial API and implementation
- */
-package org.eclipse.sirius.ui.properties.ext.widgets.reference.internal;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.eclipse.eef.ext.widgets.reference.eefextwidgetsreference.EEFExtReferenceDescription;
-import org.eclipse.eef.ext.widgets.reference.eefextwidgetsreference.EefExtWidgetsReferenceFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.sirius.properties.DynamicMappingIf;
-import org.eclipse.sirius.properties.WidgetDescription;
-import org.eclipse.sirius.ui.properties.api.DescriptionCache;
-import org.eclipse.sirius.ui.properties.api.IDescriptionConverter;
-
-/**
- * This {@link IDescriptionConverter} is used to replace the widget used by the
- * default rules for the references by the extension reference widget.
- * 
- * @author sbegaudeau
- */
-public class DefaultRulesReferenceDescriptionConverter implements IDescriptionConverter {
-    /**
-     * The identifier of the widget description for mono-valued containment
-     * references.
-     */
-    private static final String MONO_CONTAINMENT_REFERENCE_ID = "sirius_default_rules_mono_containment_reference"; //$NON-NLS-1$
-
-    /**
-     * The identifier of the widget description for mono-valued non-containment
-     * references.
-     */
-    private static final String MONO_NONCONTAINMENT_REFERENCE_ID = "sirius_default_rules_mono_noncontainment_reference"; //$NON-NLS-1$
-
-    /**
-     * The identifier of the widget description if for multi-valued containment
-     * references.
-     */
-    private static final String MULTI_CONTAINMENT_REFERENCE_ID = "sirius_default_rules_multi_containment_reference"; //$NON-NLS-1$
-
-    /**
-     * The identifier of the widget description if for multi-valued
-     * non-containment references.
-     */
-    private static final String MULTI_NONCONTAINMENT_REFERENCE_ID = "sirius_default_rules_multi_noncontainment_reference"; //$NON-NLS-1$
-
-    /**
-     * The identifier of the descriptions supported by this
-     * {@link IDescriptionConverter}.
-     */
-    private static final String[] SUPPORTED_IDS = new String[] { MONO_CONTAINMENT_REFERENCE_ID, MONO_NONCONTAINMENT_REFERENCE_ID, MULTI_CONTAINMENT_REFERENCE_ID, MULTI_NONCONTAINMENT_REFERENCE_ID };
-
-    /**
-     * The URI of the default rules resource.
-     */
-    private static final String SUPPORTED_URI = "platform:/plugin/org.eclipse.sirius.ui.properties/model/properties.xmi"; //$NON-NLS-1$
-
-    @Override
-    public boolean canHandle(EObject description) {
-        if (description.eResource() != null && SUPPORTED_URI.equals(description.eResource().getURI().toString())) {
-            if (description instanceof WidgetDescription && ((WidgetDescription) description).eContainer() instanceof DynamicMappingIf) {
-                WidgetDescription widgetDescription = (WidgetDescription) description;
-                return Arrays.asList(SUPPORTED_IDS).contains(widgetDescription.getIdentifier());
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public EObject convert(EObject description, Map<String, Object> parameters, DescriptionCache cache) {
-        if (description instanceof WidgetDescription && ((WidgetDescription) description).eContainer() instanceof DynamicMappingIf) {
-            WidgetDescription widgetDescription = (WidgetDescription) description;
-
-            if (Arrays.asList(SUPPORTED_IDS).contains(widgetDescription.getIdentifier())) {
-                EEFExtReferenceDescription eefExtReferenceDescription = EefExtWidgetsReferenceFactory.eINSTANCE.createEEFExtReferenceDescription();
-                eefExtReferenceDescription.setIdentifier(widgetDescription.getIdentifier());
-                eefExtReferenceDescription.setReferenceNameExpression("aql:eStructuralFeature.name"); //$NON-NLS-1$
-                cache.put(widgetDescription, eefExtReferenceDescription);
-                return eefExtReferenceDescription;
-            }
-        }
-        return null;
-    }
-}
diff --git a/plugins/org.eclipse.sirius.ui.properties/model/properties.odesign b/plugins/org.eclipse.sirius.ui.properties/model/properties.odesign
index 77e752d8fb..41b8f79ee2 100644
--- a/plugins/org.eclipse.sirius.ui.properties/model/properties.odesign
+++ b/plugins/org.eclipse.sirius.ui.properties/model/properties.odesign
@@ -4,30 +4,52 @@
     xmlns:xmi="http://www.omg.org/XMI"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:properties="http://www.eclipse.org/sirius/properties/1.0.0"
-    xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0"
-    xsi:schemaLocation="http://www.eclipse.org/sirius/properties/1.0.0 ../../org.eclipse.sirius.properties/model/properties.ecore http://www.eclipse.org/sirius/description/tool/1.1.0 ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool"
+    xmlns:properties-ext-widgets-reference="http://www.eclipse.org/sirius/properties/1.0.0/ext/widgets/reference"
+    xsi:schemaLocation="http://www.eclipse.org/sirius/properties/1.0.0 ../../org.eclipse.sirius.properties/model/properties.ecore http://www.eclipse.org/sirius/properties/1.0.0/ext/widgets/reference ../../org.eclipse.sirius.properties.ext.widgets.reference/model/properties-ext-widgets-reference.ecore"
     identifier="org.eclipse.sirius.ui.properties">
   <pages identifier="org.eclipse.sirius.ui.properties.defaultpage"
       labelExpression="General"
       groups="//@groups.0"/>
   <groups identifier="org.eclipse.sirius.ui.properties.defaultgroup"
-      labelExpression="Properties">
+      labelExpression="aql:self.eefViewCategory()"
+      semanticCandidateExpression="aql:self.eefViewCategories()"
+      preconditionExpression="">
     <controls
         xsi:type="properties:DynamicMappingFor"
         iterator="eStructuralFeature"
-        domainClassExpression="aql:self.eClass().eAllStructuralFeatures->select(f : ecore::EStructuralFeature | not f.derived and not f.transient and (f.oclIsKindOf(ecore::EAttribute)  or not f.oclAsType(ecore::EReference).containment)))">
-      <ifs predicateExpression="aql:(eStructuralFeature.eType.instanceTypeName = 'java.lang.String' or eStructuralFeature.eType.instanceTypeName = 'int' or eStructuralFeature.eType.instanceTypeName = 'double' or eStructuralFeature.eType.instanceTypeName = 'char' or eStructuralFeature.eType.instanceTypeName = 'short' or eStructuralFeature.eType.instanceTypeName = 'long' or eStructuralFeature.eType.instanceTypeName = 'float' or eStructuralFeature.eType.instanceTypeName = 'java.util.Date') and not(eStructuralFeature.many)">
+        domainClassExpression="aql:self.eefViewEStructuralFeatures()">
+      <ifs predicateExpression="aql:(eStructuralFeature.eType.instanceTypeName = 'java.lang.String' or eStructuralFeature.eType.instanceTypeName = 'int' or eStructuralFeature.eType.instanceTypeName = 'double' or eStructuralFeature.eType.instanceTypeName = 'char' or eStructuralFeature.eType.instanceTypeName = 'short' or eStructuralFeature.eType.instanceTypeName = 'long' or eStructuralFeature.eType.instanceTypeName = 'float' or eStructuralFeature.eType.instanceTypeName = 'java.util.Date') and not(eStructuralFeature.many) and not self.eefViewMultiline(eStructuralFeature)">
         <widget
             xsi:type="properties:TextDescription"
             identifier="sirius_default_rules_mono_string"
             labelExpression="aql:self.eefViewText(eStructuralFeature)+':'"
+            helpExpression="aql:self.eefViewDescription(eStructuralFeature)"
             isEnabledExpression="aql:eStructuralFeature.changeable"
             valueExpression="aql:self.eGet(eStructuralFeature)">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="aql:self.eSet(eStructuralFeature, newValue)"/>
-          </initialOperation>
+          <initialOperation/>
+          <conditionalStyles
+              preconditionExpression="aql:eStructuralFeature.lowerBound==1">
+            <style>
+              <labelFontFormat>bold</labelFontFormat>
+            </style>
+          </conditionalStyles>
+        </widget>
+      </ifs>
+      <ifs predicateExpression="aql:(eStructuralFeature.eType.instanceTypeName = 'java.lang.String' or eStructuralFeature.eType.instanceTypeName = 'int' or eStructuralFeature.eType.instanceTypeName = 'double' or eStructuralFeature.eType.instanceTypeName = 'char' or eStructuralFeature.eType.instanceTypeName = 'short' or eStructuralFeature.eType.instanceTypeName = 'long' or eStructuralFeature.eType.instanceTypeName = 'float' or eStructuralFeature.eType.instanceTypeName = 'java.util.Date') and not(eStructuralFeature.many) and self.eefViewMultiline(eStructuralFeature)">
+        <widget
+            xsi:type="properties:TextAreaDescription"
+            identifier="sirius_default_rules_multi_string"
+            labelExpression="aql:self.eefViewText(eStructuralFeature)+':'"
+            helpExpression="aql:self.eefViewDescription(eStructuralFeature)"
+            isEnabledExpression="aql:eStructuralFeature.changeable"
+            valueExpression="aql:self.eGet(eStructuralFeature)">
+          <initialOperation/>
+          <conditionalStyles
+              preconditionExpression="aql:eStructuralFeature.lowerBound==1">
+            <style>
+              <labelFontFormat>bold</labelFontFormat>
+            </style>
+          </conditionalStyles>
         </widget>
       </ifs>
       <ifs predicateExpression="aql:(eStructuralFeature.eType.instanceTypeName = 'java.lang.Boolean' or eStructuralFeature.eType.instanceTypeName = 'boolean') and not(eStructuralFeature.many)">
@@ -35,13 +57,16 @@
             xsi:type="properties:CheckboxDescription"
             identifier="sirius_default_rules_mono_boolean"
             labelExpression="aql:self.eefViewText(eStructuralFeature)"
+            helpExpression="aql:self.eefViewDescription(eStructuralFeature)"
             isEnabledExpression="aql:eStructuralFeature.changeable"
             valueExpression="aql:self.eGet(eStructuralFeature)">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="aql:self.eSet(eStructuralFeature, newValue)"/>
-          </initialOperation>
+          <initialOperation/>
+          <conditionalStyles
+              preconditionExpression="aql:eStructuralFeature.lowerBound==1">
+            <style>
+              <labelFontFormat>bold</labelFontFormat>
+            </style>
+          </conditionalStyles>
         </widget>
       </ifs>
       <ifs predicateExpression="aql:eStructuralFeature.eType.oclIsKindOf(ecore::EEnum) and not(eStructuralFeature.many)">
@@ -49,81 +74,38 @@
             xsi:type="properties:RadioDescription"
             identifier="sirius_default_rules_enum"
             labelExpression="aql:self.eefViewText(eStructuralFeature)+':'"
-            helpExpression=""
+            helpExpression="aql:self.eefViewDescription(eStructuralFeature)"
             isEnabledExpression="aql:eStructuralFeature.changeable"
             valueExpression="aql:eStructuralFeature.eType.getEEnumLiteral(self.eGet(eStructuralFeature).toString())"
             candidatesExpression="aql:eStructuralFeature.eType.eLiterals"
             candidateDisplayExpression="aql:candidate.name"
             numberOfColumns="5">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="aql:self.eSet(eStructuralFeature, newValue.instance)"/>
-          </initialOperation>
-        </widget>
-      </ifs>
-      <ifs predicateExpression="aql:eStructuralFeature.oclIsKindOf(ecore::EReference) and eStructuralFeature.containment and not(eStructuralFeature.many)">
-        <widget
-            xsi:type="properties:ReferenceDescription"
-            identifier="sirius_default_rules_mono_containment_reference"
-            labelExpression="aql:self.eefViewText(eStructuralFeature)+':'"
-            isEnabledExpression="aql:eStructuralFeature.changeable"
-            valueExpression="aql:self.eGet(eStructuralFeature)"
-            displayExpression="aql:value.eefViewText()">
-          <onClickOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="var:self"/>
-          </onClickOperation>
+          <initialOperation/>
+          <conditionalStyles
+              preconditionExpression="aql:eStructuralFeature.lowerBound==1">
+            <style>
+              <labelFontFormat>bold</labelFontFormat>
+            </style>
+          </conditionalStyles>
         </widget>
       </ifs>
       <ifs predicateExpression="aql:eStructuralFeature.oclIsKindOf(ecore::EReference) and not(eStructuralFeature.containment) and not(eStructuralFeature.many)">
         <widget
-            xsi:type="properties:SelectDescription"
+            xsi:type="properties-ext-widgets-reference:ExtReferenceDescription"
             identifier="sirius_default_rules_mono_noncontainment_reference"
             labelExpression="aql:self.eefViewText(eStructuralFeature)+':'"
+            helpExpression="aql:self.eefViewDescription(eStructuralFeature)"
             isEnabledExpression="aql:eStructuralFeature.changeable"
-            valueExpression="aql:self.eGet(eStructuralFeature)"
-            candidatesExpression="aql:self.eefViewChoiceOfValues(eStructuralFeature)"
-            candidateDisplayExpression="aql:candidate.eefViewText()">
-          <initialOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="aql:self.eSet(eStructuralFeature, newValue)"/>
-          </initialOperation>
-        </widget>
-      </ifs>
-      <ifs predicateExpression="aql:eStructuralFeature.oclIsKindOf(ecore::EReference) and eStructuralFeature.containment and eStructuralFeature.many">
-        <widget
-            xsi:type="properties:ReferenceDescription"
-            identifier="sirius_default_rules_multi_containment_reference"
-            labelExpression="aql:self.eefViewText(eStructuralFeature)+':'"
-            isEnabledExpression="aql:eStructuralFeature.changeable"
-            multiple="true"
-            valueExpression="aql:self.eGet(eStructuralFeature)"
-            displayExpression="aql:value.eefViewText()">
-          <onClickOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="var:self"/>
-          </onClickOperation>
-        </widget>
+            referenceNameExpression="aql:eStructuralFeature.name"/>
       </ifs>
       <ifs predicateExpression="aql:eStructuralFeature.oclIsKindOf(ecore::EReference) and not(eStructuralFeature.containment) and eStructuralFeature.many">
         <widget
-            xsi:type="properties:ReferenceDescription"
+            xsi:type="properties-ext-widgets-reference:ExtReferenceDescription"
             identifier="sirius_default_rules_multi_noncontainment_reference"
             labelExpression="aql:self.eefViewText(eStructuralFeature)+':'"
+            helpExpression="aql:self.eefViewDescription(eStructuralFeature)"
             isEnabledExpression="aql:eStructuralFeature.changeable"
-            multiple="true"
-            valueExpression="aql:self.eGet(eStructuralFeature)"
-            displayExpression="aql:value.eefViewText()">
-          <onClickOperation>
-            <firstModelOperations
-                xsi:type="tool:ChangeContext"
-                browseExpression="var:self"/>
-          </onClickOperation>
-        </widget>
+            referenceNameExpression="aql:eStructuralFeature.name"/>
       </ifs>
     </controls>
   </groups>
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EEFViewCategory.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EEFViewCategory.java
new file mode 100644
index 0000000000..b1a29fd726
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EEFViewCategory.java
@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.ui.properties.internal;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+
+/**
+ * Provides an EObject which represent the categories defined fir the structural
+ * features of an eObject.
+ * 
+ * @see SiriusToolServices#eefViewCategories(EObject)
+ * @see SiriusToolServices#eefViewEStructuralFeatures(EObject)
+ * 
+ * @author mbats
+ */
+public class EEFViewCategory implements EObject {
+    private EObject eObject;
+
+    private String category;
+
+    /**
+     * Default constructor.
+     * 
+     * @param eObject
+     *            The EObject
+     * @param category
+     *            The category
+     */
+    public EEFViewCategory(EObject eObject, String category) {
+        this.eObject = eObject;
+        this.category = category;
+    }
+
+    @Override
+    public EList<Adapter> eAdapters() {
+        return eObject.eAdapters();
+    }
+
+    @Override
+    public boolean eDeliver() {
+        return eObject.eDeliver();
+    }
+
+    @Override
+    public void eSetDeliver(boolean deliver) {
+        eObject.eSetDeliver(deliver);
+    }
+
+    @Override
+    public void eNotify(Notification notification) {
+        eObject.eNotify(notification);
+    }
+
+    @Override
+    public EClass eClass() {
+        return eObject.eClass();
+    }
+
+    @Override
+    public Resource eResource() {
+        return eObject.eResource();
+    }
+
+    @Override
+    public EObject eContainer() {
+        return eObject.eContainer();
+    }
+
+    @Override
+    public EStructuralFeature eContainingFeature() {
+        return eObject.eContainingFeature();
+    }
+
+    @Override
+    public EReference eContainmentFeature() {
+        return eObject.eContainmentFeature();
+    }
+
+    @Override
+    public EList<EObject> eContents() {
+        return eObject.eContents();
+    }
+
+    @Override
+    public TreeIterator<EObject> eAllContents() {
+        return eObject.eAllContents();
+    }
+
+    @Override
+    public boolean eIsProxy() {
+        return eObject.eIsProxy();
+    }
+
+    @Override
+    public EList<EObject> eCrossReferences() {
+        return eObject.eCrossReferences();
+    }
+
+    @Override
+    public Object eGet(EStructuralFeature feature) {
+        return eObject.eGet(feature);
+    }
+
+    @Override
+    public Object eGet(EStructuralFeature feature, boolean resolve) {
+        return eObject.eGet(feature, resolve);
+    }
+
+    @Override
+    public void eSet(EStructuralFeature feature, Object newValue) {
+        eObject.eSet(feature, newValue);
+    }
+
+    @Override
+    public boolean eIsSet(EStructuralFeature feature) {
+        return eObject.eIsSet(feature);
+    }
+
+    @Override
+    public void eUnset(EStructuralFeature feature) {
+        eObject.eUnset(feature);
+    }
+
+    @Override
+    public Object eInvoke(EOperation operation, EList<?> arguments) throws InvocationTargetException {
+        return eObject.eInvoke(operation, arguments);
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
index b881c0b694..3feb27117a 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
@@ -10,8 +10,12 @@
  *******************************************************************************/
 package org.eclipse.sirius.ui.properties.internal;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.eclipse.core.runtime.IStatus;
@@ -19,6 +23,7 @@ import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -47,6 +52,12 @@ import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
  */
 public class SiriusToolServices {
 
+    /**
+     * Keep in cache the features associated to an eObject which are visible in
+     * the default EEF view.
+     */
+    private static List<EStructuralFeature> visibleFeaturesCache = new ArrayList<EStructuralFeature>();
+
     private final EditingDomainServices editServices = new EditingDomainServices();
 
     /**
@@ -110,6 +121,143 @@ public class SiriusToolServices {
     }
 
     /**
+     * Returns if the given EObject is multiline.
+     * 
+     * @param eObject
+     *            The EObject
+     * @param eStructuralFeature
+     *            The EStructuralFeature
+     * @return True if the given EObject is multiline otherwise false
+     */
+    public boolean eefViewMultiline(EObject eObject, EStructuralFeature eStructuralFeature) {
+        return this.editServices.isPropertyDescriptorMultiLine(eObject, eStructuralFeature.getName());
+    }
+
+    /**
+     * Returns the description of the given EObject.
+     * 
+     * @param eObject
+     *            The EObject
+     * @param eStructuralFeature
+     *            The EStructuralFeature
+     * @return The description associated to the given EStructuralFeature or
+     *         <code>null</code> if none could be found
+     */
+    public String eefViewDescription(EObject eObject, EStructuralFeature eStructuralFeature) {
+        return this.editServices.getPropertyDescriptorDescription(eObject, eStructuralFeature.getName());
+    }
+
+    /**
+     * Get the category associated to a given EObject.
+     * 
+     * @param eObject
+     *            The EObject
+     * @return The category associated to a given EObject, if none is defined
+     *         the default one is returned
+     */
+    public String eefViewCategory(EObject eObject) {
+        String result = EditingDomainServices.DEFAULT_CATEGORY_NAME;
+        if (eObject instanceof EEFViewCategory) {
+            result = ((EEFViewCategory) eObject).getCategory();
+        }
+        return result;
+    }
+
+    /**
+     * Get the categories existing for all the features of a given EObject. If
+     * no category is defined a default one is created.
+     * 
+     * @param eObject
+     *            The EObject
+     * @return A list of EObjects representing the different categories ordered
+     *         by alphabetical order and with the default one at the end
+     */
+    public Collection<EEFViewCategory> eefViewCategories(EObject eObject) {
+        // Clear the visible features cache
+        visibleFeaturesCache.clear();
+
+        List<EEFViewCategory> categories = new ArrayList<EEFViewCategory>();
+
+        // Get all the visible features associated to an eObject
+        Collection<EStructuralFeature> features = getVisibleEStructuralFeatures(eObject);
+
+        // Get all the categories defined in the genmodel for all the features
+        // of the given EObject
+        Set<String> propertyDescriptorCategories = new HashSet<String>();
+        for (EStructuralFeature feature : features) {
+            String category = this.editServices.getPropertyDescriptorCategory(eObject, feature.getName());
+            if (category != null) {
+                propertyDescriptorCategories.add(category);
+            } else {
+                propertyDescriptorCategories.add(EditingDomainServices.DEFAULT_CATEGORY_NAME);
+            }
+        }
+
+        // Sort the categories by alphabetical order
+        List<String> sortedPropertyDescriptorCategories = new ArrayList<String>(propertyDescriptorCategories);
+        Collections.sort(sortedPropertyDescriptorCategories);
+
+        // Put the default category at the end of the list
+        if (sortedPropertyDescriptorCategories.contains(EditingDomainServices.DEFAULT_CATEGORY_NAME)) {
+            sortedPropertyDescriptorCategories.remove(EditingDomainServices.DEFAULT_CATEGORY_NAME);
+            sortedPropertyDescriptorCategories.add(EditingDomainServices.DEFAULT_CATEGORY_NAME);
+        }
+
+        // Create the EObjects associated to the visible categories
+        for (String category : sortedPropertyDescriptorCategories) {
+            EEFViewCategory eefViewCategory = new EEFViewCategory(eObject, category);
+            categories.add(eefViewCategory);
+        }
+
+        return categories;
+    }
+
+    /**
+     * Compute all the visible features (not derived, not transient, not a
+     * containment reference) associated to a given EObject.
+     * 
+     * @param eObject
+     *            The EObject
+     * @return List of visible features.
+     */
+    private Collection<EStructuralFeature> getVisibleEStructuralFeatures(EObject eObject) {
+        for (EStructuralFeature eStructuralFeature : eObject.eClass().getEAllStructuralFeatures()) {
+            if (!eStructuralFeature.isDerived() && !eStructuralFeature.isTransient() && !(eStructuralFeature instanceof EReference && ((EReference) eStructuralFeature).isContainment())) {
+                // Put the visible features in a cache in order that we go threw
+                // the features only once between the eefViewCategories service
+                // and the eefViewVisibleEStructuralFeaturesForCategory service
+                visibleFeaturesCache.add(eStructuralFeature);
+            }
+        }
+
+        return visibleFeaturesCache;
+    }
+
+    /**
+     * Get all the visible structural features associated to a category.
+     * 
+     * @param eObject
+     *            The category
+     * @return List of structural features which are visible in the given
+     *         category
+     */
+    public Collection<EStructuralFeature> eefViewEStructuralFeatures(EObject eObject) {
+        List<EStructuralFeature> result = new ArrayList<EStructuralFeature>();
+        // Get all the features associated to the eObject and filtered by
+        // category
+        if (eObject instanceof EEFViewCategory) {
+            String groupCategory = ((EEFViewCategory) eObject).getCategory();
+            for (EStructuralFeature eStructuralFeature : visibleFeaturesCache) {
+                String featureCategory = this.editServices.getPropertyDescriptorCategory(eObject, eStructuralFeature.getName());
+                if (groupCategory.equals(featureCategory)) {
+                    result.add(eStructuralFeature);
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
      * Executes the operation with the given URI.
      * 
      * @param eObject