makes previous AF3-specific elements more generic and moved them to the kernel (in tooling.base)

refs 2708

org.fortiss.tooling.base/trunk/model/base.ecore

@@ -187,6 +187,20 @@
         <eGenericType eTypeParameter="#//element/IDerivedAnnotation/T"/>
       </eOperations>
     </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IConstraintBasedProcess" abstract="true"
+        interface="true">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="currentObjective" eType="#//element/ConstraintConfiguration"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="constraintInstanceContainer"
+          eType="ecore:EClass platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//constraints/IConstraintInstanceContainer"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="configurations" upperBound="-1"
+          eType="#//element/ConstraintConfiguration" containment="true"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ConstraintConfiguration" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="activeConstraints" upperBound="-1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="includedConfigurations"
+          upperBound="-1" eType="#//element/ConstraintConfiguration"/>
+    </eClassifiers>
   </eSubpackages>
   <eSubpackages name="layout" nsURI="http://www.fortiss.org/tooling/base/model/layout"
       nsPrefix="org-fortiss-tooling-base-model-layout">
@@ -438,6 +452,8 @@
         <eTypeArguments eTypeParameter="#//base/DerivedAnnotationBase/T"/>
       </eGenericSuperTypes>
     </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ConstraintInstanceContainer" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//constraints/IConstraintInstanceContainer"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ConstraintBasedProcess" eSuperTypes="#//element/IConstraintBasedProcess"/>
   </eSubpackages>
   <eSubpackages name="visualization" nsURI="http://www.fortiss.org/tooling/base/model/visualization"
       nsPrefix="org-fortiss-tooling-base-model-visualization">

org.fortiss.tooling.base/trunk/model/base.genmodel

@@ -57,6 +57,18 @@
         <genOperations ecoreOperation="base.ecore#//element/IDerivedAnnotation/isUserAnnotatedValuePreferred"/>
         <genOperations ecoreOperation="base.ecore#//element/IDerivedAnnotation/getUserAnnotatedValue"/>
       </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//element/IConstraintBasedProcess">
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/IConstraintBasedProcess/currentObjective"/>
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/IConstraintBasedProcess/constraintInstanceContainer"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IConstraintBasedProcess/configurations"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//element/ConstraintConfiguration">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//element/ConstraintConfiguration/activeConstraints"/>
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/ConstraintConfiguration/includedConfigurations"/>
+      </genClasses>
     </nestedGenPackages>
     <nestedGenPackages prefix="Layout" basePackage="org.fortiss.tooling.base.model"
         disposableProviderFactory="true" ecorePackage="base.ecore#//layout">
@@ -152,6 +164,8 @@
         <genOperations ecoreOperation="base.ecore#//base/DerivedAnnotationBase/isUserAnnotatedValuePreferred"/>
         <genOperations ecoreOperation="base.ecore#//base/DerivedAnnotationBase/getUserAnnotatedValue"/>
       </genClasses>
+      <genClasses ecoreClass="base.ecore#//base/ConstraintInstanceContainer"/>
+      <genClasses ecoreClass="base.ecore#//base/ConstraintBasedProcess"/>
     </nestedGenPackages>
     <nestedGenPackages prefix="Visualization" basePackage="org.fortiss.tooling.base.model"
         disposableProviderFactory="true" ecorePackage="base.ecore#//visualization">