Skip to content
Snippets Groups Projects
Commit 966f98da authored by Johannes Eder's avatar Johannes Eder
Browse files

fixed master merge conflict 

Issue-Ref: 3974
Issue-Url: https://af3-developer.fortiss.org/issues/3974



Signed-off-by: default avatarJohannes Eder <eder@fortiss.org>
parents 8559fbe8 85c92880
No related branches found
No related tags found
1 merge request!1083969
Hide whitespace changes
Inline Side-by-side
org.fortiss.tooling.kernel/model/.ratings
+ 1
− 1
View file @ 966f98da
kernel.ecore 4a3d1961b1e127d034898770d2899ac722d690a7 GREEN
kernel.ecore 0b76d12b66f6d7f045a547bb1775428075c82ced GREEN
org.fortiss.tooling.kernel/model/kernel.ecore
+ 0
− 105
View file @ 966f98da
......@@ -144,109 +144,4 @@
<eParameters name="target" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</eOperations>
</eClassifiers>
<eSubpackages name="constraints" nsURI="http://www.fortiss.org/tooling/base/model/element/constraints"
nsPrefix="org-fortiss-tooling-kernel-constraints">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: Consolidate with constraint metaclasses in tooling.base."/>
</eAnnotations>
<eClassifiers xsi:type="ecore:EClass" name="IConstrained" abstract="true" interface="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<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="constraintInstances"
upperBound="-1" eType="#//constraints/ConstraintInstance">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="checksumsPerConstraintName"
upperBound="-1" eType="#//constraints/ConstraintNameToChecksum" containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
</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="constraineds" upperBound="-1"
eType="#//constraints/IConstrained">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="status" eType="#//constraints/IConstraintInstanceStatus"
containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="constraintName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IConstraintInstanceStatus" 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 &quot;Success&quot;, &quot;Fail&quot;, &quot;Outdated&quot; or &quot;Error&quot; with possible specializations depending on the particular constraints."/>
</eAnnotations>
<eOperations name="getConstraint" eType="#//constraints/ConstraintInstance">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return (ConstraintInstance)this.eContainer();"/>
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="OutdatedConstraintInstanceStatus"
eSuperTypes="#//constraints/IConstraintInstanceStatus">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Status that indicates that the verification of a constraint is outdated."/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FailedConstraintInstanceStatus" eSuperTypes="#//constraints/IConstraintInstanceStatus">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Status that indicates that the verification of a constraint has failed."/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ErrorConstraintInstanceStatus" eSuperTypes="#//constraints/IConstraintInstanceStatus">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Status that indicates that an error has occurred during the verification of a constraint."/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SuccessConstraintInstanceStatus" eSuperTypes="#//constraints/IConstraintInstanceStatus">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Status that indicates that a constraint has succesfully been verified."/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IConstraintInstanceContainer" abstract="true"
interface="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Container to group multiple constraint instances."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="constraintInstances"
upperBound="-1" eType="#//constraints/ConstraintInstance" containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ConstraintNameToChecksum" instanceClassName="java.util.Map$Entry">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Map type to map constraint names to checksum values."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="TODO: write documentation (in the model!)"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
</eSubpackages>
</ecore:EPackage>
org.fortiss.tooling.kernel/model/kernel.genmodel
+ 0
− 28
View file @ 966f98da
......@@ -54,33 +54,5 @@
<genParameters ecoreParameter="kernel.ecore#//ISpeciallyCopyiable/canPaste/target"/>
</genOperations>
</genClasses>
<nestedGenPackages prefix="Constraints" basePackage="org.fortiss.tooling.kernel.model"
disposableProviderFactory="true" ecorePackage="kernel.ecore#//constraints">
<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/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"
body="return (ConstraintInstance)this.eContainer();"/>
</genClasses>
<genClasses ecoreClass="kernel.ecore#//constraints/OutdatedConstraintInstanceStatus"/>
<genClasses ecoreClass="kernel.ecore#//constraints/FailedConstraintInstanceStatus"/>
<genClasses ecoreClass="kernel.ecore#//constraints/ErrorConstraintInstanceStatus"/>
<genClasses ecoreClass="kernel.ecore#//constraints/SuccessConstraintInstanceStatus"/>
<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>
org.fortiss.tooling.kernel/plugin.xml
+ 0
− 8
View file @ 966f98da
......@@ -22,14 +22,6 @@
</package>
</extension>
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated kernel -->
<package
uri="http://www.fortiss.org/tooling/base/model/element/constraints"
class="org.fortiss.tooling.kernel.model.constraints.ConstraintsPackage"
genModel="model/kernel.genmodel"/>
</extension>
<extension
point="org.fortiss.tooling.kernel.modelPrototypeProvider">
<modelPrototypeProvider
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment