Xcos: fix metamodel issues 25/19525/2
Clément DAVID [Tue, 7 Nov 2017 10:16:44 +0000 (11:16 +0100)]
Change-Id: I06596e044cef88018091d993446f70f4dc51b32c

scilab/modules/xcos/model/Xcos.genmodel [deleted file]
scilab/modules/xcos/model/xcos.ecore

diff --git a/scilab/modules/xcos/model/Xcos.genmodel b/scilab/modules/xcos/model/Xcos.genmodel
deleted file mode 100644 (file)
index 274f03e..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/xcos/src" modelPluginID="xcos" runtimeJar="true"
-    modelName="Xcos" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" booleanFlagsField="eFlags" booleanFlagsReservedBits="8" importerID="org.eclipse.emf.importer.ecore"
-    containmentProxies="true" complianceLevel="8.0" language="en" usedGenPackages="../../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
-    operationReflection="true" importOrganizing="true" decoration="Live" oSGiCompatible="true">
-  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter">
-    <genAnnotations source="selectedPackages">
-      <details key="http://www.eclipse.org/emf/2002/Ecore" value="Ecore.xsd"/>
-    </genAnnotations>
-    <details key="directoryURI" value="."/>
-  </genAnnotations>
-  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter.xmi">
-    <genAnnotations source="selectedPackages">
-      <details key="http://www.eclipse.org/emf/2002/Ecore" value="EcoreXMI.xsd"/>
-    </genAnnotations>
-    <details key="directoryURI" value="."/>
-  </genAnnotations>
-  <foreignModel>xcos.ecore</foreignModel>
-  <modelPluginVariables>org.eclipse.xtext.xbase.lib</modelPluginVariables>
-  <modelPluginVariables>org.eclipse.emf.ecore.xcore.lib</modelPluginVariables>
-  <genPackages prefix="Xcos" basePackage="org.scilab.modules" disposableProviderFactory="true"
-      ecorePackage="xcos.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="xcos.ecore#//PortKind">
-      <genEnumLiterals ecoreEnumLiteral="xcos.ecore#//PortKind/in"/>
-      <genEnumLiterals ecoreEnumLiteral="xcos.ecore#//PortKind/out"/>
-      <genEnumLiterals ecoreEnumLiteral="xcos.ecore#//PortKind/ein"/>
-      <genEnumLiterals ecoreEnumLiteral="xcos.ecore#//PortKind/eout"/>
-    </genEnums>
-    <genClasses ecoreClass="xcos.ecore#//Binary">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Binary/base64"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//Point">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Point/x"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Point/y"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//Geometry">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Geometry/x"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Geometry/y"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Geometry/height"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Geometry/width"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="xcos.ecore#//Layer">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Layer/context"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Layer/child"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="xcos.ecore#//BaseObject">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//BaseObject/uid"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference xcos.ecore#//BaseObject/parentDiagram"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference xcos.ecore#//BaseObject/parent"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//Diagram">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Diagram/title"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Diagram/path"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Diagram/properties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Diagram/debugLevel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Diagram/version"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//SimulationConfig">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/finalTime"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/absoluteTime"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/absoluteTolerance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/relativeTolerance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/timeTolerance"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/deltaT"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/realtimeScale"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/solver"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//SimulationConfig/deltaH"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//Block">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/geometry"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/label"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/interfaceFunction"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/expression"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/exprs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/nzcross"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/nmode"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/equations"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/functionName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/functionAPI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/dependsOnU"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/dependsOnT"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/blocktype"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/in"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/out"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/ein"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/eout"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/rpar"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/ipar"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/opar"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/state"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Block/dstate"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/odstate"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//Port">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Port/uid"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Port/datatype"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Port/firing"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference xcos.ecore#//Port/sourceBlock"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Port/kind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Port/implicit"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference xcos.ecore#//Port/connectedSignal"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Port/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Port/label"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//Link">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference xcos.ecore#//Link/sourcePort"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference xcos.ecore#//Link/destinationPort"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Link/geometry"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Link/controlPoint"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Link/style"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Link/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Block/label"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Link/lineWidth"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Link/lineHeight"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Link/color"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//Annotation">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference xcos.ecore#//Annotation/geometry"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Annotation/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Annotation/font"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Annotation/fontSize"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Annotation/style"/>
-    </genClasses>
-    <genClasses ecoreClass="xcos.ecore#//CompiledRepresentation"/>
-    <genClasses ecoreClass="xcos.ecore#//Datatype">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Datatype/typ"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Datatype/rows"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute xcos.ecore#//Datatype/columns"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
index 0a05a6e..dd90b8f 100644 (file)
@@ -9,7 +9,7 @@
       <details key="documentation" value=" Encoded Scilab values"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="base64" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" RFC 2045 Base64 encoded double[] values (space separated)"/>
       </eAnnotations>
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value=" A point is a position on the diagram"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" X coordinate"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Y coordinate"/>
       </eAnnotations>
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value=" Rectangular coordinates of the object"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" X coordinate"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Y coordinate"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble">
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Height of the object"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Width of the object"/>
       </eAnnotations>
@@ -70,7 +70,7 @@
       <details key="documentation" value=" Shared definition for both a Diagram and a SuperBlock (eg. a Block)"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="context" unique="false"
-        upperBound="-1" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Scilab scripts added at current layer"/>
       </eAnnotations>
@@ -86,7 +86,7 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value=" Shared definition for an object contained in a Layer"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uid" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uid" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         iD="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Unique IDentifier : usually on the universally unique identifier (UUID) form"/>
         <details key="documentation" value=" parent Layer to navigate back"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="geometry" lowerBound="1"
+        eType="#//Geometry" containment="true" resolveProxies="false"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//Layer">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value=" A diagram is the top-level object of a model. It contains simulation parameters and the hierarchical data-flow and event-flow graphs."/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" title of a diagram"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Latest saved path"/>
       </eAnnotations>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="debugLevel" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt">
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Simulation debug level"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString">
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Version of the diagram"/>
       </eAnnotations>
       <details key="documentation" value=" Simulation settings"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="finalTime" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble">
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value=" Simulation final time (starting at 0)"/>
       </eAnnotations>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="absoluteTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="absoluteTolerance" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="relativeTolerance" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="timeTolerance" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="deltaT" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="realtimeScale" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="solver" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="deltaH" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Block" eSuperTypes="#//BaseObject #//Layer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="geometry" eType="#//Geometry"
-        containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="label" eType="#//Annotation"
-        containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        resolveProxies="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="interfaceFunction" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="expression" unique="false"
-        upperBound="-1" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="exprs" eType="#//Binary"
         containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="nzcross" unique="false"
-        upperBound="-1" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="nmode" unique="false" upperBound="-1"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="equations" eType="#//Binary"
         containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="functionName" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="functionAPI" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dependsOnU" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dependsOnT" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="blocktype" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EChar"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="in" upperBound="-1" eType="#//Port"
         containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="out" upperBound="-1" eType="#//Port"
     <eStructuralFeatures xsi:type="ecore:EReference" name="eout" upperBound="-1" eType="#//Port"
         containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="rpar" unique="false" upperBound="-1"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ipar" unique="false" upperBound="-1"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="opar" eType="#//Binary"
         containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="state" unique="false" upperBound="-1"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="dstate" unique="false"
-        upperBound="-1" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="odstate" eType="#//Binary"
         containment="true" resolveProxies="false"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Port">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uid" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uid" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="firing" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="datatype" eType="#//Datatype"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="sourceBlock" eType="#//Block"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" unique="false" eType="#//PortKind"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="implicit" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="connectedSignal" eType="#//Link"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Link" eSuperTypes="#//BaseObject">
     <eStructuralFeatures xsi:type="ecore:EReference" name="sourcePort" eType="#//Port"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="destinationPort" eType="#//Port"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="geometry" eType="#//Geometry"
-        containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="controlPoint" upperBound="-1"
         eType="#//Point" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="label" eType="#//Annotation"
-        containment="true" resolveProxies="false"/>
+        resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineWidth" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineHeight" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="color" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="color" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Annotation" eSuperTypes="#//BaseObject">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="geometry" eType="#//Geometry"
-        containment="true" resolveProxies="false"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="font" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="font" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontSize" unique="false"
-        eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" unique="false" eType="ecore:EDataType ../../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CompiledRepresentation">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">