New Scope format: #String += 2..*

2 files changed, 8 insertions, 10 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
index 90093cf2..094e78ae 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
@@ -121,13 +121,12 @@
         eType="#//TypeScope" containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TypeScope">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="min" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="greather" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="greaterOrEqual" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//TypeReference"

         containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="less" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lessOrEqual" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="setsNew" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="setsSum" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="min" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxUnlimited" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="max" eType="ecore:EDataType platform:/resource/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TypeReference"/>

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
index 7c488ef0..70944294 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
@@ -110,12 +110,11 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//ScopeSpecification/scopes"/>

     </genClasses>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//TypeScope">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/min"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/greather"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/greaterOrEqual"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//TypeScope/type"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/less"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/lessOrEqual"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/setsNew"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/setsSum"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/min"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/maxUnlimited"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplicationConfiguration.ecore#//TypeScope/max"/>

     </genClasses>

     <genClasses ecoreClass="ApplicationConfiguration.ecore#//TypeReference"/>