1 files changed, 27 insertions, 31 deletions
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java
index 68a0deb6..80731e1f 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java
@@ -19,67 +19,63 @@ import org.eclipse.emf.common.util.Enumerator;
 */
 public enum Distance implements Enumerator {
        /**
-         * The '<em><b>Near</b></em>' literal object.
+         * The '<em><b>DNear</b></em>' literal object.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
-         * @see #NEAR_VALUE
+         * @see #DNEAR_VALUE
         * @generated
         * @ordered
         */
-        NEAR(0, "Near", "Near"),
+        DNEAR(0, "D_Near", "D_Near"), /**
+         * The '<em><b>DMed</b></em>' literal object.
-        /**
-         * The '<em><b>Medium</b></em>' literal object.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
-         * @see #MEDIUM_VALUE
+         * @see #DMED_VALUE
         * @generated
         * @ordered
         */
-        MEDIUM(1, "Medium", "Medium"),
+        DMED(1, "D_Med", "D_Med"), /**
+         * The '<em><b>DFar</b></em>' literal object.
-        /**
-         * The '<em><b>Far</b></em>' literal object.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
-         * @see #FAR_VALUE
+         * @see #DFAR_VALUE
         * @generated
         * @ordered
         */
-        FAR(2, "Far", "Far");
+        DFAR(2, "D_Far", "D_Far");
        /**
-         * The '<em><b>Near</b></em>' literal value.
+         * The '<em><b>DNear</b></em>' literal value.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
-         * @see #NEAR
+         * @see #DNEAR
-         * @model name="Near"
+         * @model name="D_Near"
         * @generated
         * @ordered
         */
-        public static final int NEAR_VALUE = 0;
+        public static final int DNEAR_VALUE = 0;
        /**
-         * The '<em><b>Medium</b></em>' literal value.
+         * The '<em><b>DMed</b></em>' literal value.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
-         * @see #MEDIUM
+         * @see #DMED
-         * @model name="Medium"
+         * @model name="D_Med"
         * @generated
         * @ordered
         */
-        public static final int MEDIUM_VALUE = 1;
+        public static final int DMED_VALUE = 1;
        /**
-         * The '<em><b>Far</b></em>' literal value.
+         * The '<em><b>DFar</b></em>' literal value.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
-         * @see #FAR
+         * @see #DFAR
-         * @model name="Far"
+         * @model name="D_Far"
         * @generated
         * @ordered
         */
-        public static final int FAR_VALUE = 2;
+        public static final int DFAR_VALUE = 2;
        /**
         * An array of all the '<em><b>Distance</b></em>' enumerators.
@@ -89,9 +85,9 @@ public enum Distance implements Enumerator {
         */
        private static final Distance[] VALUES_ARRAY =
                new Distance[] {
-                        NEAR,
+                        DNEAR,
-                        MEDIUM,
+                        DMED,
-                        FAR,
+                        DFAR,
                };
        /**
@@ -148,9 +144,9 @@ public enum Distance implements Enumerator {
         */
        public static Distance get(int value) {
                switch (value) {
-                        case NEAR_VALUE: return NEAR;
+                        case DNEAR_VALUE: return DNEAR;
-                        case MEDIUM_VALUE: return MEDIUM;
+                        case DMED_VALUE: return DMED;
-                        case FAR_VALUE: return FAR;
+                        case DFAR_VALUE: return DFAR;
                }
                return null;
        }

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java index 68a0deb6..80731e1f 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java
@@ -19,67 +19,63 @@ import org.eclipse.emf.common.util.Enumerator;
19	*/	19	*/
20	public enum Distance implements Enumerator {	20	public enum Distance implements Enumerator {
21	/**	21	/**
22	* The '<em><b>Near</b></em>' literal object.	22	* The '<em><b>DNear</b></em>' literal object.
23	* <!-- begin-user-doc -->	23	* <!-- begin-user-doc -->
24	* <!-- end-user-doc -->	24	* <!-- end-user-doc -->
25	* @see #NEAR_VALUE	25	* @see #DNEAR_VALUE
26	* @generated	26	* @generated
27	* @ordered	27	* @ordered
28	*/	28	*/
29	NEAR(0, "Near", "Near"),	29	DNEAR(0, "D_Near", "D_Near"), /**
30		30	* The '<em><b>DMed</b></em>' literal object.
31	/**
32	* The '<em><b>Medium</b></em>' literal object.
33	* <!-- begin-user-doc -->	31	* <!-- begin-user-doc -->
34	* <!-- end-user-doc -->	32	* <!-- end-user-doc -->
35	* @see #MEDIUM_VALUE	33	* @see #DMED_VALUE
36	* @generated	34	* @generated
37	* @ordered	35	* @ordered
38	*/	36	*/
39	MEDIUM(1, "Medium", "Medium"),	37	DMED(1, "D_Med", "D_Med"), /**
40		38	* The '<em><b>DFar</b></em>' literal object.
41	/**
42	* The '<em><b>Far</b></em>' literal object.
43	* <!-- begin-user-doc -->	39	* <!-- begin-user-doc -->
44	* <!-- end-user-doc -->	40	* <!-- end-user-doc -->
45	* @see #FAR_VALUE	41	* @see #DFAR_VALUE
46	* @generated	42	* @generated
47	* @ordered	43	* @ordered
48	*/	44	*/
49	FAR(2, "Far", "Far");	45	DFAR(2, "D_Far", "D_Far");
50		46
51	/**	47	/**
52	* The '<em><b>Near</b></em>' literal value.	48	* The '<em><b>DNear</b></em>' literal value.
53	* <!-- begin-user-doc -->	49	* <!-- begin-user-doc -->
54	* <!-- end-user-doc -->	50	* <!-- end-user-doc -->
55	* @see #NEAR	51	* @see #DNEAR
56	* @model name="Near"	52	* @model name="D_Near"
57	* @generated	53	* @generated
58	* @ordered	54	* @ordered
59	*/	55	*/
60	public static final int NEAR_VALUE = 0;	56	public static final int DNEAR_VALUE = 0;
61		57
62	/**	58	/**
63	* The '<em><b>Medium</b></em>' literal value.	59	* The '<em><b>DMed</b></em>' literal value.
64	* <!-- begin-user-doc -->	60	* <!-- begin-user-doc -->
65	* <!-- end-user-doc -->	61	* <!-- end-user-doc -->
66	* @see #MEDIUM	62	* @see #DMED
67	* @model name="Medium"	63	* @model name="D_Med"
68	* @generated	64	* @generated
69	* @ordered	65	* @ordered
70	*/	66	*/
71	public static final int MEDIUM_VALUE = 1;	67	public static final int DMED_VALUE = 1;
72		68
73	/**	69	/**
74	* The '<em><b>Far</b></em>' literal value.	70	* The '<em><b>DFar</b></em>' literal value.
75	* <!-- begin-user-doc -->	71	* <!-- begin-user-doc -->
76	* <!-- end-user-doc -->	72	* <!-- end-user-doc -->
77	* @see #FAR	73	* @see #DFAR
78	* @model name="Far"	74	* @model name="D_Far"
79	* @generated	75	* @generated
80	* @ordered	76	* @ordered
81	*/	77	*/
82	public static final int FAR_VALUE = 2;	78	public static final int DFAR_VALUE = 2;
83		79
84	/**	80	/**
85	* An array of all the '<em><b>Distance</b></em>' enumerators.	81	* An array of all the '<em><b>Distance</b></em>' enumerators.
@@ -89,9 +85,9 @@ public enum Distance implements Enumerator {
89	*/	85	*/
90	private static final Distance[] VALUES_ARRAY =	86	private static final Distance[] VALUES_ARRAY =
91	new Distance[] {	87	new Distance[] {
92	NEAR,	88	DNEAR,
93	MEDIUM,	89	DMED,
94	FAR,	90	DFAR,
95	};	91	};
96		92
97	/**	93	/**
@@ -148,9 +144,9 @@ public enum Distance implements Enumerator {
148	*/	144	*/
149	public static Distance get(int value) {	145	public static Distance get(int value) {
150	switch (value) {	146	switch (value) {
151	case NEAR_VALUE: return NEAR;	147	case DNEAR_VALUE: return DNEAR;
152	case MEDIUM_VALUE: return MEDIUM;	148	case DMED_VALUE: return DMED;
153	case FAR_VALUE: return FAR;	149	case DFAR_VALUE: return DFAR;
154	}	150	}
155	return null;	151	return null;
156	}	152	}