5 files changed, 62 insertions, 70 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"),

-

-        /**

-         * The '<em><b>Medium</b></em>' literal object.

+        DNEAR(0, "D_Near", "D_Near"), /**

+         * The '<em><b>DMed</b></em>' literal object.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

-         * @see #MEDIUM_VALUE

+         * @see #DMED_VALUE

          * @generated

          * @ordered

          */

-        MEDIUM(1, "Medium", "Medium"),

-

-        /**

-         * The '<em><b>Far</b></em>' literal object.

+        DMED(1, "D_Med", "D_Med"), /**

+         * The '<em><b>DFar</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

-         * @model name="Near"

+         * @see #DNEAR

+         * @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

-         * @model name="Medium"

+         * @see #DMED

+         * @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

-         * @model name="Far"

+         * @see #DFAR

+         * @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,

-                        MEDIUM,

-                        FAR,

+                        DNEAR,

+                        DMED,

+                        DFAR,

                 };

 

         /**

@@ -148,9 +144,9 @@ public enum Distance implements Enumerator {
          */

         public static Distance get(int value) {

                 switch (value) {

-                        case NEAR_VALUE: return NEAR;

-                        case MEDIUM_VALUE: return MEDIUM;

-                        case FAR_VALUE: return FAR;

+                        case DNEAR_VALUE: return DNEAR;

+                        case DMED_VALUE: return DMED;

+                        case DFAR_VALUE: return DFAR;

                 }

                 return null;

         }

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Size.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Size.java
index f4915b2e..1465201c 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/Size.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Size.java
@@ -19,67 +19,63 @@ import org.eclipse.emf.common.util.Enumerator;
  */

 public enum Size implements Enumerator {

         /**

-         * The '<em><b>Small</b></em>' literal object.

+         * The '<em><b>SSmall</b></em>' literal object.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

-         * @see #SMALL_VALUE

+         * @see #SSMALL_VALUE

          * @generated

          * @ordered

          */

-        SMALL(0, "Small", "Small"),

-

-        /**

-         * The '<em><b>Medium</b></em>' literal object.

+        SSMALL(0, "S_Small", "S_Small"), /**

+         * The '<em><b>SMed</b></em>' literal object.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

-         * @see #MEDIUM_VALUE

+         * @see #SMED_VALUE

          * @generated

          * @ordered

          */

-        MEDIUM(1, "Medium", "Medium"),

-

-        /**

-         * The '<em><b>Large</b></em>' literal object.

+        SMED(1, "S_Med", "S_Med"), /**

+         * The '<em><b>SLarge</b></em>' literal object.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

-         * @see #LARGE_VALUE

+         * @see #SLARGE_VALUE

          * @generated

          * @ordered

          */

-        LARGE(2, "Large", "Large");

+        SLARGE(2, "S_Large", "S_Large");

 

         /**

-         * The '<em><b>Small</b></em>' literal value.

+         * The '<em><b>SSmall</b></em>' literal value.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

-         * @see #SMALL

-         * @model name="Small"

+         * @see #SSMALL

+         * @model name="S_Small"

          * @generated

          * @ordered

          */

-        public static final int SMALL_VALUE = 0;

+        public static final int SSMALL_VALUE = 0;

 

         /**

-         * The '<em><b>Medium</b></em>' literal value.

+         * The '<em><b>SMed</b></em>' literal value.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

-         * @see #MEDIUM

-         * @model name="Medium"

+         * @see #SMED

+         * @model name="S_Med"

          * @generated

          * @ordered

          */

-        public static final int MEDIUM_VALUE = 1;

+        public static final int SMED_VALUE = 1;

 

         /**

-         * The '<em><b>Large</b></em>' literal value.

+         * The '<em><b>SLarge</b></em>' literal value.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

-         * @see #LARGE

-         * @model name="Large"

+         * @see #SLARGE

+         * @model name="S_Large"

          * @generated

          * @ordered

          */

-        public static final int LARGE_VALUE = 2;

+        public static final int SLARGE_VALUE = 2;

 

         /**

          * An array of all the '<em><b>Size</b></em>' enumerators.

@@ -89,9 +85,9 @@ public enum Size implements Enumerator {
          */

         private static final Size[] VALUES_ARRAY =

                 new Size[] {

-                        SMALL,

-                        MEDIUM,

-                        LARGE,

+                        SSMALL,

+                        SMED,

+                        SLARGE,

                 };

 

         /**

@@ -148,9 +144,9 @@ public enum Size implements Enumerator {
          */

         public static Size get(int value) {

                 switch (value) {

-                        case SMALL_VALUE: return SMALL;

-                        case MEDIUM_VALUE: return MEDIUM;

-                        case LARGE_VALUE: return LARGE;

+                        case SSMALL_VALUE: return SSMALL;

+                        case SMED_VALUE: return SMED;

+                        case SLARGE_VALUE: return SLARGE;

                 }

                 return null;

         }

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
index 6819135b..3d2ccc0d 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
@@ -754,14 +754,14 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
                 addEEnumLiteral(orientationEEnum, Orientation.HORIZONTAL);

 

                 initEEnum(sizeEEnum, Size.class, "Size");

-                addEEnumLiteral(sizeEEnum, Size.SMALL);

-                addEEnumLiteral(sizeEEnum, Size.MEDIUM);

-                addEEnumLiteral(sizeEEnum, Size.LARGE);

+                addEEnumLiteral(sizeEEnum, Size.SSMALL);

+                addEEnumLiteral(sizeEEnum, Size.SMED);

+                addEEnumLiteral(sizeEEnum, Size.SLARGE);

 

                 initEEnum(distanceEEnum, Distance.class, "Distance");

-                addEEnumLiteral(distanceEEnum, Distance.NEAR);

-                addEEnumLiteral(distanceEEnum, Distance.MEDIUM);

-                addEEnumLiteral(distanceEEnum, Distance.FAR);

+                addEEnumLiteral(distanceEEnum, Distance.DNEAR);

+                addEEnumLiteral(distanceEEnum, Distance.DMED);

+                addEEnumLiteral(distanceEEnum, Distance.DFAR);

 

                 // Create resource

                 createResource(eNS_URI);

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java
index a97c02fc..110f26c8 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java
@@ -71,7 +71,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
          * @generated

          * @ordered

          */

-        protected static final Size WIDTH_EDEFAULT = Size.SMALL;

+        protected static final Size WIDTH_EDEFAULT = Size.SSMALL;

 

         /**

          * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SeparationDistanceImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SeparationDistanceImpl.java
index bad91f1c..298a2121 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SeparationDistanceImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SeparationDistanceImpl.java
@@ -34,7 +34,7 @@ public class SeparationDistanceImpl extends SpatialRelationImpl implements Separ
          * @generated

          * @ordered

          */

-        protected static final Distance DISTANCE_EDEFAULT = Distance.NEAR;

+        protected static final Distance DISTANCE_EDEFAULT = Distance.DNEAR;

 

         /**

          * The cached value of the '{@link #getDistance() <em>Distance</em>}' attribute.