SEIM element name cardinality correction. Regenerated code.

eclipse/plugins/com.irtsaintexupery.pseim/src-gen/com/irtsaintexupery/pseim/pseim/LinkType.java

@@ -58,13 +58,13 @@ public enum LinkType implements Enumerator {
 	 */
 	SHIFTC(9, "SHIFTC", "SHIFTC"),
 	/**
-	* The '<em><b>FIRST</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>FIRST</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #FIRST_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #FIRST_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	FIRST(1, "FIRST", "FIRST"),
 
 	/**
@@ -77,67 +77,67 @@ public enum LinkType implements Enumerator {
 	 */
 	ROTATE(3, "ROTATE", "ROTATE"),
 	/**
-	* The '<em><b>JOINC</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>JOINC</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #JOINC_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #JOINC_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	JOINC(7, "JOINC", "JOINC"),
 	/**
-	* The '<em><b>JOINP</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>JOINP</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #JOINP_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #JOINP_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	JOINP(8, "JOINP", "JOINP"),
 	/**
-	* The '<em><b>FORKC</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>FORKC</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #FORKC_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #FORKC_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	FORKC(5, "FORKC", "FORKC"),
 	/**
-	* The '<em><b>FORKP</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>FORKP</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #FORKP_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #FORKP_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	FORKP(6, "FORKP", "FORKP"),
 	/**
-	* The '<em><b>SHIFTP</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>SHIFTP</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #SHIFTP_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #SHIFTP_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	SHIFTP(10, "SHIFTP", "SHIFTP"),
 	/**
-	* The '<em><b>FLATTENC</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>FLATTENC</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #FLATTENC_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #FLATTENC_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	FLATTENC(11, "FLATTENC", "FLATTENC"),
 	/**
-	* The '<em><b>LAST</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>LAST</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #LAST_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #LAST_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	LAST(2, "LAST", "LAST");
 
 	/**

eclipse/plugins/com.irtsaintexupery.pseim/src-gen/com/irtsaintexupery/pseim/seim/NamedElement.java

@@ -45,7 +45,7 @@ public interface NamedElement extends IdentifiedElement {
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see com.irtsaintexupery.pseim.seim.SeimPackage#getNamedElement_Name()
-	 * @model
+	 * @model required="true"
 	 * @generated
 	 */
 	String getName();

eclipse/plugins/com.irtsaintexupery.pseim/src-gen/com/irtsaintexupery/pseim/seim/Property.java

@@ -30,7 +30,7 @@ package com.irtsaintexupery.pseim.seim;
  * @see com.irtsaintexupery.pseim.seim.SeimPackage#getProperty()
  * @model interface="true" abstract="true"
  *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='keyNotNull'"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot keyNotNull='key <> \'\''"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot keyNotNull='not(key.oclIsUndefined()) and key <> \'\''"
  * @generated
  */
 public interface Property extends IdentifiedElement {

eclipse/plugins/com.irtsaintexupery.pseim/src-gen/com/irtsaintexupery/pseim/seim/impl/SeimPackageImpl.java

@@ -693,7 +693,7 @@ public class SeimPackageImpl extends EPackageImpl implements SeimPackage {
 
 		initEClass(namedElementEClass, NamedElement.class, "NamedElement", IS_ABSTRACT, IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNamedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedElement.class,
+		initEAttribute(getNamedElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, NamedElement.class,
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(identifiedElementEClass, IdentifiedElement.class, "IdentifiedElement", IS_ABSTRACT, IS_INTERFACE,
@@ -768,7 +768,8 @@ public class SeimPackageImpl extends EPackageImpl implements SeimPackage {
 	 */
 	protected void createPivotAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot";
-		addAnnotation(propertyEClass, source, new String[] { "keyNotNull", "key <> \'\'" });
+		addAnnotation(propertyEClass, source,
+				new String[] { "keyNotNull", "not(key.oclIsUndefined()) and key <> \'\'" });
 		addAnnotation(propertyHolderEClass, source,
 				new String[] { "uniqueKeys", "properties->forAll(p1, p2 | p1 <> p2 implies p1.key <> p2.key)" });
 		addAnnotation(namedElementEClass, source, new String[] { "nameNotEmpty", "name <> \'\'" });

eclipse/plugins/com.irtsaintexupery.pseim/src-gen/com/irtsaintexupery/pseim/seim/util/SeimValidator.java

@@ -304,7 +304,7 @@ public class SeimValidator extends EObjectValidator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static final String PROPERTY__KEY_NOT_NULL__EEXPRESSION = "key <> ''";
+	protected static final String PROPERTY__KEY_NOT_NULL__EEXPRESSION = "not(key.oclIsUndefined()) and key <> ''";
 
 	/**
 	 * Validates the keyNotNull constraint of '<em>Property</em>'.