From 1d95bce680787cdc442265af63ce0c1db1b7df58 Mon Sep 17 00:00:00 2001
From: Vincent Aravantinos <aravantinos@fortiss.org>
Date: Thu, 14 Jul 2016 14:09:37 +0000
Subject: [PATCH] IConstraint -> Constraint refs 2553
---
org.fortiss.tooling.kernel/trunk/model/kernel.ecore | 9 +++++----
org.fortiss.tooling.kernel/trunk/model/kernel.genmodel | 9 ++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
index 288895c21..35beac5af 100644
--- a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
+++ b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
@@ -126,9 +126,9 @@
<details key="documentation" value="Element which can be constrained. Keeps track of all the constraints which apply to it."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"
- eType="#//constraints/IConstraint"/>
+ eType="#//constraints/Constraint"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IConstraint" abstract="true" interface="true">
+ <eClassifiers xsi:type="ecore:EClass" name="Constraint">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Constraint. Can be anything as long as there is a corresponding ConstraintVerifier."/>
</eAnnotations>
@@ -136,13 +136,14 @@
upperBound="-1" eType="#//constraints/ConstrainedWithChecksum" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="verificationStatus" eType="#//constraints/IConstraintVerificationStatus"
containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintTypeID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IConstraintVerificationStatus" abstract="true"
interface="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Status of verification of a constraint. Typically, should denote "Success", "Fail", "Outdated" or "Error" with possible specializations depending on the particular constraints."/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="constraint" eType="#//constraints/IConstraint"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="constraint" eType="#//constraints/Constraint"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ConstrainedWithChecksum">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -158,7 +159,7 @@
<eClassifiers xsi:type="ecore:EClass" name="IConstraintContainer" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="constraints" upperBound="-1"
- eType="#//constraints/IConstraint" containment="true"/>
+ eType="#//constraints/Constraint" containment="true"/>
</eClassifiers>
</eSubpackages>
</ecore:EPackage>
diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
index 3c2f4e969..4b13539f5 100644
--- a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
+++ b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
@@ -58,11 +58,10 @@
<genClasses image="false" ecoreClass="kernel.ecore#//constraints/IConstrained">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference kernel.ecore#//constraints/IConstrained/constraints"/>
</genClasses>
- <genClasses image="false" ecoreClass="kernel.ecore#//constraints/IConstraint">
- <genFeatures notify="false" createChild="false" propertySortChoices="true"
- ecoreFeature="ecore:EReference kernel.ecore#//constraints/IConstraint/constrainedsWithChecksum"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true"
- ecoreFeature="ecore:EReference kernel.ecore#//constraints/IConstraint/verificationStatus"/>
+ <genClasses image="false" ecoreClass="kernel.ecore#//constraints/Constraint">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference kernel.ecore#//constraints/Constraint/constrainedsWithChecksum"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference kernel.ecore#//constraints/Constraint/verificationStatus"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//constraints/Constraint/constraintTypeID"/>
</genClasses>
<genClasses ecoreClass="kernel.ecore#//constraints/IConstraintVerificationStatus">
<genFeatures notify="false" createChild="false" propertySortChoices="true"
--
GitLab