[506716] Remove obsolete schedule model content

3 files changed, 33 insertions, 108 deletions

diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/META-INF/MANIFEST.MF b/plugins/org.eclipse.qvtd.pivot.schedule/META-INF/MANIFEST.MF
index 4ca2f195f..47095d1b2 100644
--- a/plugins/org.eclipse.qvtd.pivot.schedule/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.qvtd.pivot.schedule/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.qvtd.pivot.schedule,
  org.eclipse.qvtd.pivot.schedule.impl,
- org.eclipse.qvtd.pivot.schedule.util,
- org.eclipse.qvtd.pivot.schedule.utilities
+ org.eclipse.qvtd.pivot.schedule.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.qvtd.pivot.qvtcore;bundle-version="[0.14.0,1.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/model/Schedule.ecore b/plugins/org.eclipse.qvtd.pivot.schedule/model/Schedule.ecore
index 4588ecb82..d7069082e 100644
--- a/plugins/org.eclipse.qvtd.pivot.schedule/model/Schedule.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.schedule/model/Schedule.ecore
@@ -1,66 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="schedule" nsURI="http://www.eclipse.org/qvt/2015/Schedule" nsPrefix="qvts">
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractDatum" abstract="true" eSuperTypes="#//ScheduleElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="super" upperBound="-1"
-        eType="#//AbstractDatum" eOpposite="#//AbstractDatum/sub"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sub" upperBound="-1" eType="#//AbstractDatum"
-        eOpposite="#//AbstractDatum/super"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domain" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore#//CoreDomain"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractDatum" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="producedBy" upperBound="-1"
-        eType="#//AbstractAction" eOpposite="#//AbstractAction/productions"/>
+        eType="#//MappingAction" eOpposite="#//MappingAction/productions"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="requiredBy" upperBound="-1"
-        eType="#//AbstractAction" derived="true" eOpposite="#//AbstractAction/requisites"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="schedule" eType="#//Schedule"
-        eOpposite="#//Schedule/datums"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataParameter" upperBound="-1"
-        eType="#//DataParameter" eOpposite="#//DataParameter/datum"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typedModel" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#//TypedModel"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractAction" abstract="true" eSuperTypes="#//ScheduleElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="productions" upperBound="-1"
-        eType="#//AbstractDatum" eOpposite="#//AbstractDatum/producedBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="requisites" upperBound="-1"
-        eType="#//AbstractDatum" eOpposite="#//AbstractDatum/requiredBy"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameterDerivations" upperBound="-1"
-        eType="#//ParameterDerivation" containment="true" eOpposite="#//ParameterDerivation/target"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="order" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//AbstractAction"
-        eOpposite="#//AbstractAction/children"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//AbstractAction" eOpposite="#//AbstractAction/parent"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
-        eType="#//DataParameter" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="results" upperBound="-1"
-        eType="#//DataParameter" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="schedule" eType="#//Schedule"
-        eOpposite="#//Schedule/actions"/>
+        eType="#//MappingAction" derived="true" eOpposite="#//MappingAction/requisites"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="typedModel" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#//TypedModel"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ClassDatum" eSuperTypes="#//AbstractDatum">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#//Class"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="completeClass" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#//CompleteClass"
         derived="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="propertyDatums" upperBound="-1"
         eType="#//PropertyDatum" containment="true" eOpposite="#//PropertyDatum/classDatum"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="schedule" lowerBound="1"
+        eType="#//Schedule" eOpposite="#//Schedule/datums"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="super" upperBound="-1"
+        eType="#//ClassDatum"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DataParameter" eSuperTypes="#//ScheduleElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#//Variable"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="secondaryParameter" eType="#//SecondaryParameter"
-        eOpposite="#//SecondaryParameter/dataParameter"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="datum" lowerBound="1" eType="#//AbstractDatum"
-        eOpposite="#//AbstractDatum/dataParameter"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InputAction" eSuperTypes="#//AbstractAction"/>
-  <eClassifiers xsi:type="ecore:EClass" name="MappingAction" eSuperTypes="#//AbstractAction">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mapping" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore#//Mapping"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OutputAction" eSuperTypes="#//AbstractAction"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ParameterDerivation" eSuperTypes="#//ScheduleElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//AbstractAction"
-        eOpposite="#//AbstractAction/parameterDerivations"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="primaryParameter" eType="#//DataParameter"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="secondaryParameter" eType="#//SecondaryParameter"
-        containment="true" eOpposite="#//SecondaryParameter/derivation"/>
+  <eClassifiers xsi:type="ecore:EClass" name="MappingAction">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mapping" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore#//Mapping"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="productions" upperBound="-1"
+        eType="#//AbstractDatum" eOpposite="#//AbstractDatum/producedBy"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="requisites" upperBound="-1"
+        eType="#//AbstractDatum" eOpposite="#//AbstractDatum/requiredBy"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="schedule" lowerBound="1"
+        eType="#//Schedule" eOpposite="#//Schedule/actions"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PropertyDatum" eSuperTypes="#//AbstractDatum">
     <eStructuralFeatures xsi:type="ecore:EReference" name="property" lowerBound="1"
@@ -68,20 +36,13 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="classDatum" lowerBound="1"
         eType="#//ClassDatum" eOpposite="#//ClassDatum/propertyDatums"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="opposite" eType="#//PropertyDatum"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="super" upperBound="-1"
+        eType="#//PropertyDatum"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Schedule" eSuperTypes="#//ScheduleElement">
+  <eClassifiers xsi:type="ecore:EClass" name="Schedule">
     <eStructuralFeatures xsi:type="ecore:EReference" name="datums" upperBound="-1"
-        eType="#//AbstractDatum" containment="true" eOpposite="#//AbstractDatum/schedule"/>
+        eType="#//ClassDatum" containment="true" eOpposite="#//ClassDatum/schedule"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"
-        eType="#//AbstractAction" containment="true" eOpposite="#//AbstractAction/schedule"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ScheduleElement" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SecondaryParameter" eSuperTypes="#//ScheduleElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isLoop" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="dataParameter" lowerBound="1"
-        eType="#//DataParameter" eOpposite="#//DataParameter/secondaryParameter"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="derivationProperty" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#//Property"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="derivation" eType="#//ParameterDerivation"
-        eOpposite="#//ParameterDerivation/secondaryParameter"/>
+        eType="#//MappingAction" containment="true" eOpposite="#//MappingAction/schedule"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.qvtd.pivot.schedule/model/Schedule.genmodel b/plugins/org.eclipse.qvtd.pivot.schedule/model/Schedule.genmodel
index 97e26d946..a5ddb8c49 100644
--- a/plugins/org.eclipse.qvtd.pivot.schedule/model/Schedule.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.schedule/model/Schedule.genmodel
@@ -8,70 +8,35 @@
   <genAnnotations source="http://www.eclipse.org/OCL/GenModel">
     <details key="Use Null Annotations" value="true"/>
   </genAnnotations>
-  <genAnnotations source="http://www.eclipse.org/OCL/GenModel/Visitor">
-    <details key="Root Visitor Class" value="org.eclipse.qvtd.pivot.schedule.util.ScheduleVisitor"/>
-    <details key="Derived Visitor Class" value="org.eclipse.qvtd.pivot.schedule.util.ScheduleVisitor"/>
-    <details key="Visitable Interface" value="org.eclipse.qvtd.pivot.schedule.ScheduleElement"/>
-    <details key="Visitable Classes" value="org.eclipse.qvtd.pivot.schedule.ScheduleElement"/>
-  </genAnnotations>
   <foreignModel>Schedule.ecore</foreignModel>
   <genPackages prefix="Schedule" basePackage="org.eclipse.qvtd.pivot" disposableProviderFactory="true"
       fileExtensions="qvts" ecorePackage="Schedule.ecore#/">
     <genClasses image="false" ecoreClass="Schedule.ecore#//AbstractDatum">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractDatum/super"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractDatum/sub"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractDatum/domain"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractDatum/producedBy"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractDatum/requiredBy"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractDatum/schedule"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractDatum/dataParameter"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractDatum/typedModel"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="Schedule.ecore#//AbstractAction">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractAction/productions"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractAction/requisites"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractAction/parameterDerivations"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Schedule.ecore#//AbstractAction/order"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractAction/parent"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractAction/children"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractAction/parameters"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractAction/results"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Schedule.ecore#//AbstractAction/schedule"/>
-    </genClasses>
     <genClasses ecoreClass="Schedule.ecore#//ClassDatum">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//ClassDatum/type"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//ClassDatum/completeClass"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Schedule.ecore#//ClassDatum/propertyDatums"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Schedule.ecore#//ClassDatum/schedule"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//ClassDatum/super"/>
     </genClasses>
-    <genClasses ecoreClass="Schedule.ecore#//DataParameter">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//DataParameter/variable"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//DataParameter/secondaryParameter"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//DataParameter/datum"/>
-    </genClasses>
-    <genClasses ecoreClass="Schedule.ecore#//InputAction"/>
     <genClasses ecoreClass="Schedule.ecore#//MappingAction">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//MappingAction/mapping"/>
-    </genClasses>
-    <genClasses ecoreClass="Schedule.ecore#//OutputAction"/>
-    <genClasses ecoreClass="Schedule.ecore#//ParameterDerivation">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Schedule.ecore#//ParameterDerivation/target"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Schedule.ecore#//ParameterDerivation/primaryParameter"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Schedule.ecore#//ParameterDerivation/secondaryParameter"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//MappingAction/productions"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//MappingAction/requisites"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Schedule.ecore#//MappingAction/schedule"/>
     </genClasses>
     <genClasses ecoreClass="Schedule.ecore#//PropertyDatum">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//PropertyDatum/property"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Schedule.ecore#//PropertyDatum/classDatum"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//PropertyDatum/opposite"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//PropertyDatum/super"/>
     </genClasses>
     <genClasses ecoreClass="Schedule.ecore#//Schedule">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Schedule.ecore#//Schedule/datums"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Schedule.ecore#//Schedule/actions"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="Schedule.ecore#//ScheduleElement"/>
-    <genClasses ecoreClass="Schedule.ecore#//SecondaryParameter">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Schedule.ecore#//SecondaryParameter/isLoop"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//SecondaryParameter/dataParameter"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Schedule.ecore#//SecondaryParameter/derivationProperty"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Schedule.ecore#//SecondaryParameter/derivation"/>
-    </genClasses>
   </genPackages>
 </genmodel:GenModel>