Changed registration of Expressions Package

plugins/org.yakindu.base.expressions/META-INF/MANIFEST.MF

@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.emf.common,
  org.antlr.runtime,
  org.eclipse.xtext.common.types,
- org.yakindu.base.types;bundle-version="2.1.2"
+ org.yakindu.base.types;bundle-version="2.1.2",
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional
 Import-Package: org.apache.log4j,
  org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.xtext.xbase.lib

plugins/org.yakindu.base.expressions/model/Expressions.ecore

@@ -166,6 +166,6 @@
   <eClassifiers xsi:type="ecore:EClass" name="TypeCastExpression" eSuperTypes="#//Expression">
     <eStructuralFeatures xsi:type="ecore:EReference" name="operand" eType="#//Expression"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass ../../org.yakindu.base.types/model/types.ecore#//Type"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.yakindu.base.types/model/types.ecore#//Type"/>
   </eClassifiers>
 </ecore:EPackage>

plugins/org.yakindu.base.expressions/model/Expressions.genmodel

@@ -5,7 +5,7 @@
     forceOverwrite="true" modelName="Expressions" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
     editPluginID="org.yakindu.base.expressions.edit" editorPluginID="org.yakindu.base.expressions.editor"
-    runtimeVersion="2.9" usedGenPackages="../../org.yakindu.base.types/model/base.genmodel#//base ../../org.yakindu.base.types/model/types.genmodel#//types">
+    runtimeVersion="2.9" usedGenPackages="platform:/resource/org.yakindu.base.types/model/base.genmodel#//base platform:/resource/org.yakindu.base.types/model/types.genmodel#//types">
   <foreignModel>Expressions.ecore</foreignModel>
   <foreignModel>../../org.yakindu.base.types/model/types.ecore</foreignModel>
   <genPackages prefix="Expressions" basePackage="org.yakindu.base.expressions" disposableProviderFactory="true"

plugins/org.yakindu.base.expressions/src/org/yakindu/base/expressions/GenerateExpressions.mwe2

@@ -16,9 +16,9 @@ Workflow {
     	scanClassPath = true
     	platformUri = "${runtimeProject}/.."
 		registerGenModelFile = "platform:/resource/org.yakindu.base.expressions/model/Expressions.genmodel"
-		registerEcoreFile ="platform:/resource/org.yakindu.base.expressions/model/Expressions.ecore"
 		registerGenModelFile = "platform:/resource/org.yakindu.base.types/model/types.genmodel"
 		registerGeneratedEPackage = "org.yakindu.base.types.TypesPackage"
+		registerGeneratedEPackage = "org.yakindu.base.expressions.expressions.ExpressionsPackage"
     }
     
     component = DirectoryCleaner {
@@ -129,3 +129,4 @@ Workflow {
     }
 }
 
+