replaced plugin with resource reference in ecore

refs 1411

replaced plugin with resource reference in ecore
refs 1411
8986d291 · Florian Hölzl · f8209697 · 8986d291 · 8986d291 · 8986d291
Commit 8986d291 authored Jul 02, 2013 by Florian Hölzl
20 changed files
--- a/org.fortiss.af3.component/trunk/model/component.ecore
+++ b/org.fortiss.af3.component/trunk/model/component.ecore
--- a/org.fortiss.af3.component/trunk/model/component.genmodel
+++ b/org.fortiss.af3.component/trunk/model/component.genmodel
@@ -8,7 +8,7 @@
    editorPluginClass="org.fortiss.af3.component.model.presentation.ModelEditorPlugin"
    testsDirectory="/org.fortiss.af3.component.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
    containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false"
-    language="" usedGenPackages="platform:/plugin/org.fortiss.tooling.base/model/base.genmodel#//model platform:/plugin/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/plugin/org.fortiss.af3.project/model/project.genmodel#//model platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
+    language="" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
  <foreignModel>component.ecore</foreignModel>
  <genPackages prefix="AF3Component" basePackage="org.fortiss.af3.component" disposableProviderFactory="true"
      ecorePackage="component.ecore#/">

--- a/org.fortiss.af3.deployment/trunk/model/deployment.ecore
+++ b/org.fortiss.af3.deployment/trunk/model/deployment.ecore
@@ -3,7 +3,7 @@
    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
    nsURI="http://www.fortiss.org/af3/deployment" nsPrefix="org-fortiss-af3-deployment">
-  <eClassifiers xsi:type="ecore:EClass" name="Deployment" eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//IProjectRootElement platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
+  <eClassifiers xsi:type="ecore:EClass" name="Deployment" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//IProjectRootElement platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
    <eStructuralFeatures xsi:type="ecore:EReference" name="componentArchitectureReference"
        eType="#//ComponentArchitectureReference" containment="true"/>
    <eStructuralFeatures xsi:type="ecore:EReference" name="platformArchitectureReference"
@@ -14,8 +14,8 @@
        eType="#//PortAllocation" containment="true"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="ComponentAllocation">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//Component"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="executionUnit" eType="ecore:EClass platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="executionUnit" eType="ecore:EClass platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit"/>
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="WCET" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
        defaultValueLiteral="10"/>
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="RAM" unique="false" lowerBound="1"
@@ -23,18 +23,18 @@
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="PortAllocation" abstract="true" interface="true"/>
  <eClassifiers xsi:type="ecore:EClass" name="InputPortAllocation" eSuperTypes="#//PortAllocation">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputPort" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//InputPort"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="receiver" eType="ecore:EClass platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//Receiver"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputPort" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//InputPort"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="receiver" eType="ecore:EClass platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="OutputPortAllocation" eSuperTypes="#//PortAllocation">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputPort" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//OutputPort"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="transmitter" eType="ecore:EClass platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//Transmitter"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="outputPort" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//OutputPort"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="transmitter" eType="ecore:EClass platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter"/>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentArchitectureReference" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementReference"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PlatformArchitectureReference" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementReference"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ComponentArchitectureReference" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementReference"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PlatformArchitectureReference" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementReference"/>
  <eClassifiers xsi:type="ecore:EClass" name="TransceiverAllocation" eSuperTypes="#//PortAllocation">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="port" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//Port"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="transceiver" eType="ecore:EClass platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//Transceiver"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="port" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Port"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="transceiver" eType="ecore:EClass platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transceiver"/>
  </eClassifiers>
  <eSubpackages name="generator" nsURI="http://www.fortiss.org/af3/deployment/generator"
      nsPrefix="org-fortiss-af3-deployment-generator"/>

--- a/org.fortiss.af3.deployment/trunk/model/deployment.genmodel
+++ b/org.fortiss.af3.deployment/trunk/model/deployment.genmodel
@@ -8,7 +8,7 @@
    editorPluginClass="org.fortiss.af3.deployment.model.presentation.ModelEditorPlugin"
    testsDirectory="/org.fortiss.af3.deployment.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
    containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false"
-    language="" usedGenPackages="platform:/plugin/org.fortiss.tooling.base/model/base.genmodel#//model platform:/plugin/org.fortiss.af3.component/model/component.genmodel#//model platform:/plugin/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/plugin/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/plugin/org.fortiss.af3.project/model/project.genmodel#//model platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
+    language="" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
  <foreignModel>deployment.ecore</foreignModel>
  <genPackages prefix="AF3Deployment" basePackage="org.fortiss.af3.deployment" disposableProviderFactory="true"
      ecorePackage="deployment.ecore#/">

--- a/org.fortiss.af3.expression/trunk/model/expression.ecore
+++ b/org.fortiss.af3.expression/trunk/model/expression.ecore
--- a/org.fortiss.af3.expression/trunk/model/expression.genmodel
+++ b/org.fortiss.af3.expression/trunk/model/expression.genmodel
@@ -8,7 +8,7 @@
    editorPluginClass="org.fortiss.af3.expression.model.presentation.ModelEditorPlugin"
    testsDirectory="/org.fortiss.af3.expression.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
    containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false"
-    language="" usedGenPackages="platform:/plugin/org.fortiss.af3.project/model/project.genmodel#//model platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/plugin/org.fortiss.tooling.base/model/base.genmodel#//model">
+    language="" usedGenPackages="platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model">
  <foreignModel>expression.ecore</foreignModel>
  <genPackages prefix="AF3Expression" basePackage="org.fortiss.af3.expression" disposableProviderFactory="true"
      ecorePackage="expression.ecore#/">

--- a/org.fortiss.af3.generator.common/trunk/model/languages.ecore
+++ b/org.fortiss.af3.generator.common/trunk/model/languages.ecore
@@ -168,7 +168,7 @@
      <eStructuralFeatures xsi:type="ecore:EReference" name="definition" eType="#//c/CFunctionDefinition"
          eOpposite="#//c/CFunctionDefinition/declaration"/>
    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="CFunctionDefinition" eSuperTypes="#//source/Definition platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
+    <eClassifiers xsi:type="ecore:EClass" name="CFunctionDefinition" eSuperTypes="#//source/Definition platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
      <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
          <details key="body" value="return org.fortiss.af3.generator.common.textgen.c.CLanguageConstructTextGenerator.functionDefinitionToString(this);"/>
@@ -176,15 +176,15 @@
      </eOperations>
      <eStructuralFeatures xsi:type="ecore:EReference" name="declaration" eType="#//c/CFunctionDeclaration"
          eOpposite="#//c/CFunctionDeclaration/definition"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"
          containment="true"/>
      <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
          eType="#//c/CVariable" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
          containment="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="CTypeDeclaration" abstract="true"
-        eSuperTypes="#//source/Declaration platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement"/>
+        eSuperTypes="#//source/Declaration platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement"/>
    <eClassifiers xsi:type="ecore:EClass" name="CVariableDeclaration" eSuperTypes="#//source/Declaration">
      <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -195,13 +195,13 @@
      <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//c/CVariable"
          containment="true"/>
    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="CVariable" eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
+    <eClassifiers xsi:type="ecore:EClass" name="CVariable" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
      <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
          <details key="body" value="return org.fortiss.af3.generator.common.textgen.c.CLanguageConstructTextGenerator.variableDefinitionToString(this);"/>
        </eAnnotations>
      </eOperations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"
          containment="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="CMakedefsFile" eSuperTypes="#//source/SourceUnit">
@@ -226,16 +226,16 @@
        </eAnnotations>
      </eOperations>
    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="CStaticArrayDeclaration" eSuperTypes="#//source/Declaration platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
+    <eClassifiers xsi:type="ecore:EClass" name="CStaticArrayDeclaration" eSuperTypes="#//source/Declaration platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
      <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
          <details key="body" value="return org.fortiss.af3.generator.common.textgen.c.CLanguageConstructTextGenerator.staticArrayDeclarationToString(this);"/>
        </eAnnotations>
      </eOperations>
      <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
-          eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
+          eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="baseType" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="baseType" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"/>
    </eClassifiers>
    <eSubpackages name="types" nsURI="http://www.fortiss.org/af3/generator/common/languages/c/types"
        nsPrefix="org-fortiss-af3-generator-common-languages-c-types">
@@ -274,7 +274,7 @@
        </eOperations>
      </eClassifiers>
      <eClassifiers xsi:type="ecore:EClass" name="ICRawType" abstract="true" interface="true"
-          eSuperTypes="platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"/>
+          eSuperTypes="platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"/>
      <eClassifiers xsi:type="ecore:EClass" name="CStructureDeclaration" eSuperTypes="#//c/CTypeDeclaration">
        <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
          <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -286,7 +286,7 @@
      </eClassifiers>
      <eClassifiers xsi:type="ecore:EClass" name="CStructureMember">
        <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"/>
+        <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"/>
      </eClassifiers>
      <eClassifiers xsi:type="ecore:EClass" name="CArrayDeclaration" eSuperTypes="#//c/CTypeDeclaration">
        <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
@@ -294,7 +294,7 @@
            <details key="body" value="return org.fortiss.af3.generator.common.textgen.c.CLanguageTypesTextGenerator.arrayDeclarationToString(this);"/>
          </eAnnotations>
        </eOperations>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"/>
+        <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"/>
        <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
      </eClassifiers>
    </eSubpackages>
@@ -366,7 +366,7 @@
      </eOperations>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
      <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
-          eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
+          eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
          containment="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="JavaImport" eSuperTypes="#//source/Import">
@@ -389,17 +389,17 @@
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="modifiers" upperBound="-1"
          eType="#//java/JavaModifier"/>
    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="JavaMethodDefinition" eSuperTypes="#//source/Definition platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement #//java/JavaModified #//java/JavaAnnotated">
+    <eClassifiers xsi:type="ecore:EClass" name="JavaMethodDefinition" eSuperTypes="#//source/Definition platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement #//java/JavaModified #//java/JavaAnnotated">
      <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
          <details key="body" value="return org.fortiss.af3.generator.common.textgen.java.JavaLanguageConstructTextGenerator.methodDefinitionToString(this);"/>
        </eAnnotations>
      </eOperations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"
          containment="true"/>
      <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
          eType="#//java/JavaVariable" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
          containment="true"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="thrownExceptionIds" upperBound="-1"
          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -413,13 +413,13 @@
      <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//java/JavaVariable"
          containment="true"/>
    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="JavaVariable" eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
+    <eClassifiers xsi:type="ecore:EClass" name="JavaVariable" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement">
      <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
          <details key="body" value="return org.fortiss.af3.generator.common.textgen.java.JavaLanguageConstructTextGenerator.variableDefinitionToString(this);"/>
        </eAnnotations>
      </eOperations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IType"
          containment="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EEnum" name="JavaAnnotation">
@@ -429,23 +429,23 @@
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotations" upperBound="-1"
          eType="#//java/JavaAnnotation"/>
    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="TryCatchFinally" eSuperTypes="platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm">
+    <eClassifiers xsi:type="ecore:EClass" name="TryCatchFinally" eSuperTypes="platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm">
      <eOperations name="toString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
          <details key="body" value="return org.fortiss.af3.generator.common.textgen.java.JavaLanguageConstructTextGenerator.tryCatchFinallyToString(this);"/>
        </eAnnotations>
      </eOperations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="tryBlock" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="tryBlock" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
          containment="true"/>
      <eStructuralFeatures xsi:type="ecore:EReference" name="catchBlocks" upperBound="-1"
          eType="#//java/Catch" containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="finallyBlock" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="finallyBlock" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
          containment="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="Catch">
      <eStructuralFeatures xsi:type="ecore:EReference" name="exceptionVariable" eType="#//java/JavaVariable"
          containment="true"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="catchBlock" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
+      <eStructuralFeatures xsi:type="ecore:EReference" name="catchBlock" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/ITerm"
          containment="true"/>
    </eClassifiers>
  </eSubpackages>

--- a/org.fortiss.af3.generator.common/trunk/model/languages.genmodel
+++ b/org.fortiss.af3.generator.common/trunk/model/languages.genmodel
@@ -8,7 +8,7 @@
    editorPluginClass="org.fortiss.af3.generator.common.model.presentation.ModelEditorPlugin"
    testsDirectory="/org.fortiss.af3.generator.common.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
    containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false"
-    publicConstructors="true" language="" usedGenPackages="platform:/plugin/org.fortiss.af3.project/model/project.genmodel#//model platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/plugin/org.fortiss.tooling.base/model/base.genmodel#//model">
+    publicConstructors="true" language="" usedGenPackages="platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model">
  <foreignModel>languages.ecore</foreignModel>
  <genPackages prefix="AF3GeneratorCommonLanguages" basePackage="org.fortiss.af3.generator.common"
      disposableProviderFactory="true" ecorePackage="languages.ecore#/">

--- a/org.fortiss.af3.mira/trunk/model/mira.ecore
+++ b/org.fortiss.af3.mira/trunk/model/mira.ecore
--- a/org.fortiss.af3.mira/trunk/model/mira.genmodel
+++ b/org.fortiss.af3.mira/trunk/model/mira.genmodel
@@ -5,7 +5,7 @@
    modelDirectory="/org.fortiss.af3.mira/generated-src" modelPluginID="org.fortiss.af3.mira"
    modelName="Mira" editorPluginClass="org.fortiss.af3.mira.model.presentation.ModelEditorPlugin"
    importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" arrayAccessors="true"
-    complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.fortiss.tooling.base/model/base.genmodel#//model platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/plugin/org.fortiss.af3.component/model/component.genmodel#//model platform:/plugin/org.fortiss.af3.project/model/project.genmodel#//model platform:/plugin/org.fortiss.af3.expression/model/expression.genmodel#//model">
+    complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model">
  <foreignModel>mira.ecore</foreignModel>
  <genPackages prefix="Mira" basePackage="org.fortiss.af3.mira" disposableProviderFactory="true"
      ecorePackage="mira.ecore#/">

--- a/org.fortiss.af3.mode/trunk/model/mode.ecore
+++ b/org.fortiss.af3.mode/trunk/model/mode.ecore
@@ -3,13 +3,13 @@
    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
    nsURI="http://www.fortiss.org/af3/mode" nsPrefix="org-fortiss-af3-mode">
-  <eClassifiers xsi:type="ecore:EClass" name="ModeAutomaton" eSuperTypes="platform:/plugin/org.fortiss.af3.component/model/component.ecore#//behavior/IComponentBehaviorDefinitionSpecification platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElementContainer platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableScope platform:/plugin/org.fortiss.af3.component/model/component.ecore#//behavior/common/IDataStateVariableProvider">
+  <eClassifiers xsi:type="ecore:EClass" name="ModeAutomaton" eSuperTypes="platform:/resource/org.fortiss.af3.component/model/component.ecore#//behavior/IComponentBehaviorDefinitionSpecification platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElementContainer platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableScope platform:/resource/org.fortiss.af3.component/model/component.ecore#//behavior/common/IDataStateVariableProvider">
    <eOperations name="getRootMode" eType="#//Mode">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.convertList(&#xA;&#x9;&#x9;&#x9;&#x9;Mode.class, getContainedElementsList()).get(0);"/>
      </eAnnotations>
    </eOperations>
-    <eOperations name="getContainerComponent" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//Component">
+    <eOperations name="getContainerComponent" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (org.fortiss.af3.component.model.Component) eContainer();"/>
      </eAnnotations>
@@ -19,19 +19,19 @@
        <details key="body" value="return org.fortiss.af3.mode.utils.ModeAutomatonUtils.&#xA;&#x9;&#x9;getInitialMode(this);"/>
      </eAnnotations>
    </eOperations>
-    <eOperations name="getDefinitionElement" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableDefinition">
+    <eOperations name="getDefinitionElement" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableDefinition">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.af3.mode.utils.ModeAutomatonUtils.&#xA;&#x9;&#x9;getDefinitionElement(this, var);"/>
      </eAnnotations>
-      <eParameters name="var" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/VarBase"/>
+      <eParameters name="var" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/VarBase"/>
    </eOperations>
-    <eOperations name="getParentVariableScope" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableScope">
+    <eOperations name="getParentVariableScope" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableScope">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.af3.project.typesystem.impl.VariableScopeStaticImpl.findParentScope(this);"/>
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Mode" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
+  <eClassifiers xsi:type="ecore:EClass" name="Mode" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
    <eOperations name="isInitial" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickFirstInstanceOf(&#xA;&#x9;org.fortiss.af3.mode.model.ModeSpecification.class,&#xA;&#x9;getSpecificationsList()).isInitial();"/>
@@ -69,7 +69,7 @@
    </eOperations>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentConnector" abstract="true"
-      eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/ConnectorBase">
+      eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ConnectorBase">
    <eOperations name="getMode" eType="#//Mode">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (Mode) eContainer();"/>
@@ -86,10 +86,10 @@
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentExitConnector" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/ExitConnectorBase #//SwitchSegmentConnector"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentLocalConnector" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/LocalConnectorBase #//SwitchSegmentConnector"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentEntryConnector" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/EntryConnectorBase #//SwitchSegmentConnector"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegment" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/ConnectionSegmentBase">
+  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentExitConnector" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ExitConnectorBase #//SwitchSegmentConnector"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentLocalConnector" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/LocalConnectorBase #//SwitchSegmentConnector"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentEntryConnector" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/EntryConnectorBase #//SwitchSegmentConnector"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegment" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ConnectionSegmentBase">
    <eOperations name="getSwitchSegmentSpecification" eType="#//SwitchSegmentSpecification">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickFirstInstanceOf(&#xA;&#x9;org.fortiss.af3.mode.model.SwitchSegmentSpecification.class,&#xA;&#x9;getSpecificationsList());"/>
@@ -106,21 +106,21 @@
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ModeSpecification" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
+  <eClassifiers xsi:type="ecore:EClass" name="ModeSpecification" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="initial" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentSpecification" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
+  <eClassifiers xsi:type="ecore:EClass" name="SwitchSegmentSpecification" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
    <eOperations name="getSwitchSegment" eType="#//SwitchSegment">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (SwitchSegment) eContainer();"/>
      </eAnnotations>
    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//behavior/common/Guard"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//behavior/common/Guard"
        containment="true"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="ModeComponentStructureSpecification"
-      eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementSpecification platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElementContainer">
-    <eOperations name="getTopComponent" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//Component">
+      eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementSpecification platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElementContainer">
+    <eOperations name="getTopComponent" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="if(getContainedElementsLength()==0){&#xA;return null;&#xA;}&#xA;return (Component) getContainedElements(0);"/>
      </eAnnotations>

--- a/org.fortiss.af3.mode/trunk/model/mode.genmodel
+++ b/org.fortiss.af3.mode/trunk/model/mode.genmodel
@@ -8,7 +8,7 @@
    editorPluginClass="org.fortiss.af3.mode.model.presentation.ModelEditorPlugin"
    testsDirectory="/org.fortiss.af3.mode.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
    containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false"
-    language="" usedGenPackages="platform:/plugin/org.fortiss.tooling.base/model/base.genmodel#//model platform:/plugin/org.fortiss.af3.component/model/component.genmodel#//model platform:/plugin/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/plugin/org.fortiss.af3.project/model/project.genmodel#//model platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
+    language="" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.af3.component/model/component.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
  <foreignModel>mode.ecore</foreignModel>
  <genPackages prefix="AF3Mode" basePackage="org.fortiss.af3.mode" disposableProviderFactory="true"
      ecorePackage="mode.ecore#/">

--- a/org.fortiss.af3.msc/trunk/model/msc.ecore
+++ b/org.fortiss.af3.msc/trunk/model/msc.ecore
@@ -3,7 +3,7 @@
    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
    nsURI="http://www.fortiss.org/af3/msc" nsPrefix="org-fortiss-af3-msc">
-  <eClassifiers xsi:type="ecore:EClass" name="MSCObject" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
+  <eClassifiers xsi:type="ecore:EClass" name="MSCObject" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
    <eOperations name="getSubObjects" upperBound="-1" eType="#//MSCObject">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf(&#xA;&#x9;&#x9;&#x9;&#x9;MSCObject.class, getContainedElementsList());"/>
@@ -35,11 +35,11 @@
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MSCSpecification" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementSpecification platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElement">
+  <eClassifiers xsi:type="ecore:EClass" name="MSCSpecification" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IModelElementSpecification platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedElement platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElement">
    <eStructuralFeatures xsi:type="ecore:EReference" name="topEntity" lowerBound="1"
        eType="#//MSCObject" containment="true"/>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/ConnectionSegmentBase">
+  <eClassifiers xsi:type="ecore:EClass" name="Message" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ConnectionSegmentBase">
    <eOperations name="getSourceConnector" eType="#//MessageConnector">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (MessageConnector) getSource();"/>
@@ -56,28 +56,28 @@
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageConnector" abstract="true" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/ConnectorBase">
+  <eClassifiers xsi:type="ecore:EClass" name="MessageConnector" abstract="true" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ConnectorBase">
    <eOperations name="getParent" eType="#//MSCObject">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (MSCObject) eContainer();"/>
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageEntryConnector" eSuperTypes="#//MessageConnector platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/EntryConnectorBase">
+  <eClassifiers xsi:type="ecore:EClass" name="MessageEntryConnector" eSuperTypes="#//MessageConnector platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/EntryConnectorBase">
    <eOperations name="getIncomingMessage" eType="#//Message">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (Message) getIncoming(0);"/>
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageExitConnector" eSuperTypes="#//MessageConnector platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/ExitConnectorBase">
+  <eClassifiers xsi:type="ecore:EClass" name="MessageExitConnector" eSuperTypes="#//MessageConnector platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ExitConnectorBase">
    <eOperations name="getOutgoingMessage" eType="#//Message">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (Message) getOutgoing(0);"/>
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MSCOperator" abstract="true" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
+  <eClassifiers xsi:type="ecore:EClass" name="MSCOperator" abstract="true" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
    <eOperations name="getParentMSCObject" eType="#//MSCObject">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (MSCObject)eContainer;"/>
@@ -108,10 +108,10 @@
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MSCLoopSpecification" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopStart" eType="ecore:EClass platform:/plugin/org.fortiss.af3.expression/model/expression.ecore#//terms/IExpressionTerm"
+  <eClassifiers xsi:type="ecore:EClass" name="MSCLoopSpecification" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="loopStart" eType="ecore:EClass platform:/resource/org.fortiss.af3.expression/model/expression.ecore#//terms/IExpressionTerm"
        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopEnd" eType="ecore:EClass platform:/plugin/org.fortiss.af3.expression/model/expression.ecore#//terms/IExpressionTerm"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="loopEnd" eType="ecore:EClass platform:/resource/org.fortiss.af3.expression/model/expression.ecore#//terms/IExpressionTerm"
        containment="true"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="MSCConditionalOperator" eSuperTypes="#//MSCOperator">
@@ -121,8 +121,8 @@
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MSCConditionalSpecification" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="ecore:EClass platform:/plugin/org.fortiss.af3.expression/model/expression.ecore#//terms/IExpressionTerm"
+  <eClassifiers xsi:type="ecore:EClass" name="MSCConditionalSpecification" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHiddenSpecification">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="ecore:EClass platform:/resource/org.fortiss.af3.expression/model/expression.ecore#//terms/IExpressionTerm"
        containment="true"/>
  </eClassifiers>
 </ecore:EPackage>
--- a/org.fortiss.af3.msc/trunk/model/msc.genmodel
+++ b/org.fortiss.af3.msc/trunk/model/msc.genmodel
@@ -7,7 +7,7 @@
    modelName="Model" modelPluginClass="" editPluginClass="org.fortiss.af3.msc.model.provider.ModelEditPlugin"
    editorPluginClass="org.fortiss.af3.msc.model.presentation.ModelEditorPlugin" testsDirectory="/org.fortiss.af3.msc.tests/test-src"
    importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" arrayAccessors="true"
-    complianceLevel="5.0" copyrightFields="false" language="" usedGenPackages="platform:/plugin/org.fortiss.tooling.base/model/base.genmodel#//model platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/plugin/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/plugin/org.fortiss.af3.project/model/project.genmodel#//model">
+    complianceLevel="5.0" copyrightFields="false" language="" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.expression/model/expression.genmodel#//model platform:/resource/org.fortiss.af3.project/model/project.genmodel#//model">
  <foreignModel>msc.ecore</foreignModel>
  <genPackages prefix="AF3MSC" basePackage="org.fortiss.af3.msc" disposableProviderFactory="true"
      ecorePackage="msc.ecore#/">

--- a/org.fortiss.af3.multicore/trunk/model/multicore.ecore
+++ b/org.fortiss.af3.multicore/trunk/model/multicore.ecore
@@ -3,7 +3,7 @@
    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
    nsURI="http://www.fortiss.org/af3/multicore" nsPrefix="org-fortiss-af3-multicore">
-  <eClassifiers xsi:type="ecore:EClass" name="NiosIICore" eSuperTypes="platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//IPlatformArchitectureElement platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit">
+  <eClassifiers xsi:type="ecore:EClass" name="NiosIICore" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//IPlatformArchitectureElement platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//ExecutionUnit">
    <eOperations name="getAvalonMasters" upperBound="-1" eType="#//AvalonMaster">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf(&#xA;            AvalonMaster.class, getConnectorsList());"/>
@@ -20,19 +20,19 @@
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AvalonConnector" eSuperTypes="platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//Transceiver"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AvalonConnector" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transceiver"/>
  <eClassifiers xsi:type="ecore:EClass" name="AvalonMaster" eSuperTypes="#//AvalonConnector"/>
  <eClassifiers xsi:type="ecore:EClass" name="AvalonSlave" eSuperTypes="#//AvalonConnector"/>
  <eClassifiers xsi:type="ecore:EClass" name="AvalonMasterIF" eSuperTypes="#//AvalonConnector"/>
  <eClassifiers xsi:type="ecore:EClass" name="AvalonSlaveIF" eSuperTypes="#//AvalonConnector"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AvalonBus" eSuperTypes="platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//TransmissionUnit platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//IPlatformArchitectureElement">
+  <eClassifiers xsi:type="ecore:EClass" name="AvalonBus" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//TransmissionUnit platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//IPlatformArchitectureElement">
    <eOperations name="getAvalonConnectors" upperBound="-1" eType="#//AvalonConnector">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf(&#xA;            AvalonConnector.class, getConnectorsList());"/>
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Memory" eSuperTypes="platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//IPlatformArchitectureElement">
+  <eClassifiers xsi:type="ecore:EClass" name="Memory" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//IPlatformArchitectureElement">
    <eOperations name="getAvalonSlaves" upperBound="-1" eType="#//AvalonSlave">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf(&#xA;            AvalonSlave.class, getConnectorsList());"/>
@@ -43,8 +43,8 @@
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moduleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bitNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NiosGPIOInput" eSuperTypes="platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//NiosGPIO"/>
-  <eClassifiers xsi:type="ecore:EClass" name="NiosGPIOOutput" eSuperTypes="platform:/plugin/org.fortiss.af3.platform/model/platform.ecore#//Transmitter #//NiosGPIO">
+  <eClassifiers xsi:type="ecore:EClass" name="NiosGPIOInput" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Receiver #//NiosGPIO"/>
+  <eClassifiers xsi:type="ecore:EClass" name="NiosGPIOOutput" eSuperTypes="platform:/resource/org.fortiss.af3.platform/model/platform.ecore#//Transmitter #//NiosGPIO">
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="initialValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
  </eClassifiers>
 </ecore:EPackage>
--- a/org.fortiss.af3.multicore/trunk/model/multicore.genmodel
+++ b/org.fortiss.af3.multicore/trunk/model/multicore.genmodel
@@ -4,7 +4,7 @@
    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.fortiss.af3.multicore/generated-src"
    modelPluginID="org.fortiss.af3.multicore" modelName="AF3Multicore" importerID="org.eclipse.emf.importer.ecore"
    containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.fortiss.tooling.base/model/base.genmodel#//model platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/plugin/org.fortiss.af3.platform/model/platform.genmodel#//model">
+    usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model platform:/resource/org.fortiss.af3.platform/model/platform.genmodel#//model">
  <foreignModel>multicore.ecore</foreignModel>
  <genPackages prefix="AF3Multicore" basePackage="org.fortiss.af3.multicore" disposableProviderFactory="true"
      ecorePackage="multicore.ecore#/">

--- a/org.fortiss.af3.operatorpanel/trunk/model/operatorpanel.ecore
+++ b/org.fortiss.af3.operatorpanel/trunk/model/operatorpanel.ecore
@@ -3,8 +3,8 @@
    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
    nsURI="http://www.fortiss.org/af3/operatorpanel" nsPrefix="org-fortiss-af3-operatorpanel">
-  <eClassifiers xsi:type="ecore:EClass" name="OperatorPanelSpecification" eSuperTypes="platform:/plugin/org.fortiss.af3.component/model/component.ecore#//behavior/IComponentBehaviorDefinitionSpecification platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElementContainer platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
-    <eOperations name="getComponent" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//Component">
+  <eClassifiers xsi:type="ecore:EClass" name="OperatorPanelSpecification" eSuperTypes="platform:/resource/org.fortiss.af3.component/model/component.ecore#//behavior/IComponentBehaviorDefinitionSpecification platform:/resource/org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElementContainer platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement">
+    <eOperations name="getComponent" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//Component">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return (org.fortiss.af3.component.model.Component) eContainer();"/>
      </eAnnotations>
@@ -15,7 +15,7 @@
      </eAnnotations>
    </eOperations>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OperatorPanelItem" abstract="true" eSuperTypes="platform:/plugin/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase"/>
+  <eClassifiers xsi:type="ecore:EClass" name="OperatorPanelItem" abstract="true" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase"/>
  <eClassifiers xsi:type="ecore:EClass" name="InputOperatorPanelItem" abstract="true"
      eSuperTypes="#//OperatorPanelItem">
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stateType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -25,7 +25,7 @@
  <eClassifiers xsi:type="ecore:EClass" name="OPLabel" eSuperTypes="#//OperatorPanelItem"/>
  <eClassifiers xsi:type="ecore:EClass" name="OPButton" abstract="true" eSuperTypes="#//InputOperatorPanelItem">
    <eStructuralFeatures xsi:type="ecore:EReference" name="onSelect" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//behavior/common/Action"
+        eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//behavior/common/Action"
        containment="true"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="OPColorDisplay" eSuperTypes="#//OutputOperatorPanelItem">
@@ -33,7 +33,7 @@
        eType="#//OPColorReaction" containment="true"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="OPReaction">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="ecore:EClass platform:/plugin/org.fortiss.af3.component/model/component.ecore#//behavior/common/Guard"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="ecore:EClass platform:/resource/org.fortiss.af3.component/model/component.ecore#//behavior/common/Guard"
        containment="true"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="OPColorReaction" eSuperTypes="#//OPReaction">
@@ -42,63 +42,63 @@
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="blue" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="OPTextReaction" eSuperTypes="#//OPReaction">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="itemInput" eType="ecore:EClass platform:/plugin/org.fortiss.af3.expression/model/expression.ecore#//terms/IExpressionTerm"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="itemInput" eType="ecore:EClass platform:/resource/org.fortiss.af3.expression/model/expression.ecore#//terms/IExpressionTerm"
        containment="true"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="OPTextDisplay" eSuperTypes="#//OutputOperatorPanelItem">
    <eStructuralFeatures xsi:type="ecore:EReference" name="reactions" upperBound="-1"
        eType="#//OPTextReaction" containment="true"/>
  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OPITermInput" eSuperTypes="#//InputOperatorPanelItem platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableScope platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableDefinition">
-    <eOperations name="getDefinitionElement" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableDefinition">
+  <eClassifiers xsi:type="ecore:EClass" name="OPITermInput" eSuperTypes="#//InputOperatorPanelItem platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableScope platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableDefinition">
+    <eOperations name="getDefinitionElement" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/IVariableDefinition">
      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
        <details key="body" value="return OPITermInputStaticImpl.getDefinitionElement(this, var);"/>
      </eAnnotations>
-      <eParameters name="var" eType="ecore:EClass platform:/plugin/org.fortiss.af3.project/model/project.ecore#//typesystem/VarBase"/>
+      <eParameters name="var" eType="ecore:EClass platform:/resource/org.fortiss.af3.project/model/project.ecore#//typesystem/VarBase"/>