Added new connection patterns to metamodel. Updated editors. Bug

correction in MWE2 generation scripts of XText editors.
This commit is contained in:
Arnaud Dieumegard
2019-01-10 16:19:07 +01:00
parent 79820f4433
commit 3bf1aadfd6
26 changed files with 11762 additions and 10298 deletions

View File

@@ -36,7 +36,7 @@ public enum LinkType implements Enumerator {
* @generated
* @ordered
*/
TRANSPOSE(0, "TRANSPOSE", "TRANSPOSE"),
TRANSPOSE(4, "TRANSPOSE", "TRANSPOSE"),
/**
* The '<em><b>IDENTITY</b></em>' literal object.
@@ -46,27 +46,26 @@ public enum LinkType implements Enumerator {
* @generated
* @ordered
*/
IDENTITY(1, "IDENTITY", "IDENTITY"),
IDENTITY(0, "IDENTITY", "IDENTITY"),
/**
* The '<em><b>SHIFT</b></em>' literal object.
* The '<em><b>SHIFTC</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #SHIFT_VALUE
* @see #SHIFTC_VALUE
* @generated
* @ordered
*/
SHIFT(2, "SHIFT", "SHIFT"),
SHIFTC(9, "SHIFTC", "SHIFTC"),
/**
* The '<em><b>FIRST</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #FIRST_VALUE
* @generated
* @ordered
*/
FIRST(3, "FIRST", "FIRST"),
* The '<em><b>FIRST</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #FIRST_VALUE
* @generated
* @ordered
*/
FIRST(1, "FIRST", "FIRST"),
/**
* The '<em><b>ROTATE</b></em>' literal object.
@@ -76,7 +75,70 @@ public enum LinkType implements Enumerator {
* @generated
* @ordered
*/
ROTATE(4, "ROTATE", "ROTATE");
ROTATE(3, "ROTATE", "ROTATE"),
/**
* The '<em><b>JOINC</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #JOINC_VALUE
* @generated
* @ordered
*/
JOINC(7, "JOINC", "JOINC"),
/**
* The '<em><b>JOINP</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #JOINP_VALUE
* @generated
* @ordered
*/
JOINP(8, "JOINP", "JOINP"),
/**
* The '<em><b>FORKC</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #FORKC_VALUE
* @generated
* @ordered
*/
FORKC(5, "FORKC", "FORKC"),
/**
* The '<em><b>FORKP</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #FORKP_VALUE
* @generated
* @ordered
*/
FORKP(6, "FORKP", "FORKP"),
/**
* The '<em><b>SHIFTP</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #SHIFTP_VALUE
* @generated
* @ordered
*/
SHIFTP(10, "SHIFTP", "SHIFTP"),
/**
* The '<em><b>FLATTENC</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #FLATTENC_VALUE
* @generated
* @ordered
*/
FLATTENC(11, "FLATTENC", "FLATTENC"),
/**
* The '<em><b>LAST</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #LAST_VALUE
* @generated
* @ordered
*/
LAST(2, "LAST", "LAST");
/**
* The '<em><b>TRANSPOSE</b></em>' literal value.
@@ -91,7 +153,7 @@ public enum LinkType implements Enumerator {
* @generated
* @ordered
*/
public static final int TRANSPOSE_VALUE = 0;
public static final int TRANSPOSE_VALUE = 4;
/**
* The '<em><b>IDENTITY</b></em>' literal value.
@@ -106,22 +168,22 @@ public enum LinkType implements Enumerator {
* @generated
* @ordered
*/
public static final int IDENTITY_VALUE = 1;
public static final int IDENTITY_VALUE = 0;
/**
* The '<em><b>SHIFT</b></em>' literal value.
* The '<em><b>SHIFTC</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>SHIFT</b></em>' literal object isn't clear,
* If the meaning of '<em><b>SHIFTC</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @see #SHIFT
* @see #SHIFTC
* @model
* @generated
* @ordered
*/
public static final int SHIFT_VALUE = 2;
public static final int SHIFTC_VALUE = 9;
/**
* The '<em><b>FIRST</b></em>' literal value.
@@ -136,7 +198,7 @@ public enum LinkType implements Enumerator {
* @generated
* @ordered
*/
public static final int FIRST_VALUE = 3;
public static final int FIRST_VALUE = 1;
/**
* The '<em><b>ROTATE</b></em>' literal value.
@@ -151,7 +213,112 @@ public enum LinkType implements Enumerator {
* @generated
* @ordered
*/
public static final int ROTATE_VALUE = 4;
public static final int ROTATE_VALUE = 3;
/**
* The '<em><b>JOINC</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>JOINC</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @see #JOINC
* @model
* @generated
* @ordered
*/
public static final int JOINC_VALUE = 7;
/**
* The '<em><b>JOINP</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>JOINP</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @see #JOINP
* @model
* @generated
* @ordered
*/
public static final int JOINP_VALUE = 8;
/**
* The '<em><b>FORKC</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>FORKC</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @see #FORKC
* @model
* @generated
* @ordered
*/
public static final int FORKC_VALUE = 5;
/**
* The '<em><b>FORKP</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>FORKP</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @see #FORKP
* @model
* @generated
* @ordered
*/
public static final int FORKP_VALUE = 6;
/**
* The '<em><b>SHIFTP</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>SHIFTP</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @see #SHIFTP
* @model
* @generated
* @ordered
*/
public static final int SHIFTP_VALUE = 10;
/**
* The '<em><b>FLATTENC</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>FLATTENC</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @see #FLATTENC
* @model
* @generated
* @ordered
*/
public static final int FLATTENC_VALUE = 11;
/**
* The '<em><b>LAST</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
* If the meaning of '<em><b>LAST</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @see #LAST
* @model
* @generated
* @ordered
*/
public static final int LAST_VALUE = 2;
/**
* An array of all the '<em><b>Link Type</b></em>' enumerators.
@@ -159,7 +326,8 @@ public enum LinkType implements Enumerator {
* <!-- end-user-doc -->
* @generated
*/
private static final LinkType[] VALUES_ARRAY = new LinkType[] { TRANSPOSE, IDENTITY, SHIFT, FIRST, ROTATE, };
private static final LinkType[] VALUES_ARRAY = new LinkType[] { TRANSPOSE, IDENTITY, SHIFTC, FIRST, ROTATE, JOINC,
JOINP, FORKC, FORKP, SHIFTP, FLATTENC, LAST, };
/**
* A public read-only list of all the '<em><b>Link Type</b></em>' enumerators.
@@ -219,12 +387,26 @@ public enum LinkType implements Enumerator {
return TRANSPOSE;
case IDENTITY_VALUE:
return IDENTITY;
case SHIFT_VALUE:
return SHIFT;
case SHIFTC_VALUE:
return SHIFTC;
case FIRST_VALUE:
return FIRST;
case ROTATE_VALUE:
return ROTATE;
case JOINC_VALUE:
return JOINC;
case JOINP_VALUE:
return JOINP;
case FORKC_VALUE:
return FORKC;
case FORKP_VALUE:
return FORKP;
case SHIFTP_VALUE:
return SHIFTP;
case FLATTENC_VALUE:
return FLATTENC;
case LAST_VALUE:
return LAST;
}
return null;
}

View File

@@ -13,8 +13,6 @@
package com.irtsaintexupery.pseim.pseim.impl;
import com.irtsaintexupery.pseim.pseim.*;
import com.irtsaintexupery.pseim.seim.Model;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;

View File

@@ -705,9 +705,16 @@ public class PseimPackageImpl extends EPackageImpl implements PseimPackage {
initEEnum(linkTypeEEnum, LinkType.class, "LinkType");
addEEnumLiteral(linkTypeEEnum, LinkType.TRANSPOSE);
addEEnumLiteral(linkTypeEEnum, LinkType.IDENTITY);
addEEnumLiteral(linkTypeEEnum, LinkType.SHIFT);
addEEnumLiteral(linkTypeEEnum, LinkType.SHIFTC);
addEEnumLiteral(linkTypeEEnum, LinkType.FIRST);
addEEnumLiteral(linkTypeEEnum, LinkType.ROTATE);
addEEnumLiteral(linkTypeEEnum, LinkType.JOINC);
addEEnumLiteral(linkTypeEEnum, LinkType.JOINP);
addEEnumLiteral(linkTypeEEnum, LinkType.FORKC);
addEEnumLiteral(linkTypeEEnum, LinkType.FORKP);
addEEnumLiteral(linkTypeEEnum, LinkType.SHIFTP);
addEEnumLiteral(linkTypeEEnum, LinkType.FLATTENC);
addEEnumLiteral(linkTypeEEnum, LinkType.LAST);
initEEnum(patternPortDirectionEEnum, PatternPortDirection.class, "PatternPortDirection");
addEEnumLiteral(patternPortDirectionEEnum, PatternPortDirection.UNSPECIFIED);