new metamodel

refs 2726

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

@@ -127,13 +127,15 @@
       </eAnnotations>
       <eStructuralFeatures xsi:type="ecore:EReference" name="constraintInstances"
           upperBound="-1" eType="#//constraints/ConstraintInstance"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="checksumsPerConstraintName"
+          upperBound="-1" eType="#//constraints/ConstraintNameToChecksum" containment="true"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="ConstraintInstance">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Constraint &quot;instance&quot;: link between the constrained element(s) and the constraint. Explicitly represented in the model in order to store the status and the checksum(s) of the constrained element(s)"/>
       </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="constrainedsWithChecksum"
-          upperBound="-1" eType="#//constraints/ConstrainedWithChecksum" containment="true"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="constraineds" upperBound="-1"
+          eType="#//constraints/IConstrained"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="status" eType="#//constraints/IConstraintInstanceStatus"
           containment="true"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -149,13 +151,6 @@
         </eAnnotations>
       </eOperations>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ConstrainedWithChecksum">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Pair of a reference to a constrained element, and the checksum of this element when the constraint was last checked."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="constrained" eType="#//constraints/IConstrained"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="checksum" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>
-    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="OutdatedConstraintInstanceStatus"
         eSuperTypes="#//constraints/IConstraintInstanceStatus"/>
     <eClassifiers xsi:type="ecore:EClass" name="FailedConstraintInstanceStatus" eSuperTypes="#//constraints/IConstraintInstanceStatus"/>
@@ -166,5 +161,9 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="constraintInstances"
           upperBound="-1" eType="#//constraints/ConstraintInstance" containment="true"/>
     </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ConstraintNameToChecksum" instanceClassName="java.util.Map$Entry">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>
+    </eClassifiers>
   </eSubpackages>
 </ecore:EPackage>

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

@@ -58,20 +58,16 @@
       <genClasses image="false" ecoreClass="kernel.ecore#//constraints/IConstrained">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference kernel.ecore#//constraints/IConstrained/constraintInstances"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference kernel.ecore#//constraints/IConstrained/checksumsPerConstraintName"/>
       </genClasses>
       <genClasses ecoreClass="kernel.ecore#//constraints/ConstraintInstance">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference kernel.ecore#//constraints/ConstraintInstance/constrainedsWithChecksum"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference kernel.ecore#//constraints/ConstraintInstance/constraineds"/>
         <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference kernel.ecore#//constraints/ConstraintInstance/status"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//constraints/ConstraintInstance/constraintName"/>
       </genClasses>
       <genClasses image="false" ecoreClass="kernel.ecore#//constraints/IConstraintInstanceStatus">
         <genOperations ecoreOperation="kernel.ecore#//constraints/IConstraintInstanceStatus/getConstraint"/>
       </genClasses>
-      <genClasses ecoreClass="kernel.ecore#//constraints/ConstrainedWithChecksum">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference kernel.ecore#//constraints/ConstrainedWithChecksum/constrained"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//constraints/ConstrainedWithChecksum/checksum"/>
-      </genClasses>
       <genClasses ecoreClass="kernel.ecore#//constraints/OutdatedConstraintInstanceStatus"/>
       <genClasses ecoreClass="kernel.ecore#//constraints/FailedConstraintInstanceStatus"/>
       <genClasses ecoreClass="kernel.ecore#//constraints/ErrorConstraintInstanceStatus"/>
@@ -79,6 +75,10 @@
       <genClasses image="false" ecoreClass="kernel.ecore#//constraints/IConstraintInstanceContainer">
         <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference kernel.ecore#//constraints/IConstraintInstanceContainer/constraintInstances"/>
       </genClasses>
+      <genClasses ecoreClass="kernel.ecore#//constraints/ConstraintNameToChecksum">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//constraints/ConstraintNameToChecksum/key"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//constraints/ConstraintNameToChecksum/value"/>
+      </genClasses>
     </nestedGenPackages>
   </genPackages>
 </genmodel:GenModel>