4 files changed, 76 insertions, 6 deletions

diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java
index 6ec86cb6..60947533 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java
@@ -60,6 +60,7 @@ public class Modes3FactoryImpl extends EFactoryImpl implements Modes3Factory {
                         case Modes3Package.MODES3_MODEL_ROOT: return createModes3ModelRoot();
                         case Modes3Package.TURNOUT: return createTurnout();
                         case Modes3Package.TRAIN: return createTrain();
+                        case Modes3Package.SIMPLE_SEGMENT: return createSimpleSegment();
                         default:
                                 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
                 }
@@ -110,6 +111,16 @@ public class Modes3FactoryImpl extends EFactoryImpl implements Modes3Factory {
          * <!-- end-user-doc -->
          * @generated
          */
+        public SimpleSegment createSimpleSegment() {
+                SimpleSegmentImpl simpleSegment = new SimpleSegmentImpl();
+                return simpleSegment;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public Modes3Package getModes3Package() {
                 return (Modes3Package)getEPackage();
         }
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java
index d1ee25ff..ccab1f29 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 
 import modes3.Modes3ModelRoot;
 import modes3.Modes3Package;
-import modes3.Segment;
+import modes3.SimpleSegment;
 import modes3.Train;
 import modes3.Turnout;
 
@@ -79,7 +79,7 @@ public class Modes3ModelRootImpl extends MinimalEObjectImpl.Container implements
          * @generated
          * @ordered
          */
-        protected EList<Segment> segments;
+        protected EList<SimpleSegment> segments;
 
         /**
          * The cached value of the '{@link #getTurnouts() <em>Turnouts</em>}' containment reference list.
@@ -148,9 +148,9 @@ public class Modes3ModelRootImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->
          * @generated
          */
-        public EList<Segment> getSegments() {
+        public EList<SimpleSegment> getSegments() {
                 if (segments == null) {
-                        segments = new EObjectContainmentEList<Segment>(Segment.class, this, Modes3Package.MODES3_MODEL_ROOT__SEGMENTS);
+                        segments = new EObjectContainmentEList<SimpleSegment>(SimpleSegment.class, this, Modes3Package.MODES3_MODEL_ROOT__SEGMENTS);
                 }
                 return segments;
         }
@@ -223,7 +223,7 @@ public class Modes3ModelRootImpl extends MinimalEObjectImpl.Container implements
                                 return;
                         case Modes3Package.MODES3_MODEL_ROOT__SEGMENTS:
                                 getSegments().clear();
-                                getSegments().addAll((Collection<? extends Segment>)newValue);
+                                getSegments().addAll((Collection<? extends SimpleSegment>)newValue);
                                 return;
                         case Modes3Package.MODES3_MODEL_ROOT__TURNOUTS:
                                 getTurnouts().clear();
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java
index 2b9e828c..557da4c1 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java
@@ -6,6 +6,7 @@ import modes3.Modes3Factory;
 import modes3.Modes3ModelRoot;
 import modes3.Modes3Package;
 import modes3.Segment;
+import modes3.SimpleSegment;
 import modes3.Train;
 import modes3.Turnout;
 
@@ -52,6 +53,13 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
         private EClass trainEClass = null;
 
         /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass simpleSegmentEClass = null;
+
+        /**
          * Creates an instance of the model <b>Package</b>, registered with
          * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
          * package URI value.
@@ -261,6 +269,15 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
          * <!-- end-user-doc -->
          * @generated
          */
+        public EClass getSimpleSegment() {
+                return simpleSegmentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public Modes3Factory getModes3Factory() {
                 return (Modes3Factory)getEFactoryInstance();
         }
@@ -303,6 +320,8 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
                 createEReference(trainEClass, TRAIN__LOCATION);
                 createEAttribute(trainEClass, TRAIN__ID);
                 createEAttribute(trainEClass, TRAIN__SPEED);
+
+                simpleSegmentEClass = createEClass(SIMPLE_SEGMENT);
         }
 
         /**
@@ -334,6 +353,7 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
 
                 // Add supertypes to classes
                 turnoutEClass.getESuperTypes().add(this.getSegment());
+                simpleSegmentEClass.getESuperTypes().add(this.getSegment());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(segmentEClass, Segment.class, "Segment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -344,7 +364,7 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
                 initEClass(modes3ModelRootEClass, Modes3ModelRoot.class, "Modes3ModelRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
                 initEAttribute(getModes3ModelRoot_Id(), ecorePackage.getEInt(), "id", null, 0, 1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getModes3ModelRoot_Trains(), this.getTrain(), null, "trains", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getModes3ModelRoot_Segments(), this.getSegment(), null, "segments", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getModes3ModelRoot_Segments(), this.getSimpleSegment(), null, "segments", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getModes3ModelRoot_Turnouts(), this.getTurnout(), null, "turnouts", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(turnoutEClass, Turnout.class, "Turnout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -356,6 +376,8 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
                 initEAttribute(getTrain_Id(), ecorePackage.getEInt(), "id", null, 0, 1, Train.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getTrain_Speed(), ecorePackage.getEDouble(), "speed", null, 0, 1, Train.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+                initEClass(simpleSegmentEClass, SimpleSegment.class, "SimpleSegment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
                 // Create resource
                 createResource(eNS_URI);
         }
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java
new file mode 100644
index 00000000..e3fd6c34
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package modes3.impl;
+
+import modes3.Modes3Package;
+import modes3.SimpleSegment;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Simple Segment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SimpleSegmentImpl extends SegmentImpl implements SimpleSegment {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected SimpleSegmentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return Modes3Package.Literals.SIMPLE_SEGMENT;
+        }
+
+} //SimpleSegmentImpl