diff --git a/org.fortiss.tooling.base/trunk/model/base.ecore b/org.fortiss.tooling.base/trunk/model/base.ecore
index 115d1e23994b4856fd63941a0949892855544287..fd7a57498bf6d5000b93f3c1bf527542c45ea4f4 100644
--- a/org.fortiss.tooling.base/trunk/model/base.ecore
+++ b/org.fortiss.tooling.base/trunk/model/base.ecore
@@ -1,251 +1,251 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    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/tooling/base/model" nsPrefix="org-fortiss-tooling-base-model">
-  <eSubpackages name="element" nsURI="http://www.fortiss.org/tooling/base/model/element"
-      nsPrefix="org-fortiss-tooling-base-model-element">
-    <eClassifiers xsi:type="ecore:EClass" name="IModelElement">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of first class model elements."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
-          eType="#//element/IModelElementSpecification" containment="true">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="List of model element specifications providing additional model element properties."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
-          eType="#//element/IModelElementReference" eOpposite="#//element/IModelElementReference/reference">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="List of model element references."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IModelElementSpecification" abstract="true"
-        interface="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of model element specifications. Such specifications provide additional plugable properties."/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IModelElementReference" abstract="true"
-        interface="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of EObjects referencing model elements."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//element/IModelElement"
-          eOpposite="#//element/IModelElement/referencedBy">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The referenced model element."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElement" abstract="true"
-        interface="true" eSuperTypes="#//element/IHierarchicElementContainer #//element/IModelElement">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of hierarchic model elements."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1"
-          eType="#//element/IConnection" containment="true">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="List of aggregated connection model elements. Usually a hierarchic element aggregates all connections of its direct sub-structure."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="connectors" upperBound="-1"
-          eType="#//element/IConnector" containment="true">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="List of aggregated connectors."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementContainer" abstract="true"
-        interface="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of containers of hierarchic model elements."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="containedElements" upperBound="-1"
-          eType="#//element/IHierarchicElement" containment="true">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The contained hierarchic model elements."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IConnector" abstract="true" interface="true"
-        eSuperTypes="#//element/IModelElement">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of connectors. Connectors reference incoming and outgoing connection model elements."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" upperBound="-1"
-          eType="#//element/IConnection" eOpposite="#//element/IConnection/target">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The incoming connections."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" upperBound="-1"
-          eType="#//element/IConnection" eOpposite="#//element/IConnection/source">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The outgoing connections."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IConnection" abstract="true" interface="true"
-        eSuperTypes="#//element/IModelElement">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of connections. Connections are aggregated in a hierarchic model element and reference two connectors from that element or any direct sub-elenent."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//element/IConnector"
-          eOpposite="#//element/IConnector/outgoing">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The connection's source connector."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//element/IConnector"
-          eOpposite="#//element/IConnector/incoming">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The connection's target connector."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IHiddenSpecification" abstract="true"
-        interface="true" eSuperTypes="#//element/IModelElementSpecification">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of model element specifications, which should be excluded from the navigator view."/>
-      </eAnnotations>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IAnnotatedSpecification" eSuperTypes="#//element/IModelElementSpecification">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of hidden model element specifications that represent annotations."/>
-      </eAnnotations>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="layout" nsURI="http://www.fortiss.org/tooling/base/model/layout"
-      nsPrefix="org-fortiss-tooling-base-model-layout">
-    <eClassifiers xsi:type="ecore:EClass" name="ILayoutedModelElement" abstract="true"
-        interface="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of model elements with layout data."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="layoutData" upperBound="-1"
-          eType="#//layout/ILayoutData" containment="true">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="Stores the aggregated layout data."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ILayoutData" abstract="true" interface="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Super class of all layout data objects."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The layout key indicating how the layout data is to be interpreted."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Point" eSuperTypes="#//layout/ILayoutData">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Layout data for 2D locations."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The horizontal X coordinate."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The vertical Y coordinate."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Dimension" eSuperTypes="#//layout/ILayoutData">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Layout data for 2D dimensions."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-          defaultValueLiteral="10">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The width."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-          defaultValueLiteral="10">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The height."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="EOrientation">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Enumeration of 2D directions and orientations."/>
-      </eAnnotations>
-      <eLiterals name="NORTH"/>
-      <eLiterals name="EAST" value="1"/>
-      <eLiterals name="SOUTH" value="2"/>
-      <eLiterals name="WEST" value="3"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Orientation" eSuperTypes="#//layout/ILayoutData">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Layout data for 2D orientations."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="orientation" lowerBound="1"
-          eType="#//layout/EOrientation" defaultValueLiteral="NORTH">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The orientation."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Points" eSuperTypes="#//layout/ILayoutData">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Layout data for a sequence of 2D locations."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="points" upperBound="-1"
-          eType="#//layout/Point" containment="true">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The aggregated locations."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Angle" eSuperTypes="#//layout/ILayoutData">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Layout data for an angle (the interpretation of the double value is application dependent)."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="angle" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
-          defaultValueLiteral="0">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The double value of the angle."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Offset" eSuperTypes="#//layout/ILayoutData">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Layout data of a single dimensional offset."/>
-      </eAnnotations>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="offset" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="0">
-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-          <details key="documentation" value="The offset value."/>
-        </eAnnotations>
-      </eStructuralFeatures>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="OffsetOrientation" eSuperTypes="#//layout/Offset #//layout/Orientation">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Combines an offset with an orientation."/>
-      </eAnnotations>
-    </eClassifiers>
-  </eSubpackages>
-  <eSubpackages name="base" nsURI="http://www.fortiss.org/tooling/base/model/base"
-      nsPrefix="org-fortiss-tooling-base-model-base">
-    <eClassifiers xsi:type="ecore:EClass" name="HierarchicElementBase" abstract="true"
-        eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IHierarchicElement #//layout/ILayoutedModelElement"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ConnectorBase" abstract="true" eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IConnector #//layout/ILayoutedModelElement"/>
-    <eClassifiers xsi:type="ecore:EClass" name="EntryConnectorBase" abstract="true"
-        eSuperTypes="#//base/ConnectorBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ExitConnectorBase" abstract="true"
-        eSuperTypes="#//base/ConnectorBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="LocalConnectorBase" abstract="true"
-        eSuperTypes="#//base/ConnectorBase"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ConnectionSegmentBase" abstract="true"
-        eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IConnection #//layout/ILayoutedModelElement"/>
-  </eSubpackages>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    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/tooling/base/model" nsPrefix="org-fortiss-tooling-base-model">
+  <eSubpackages name="element" nsURI="http://www.fortiss.org/tooling/base/model/element"
+      nsPrefix="org-fortiss-tooling-base-model-element">
+    <eClassifiers xsi:type="ecore:EClass" name="IModelElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of first class model elements."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
+          eType="#//element/IModelElementSpecification" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="List of model element specifications providing additional model element properties."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
+          eType="#//element/IModelElementReference" eOpposite="#//element/IModelElementReference/reference">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="List of model element references."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IModelElementSpecification" abstract="true"
+        interface="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of model element specifications. Such specifications provide additional plugable properties."/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IModelElementReference" abstract="true"
+        interface="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of EObjects referencing model elements."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//element/IModelElement"
+          eOpposite="#//element/IModelElement/referencedBy">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The referenced model element."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElement" abstract="true"
+        interface="true" eSuperTypes="#//element/IHierarchicElementContainer #//element/IModelElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of hierarchic model elements."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1"
+          eType="#//element/IConnection" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="List of aggregated connection model elements. Usually a hierarchic element aggregates all connections of its direct sub-structure."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="connectors" upperBound="-1"
+          eType="#//element/IConnector" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="List of aggregated connectors."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementContainer" abstract="true"
+        interface="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of containers of hierarchic model elements."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="containedElements" upperBound="-1"
+          eType="#//element/IHierarchicElement" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The contained hierarchic model elements."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IConnector" abstract="true" interface="true"
+        eSuperTypes="#//element/IModelElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of connectors. Connectors reference incoming and outgoing connection model elements."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" upperBound="-1"
+          eType="#//element/IConnection" eOpposite="#//element/IConnection/target">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The incoming connections."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" upperBound="-1"
+          eType="#//element/IConnection" eOpposite="#//element/IConnection/source">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The outgoing connections."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IConnection" abstract="true" interface="true"
+        eSuperTypes="#//element/IModelElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of connections. Connections are aggregated in a hierarchic model element and reference two connectors from that element or any direct sub-elenent."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//element/IConnector"
+          eOpposite="#//element/IConnector/outgoing">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The connection's source connector."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//element/IConnector"
+          eOpposite="#//element/IConnector/incoming">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The connection's target connector."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IHiddenSpecification" abstract="true"
+        interface="true" eSuperTypes="#//element/IModelElementSpecification">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of model element specifications, which should be excluded from the navigator view."/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="IAnnotatedSpecification" eSuperTypes="#//element/IModelElementSpecification">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of hidden model element specifications that represent annotations."/>
+      </eAnnotations>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="layout" nsURI="http://www.fortiss.org/tooling/base/model/layout"
+      nsPrefix="org-fortiss-tooling-base-model-layout">
+    <eClassifiers xsi:type="ecore:EClass" name="ILayoutedModelElement" abstract="true"
+        interface="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of model elements with layout data."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="layoutData" upperBound="-1"
+          eType="#//layout/ILayoutData" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="Stores the aggregated layout data."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ILayoutData" abstract="true" interface="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Super class of all layout data objects."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The layout key indicating how the layout data is to be interpreted."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Point" eSuperTypes="#//layout/ILayoutData">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Layout data for 2D locations."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The horizontal X coordinate."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The vertical Y coordinate."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Dimension" eSuperTypes="#//layout/ILayoutData">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Layout data for 2D dimensions."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+          defaultValueLiteral="10">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The width."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+          defaultValueLiteral="10">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The height."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="EOrientation">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Enumeration of 2D directions and orientations."/>
+      </eAnnotations>
+      <eLiterals name="NORTH"/>
+      <eLiterals name="EAST" value="1"/>
+      <eLiterals name="SOUTH" value="2"/>
+      <eLiterals name="WEST" value="3"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Orientation" eSuperTypes="#//layout/ILayoutData">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Layout data for 2D orientations."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="orientation" lowerBound="1"
+          eType="#//layout/EOrientation" defaultValueLiteral="NORTH">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The orientation."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Points" eSuperTypes="#//layout/ILayoutData">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Layout data for a sequence of 2D locations."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="points" upperBound="-1"
+          eType="#//layout/Point" containment="true">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The aggregated locations."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Angle" eSuperTypes="#//layout/ILayoutData">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Layout data for an angle (the interpretation of the double value is application dependent)."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="angle" lowerBound="1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+          defaultValueLiteral="0">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The double value of the angle."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Offset" eSuperTypes="#//layout/ILayoutData">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Layout data of a single dimensional offset."/>
+      </eAnnotations>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="offset" lowerBound="1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="0">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The offset value."/>
+        </eAnnotations>
+      </eStructuralFeatures>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="OffsetOrientation" eSuperTypes="#//layout/Offset #//layout/Orientation">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Combines an offset with an orientation."/>
+      </eAnnotations>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="base" nsURI="http://www.fortiss.org/tooling/base/model/base"
+      nsPrefix="org-fortiss-tooling-base-model-base">
+    <eClassifiers xsi:type="ecore:EClass" name="HierarchicElementBase" abstract="true"
+        eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IHierarchicElement #//layout/ILayoutedModelElement"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ConnectorBase" abstract="true" eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IConnector #//layout/ILayoutedModelElement"/>
+    <eClassifiers xsi:type="ecore:EClass" name="EntryConnectorBase" abstract="true"
+        eSuperTypes="#//base/ConnectorBase"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ExitConnectorBase" abstract="true"
+        eSuperTypes="#//base/ConnectorBase"/>
+    <eClassifiers xsi:type="ecore:EClass" name="LocalConnectorBase" abstract="true"
+        eSuperTypes="#//base/ConnectorBase"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ConnectionSegmentBase" abstract="true"
+        eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IConnection #//layout/ILayoutedModelElement"/>
+  </eSubpackages>
+</ecore:EPackage>
diff --git a/org.fortiss.tooling.base/trunk/model/base.genmodel b/org.fortiss.tooling.base/trunk/model/base.genmodel
index 39ca72659b9e3e5b7c18eadb27f773222f74f10f..6157272755ff9645e19c25ba37ab2d375460d558 100644
--- a/org.fortiss.tooling.base/trunk/model/base.genmodel
+++ b/org.fortiss.tooling.base/trunk/model/base.genmodel
@@ -1,91 +1,91 @@
-<?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="/org.fortiss.tooling.base/generated-src"
-    modelPluginID="org.fortiss.tooling.base" modelName="Base" importerID="org.eclipse.emf.importer.ecore"
-    containmentProxies="true" arrayAccessors="true" complianceLevel="6.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
-  <foreignModel>base.ecore</foreignModel>
-  <genPackages prefix="Base" basePackage="org.fortiss.tooling.base" disposableProviderFactory="true"
-      ecorePackage="base.ecore#/">
-    <nestedGenPackages prefix="Element" basePackage="org.fortiss.tooling.base.model"
-        disposableProviderFactory="true" ecorePackage="base.ecore#//element">
-      <genClasses ecoreClass="base.ecore#//element/IModelElement">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IModelElement/specifications"/>
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference base.ecore#//element/IModelElement/referencedBy"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="base.ecore#//element/IModelElementSpecification"/>
-      <genClasses image="false" ecoreClass="base.ecore#//element/IModelElementReference">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference base.ecore#//element/IModelElementReference/reference"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="base.ecore#//element/IHierarchicElement">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IHierarchicElement/connections"/>
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IHierarchicElement/connectors"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="base.ecore#//element/IHierarchicElementContainer">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IHierarchicElementContainer/containedElements"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="base.ecore#//element/IConnector">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference base.ecore#//element/IConnector/incoming"/>
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference base.ecore#//element/IConnector/outgoing"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="base.ecore#//element/IConnection">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference base.ecore#//element/IConnection/source"/>
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference base.ecore#//element/IConnection/target"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="base.ecore#//element/IHiddenSpecification"/>
-      <genClasses ecoreClass="base.ecore#//element/IAnnotatedSpecification"/>
-    </nestedGenPackages>
-    <nestedGenPackages prefix="Layout" basePackage="org.fortiss.tooling.base.model"
-        disposableProviderFactory="true" ecorePackage="base.ecore#//layout">
-      <genEnums typeSafeEnumCompatible="false" ecoreEnum="base.ecore#//layout/EOrientation">
-        <genEnumLiterals ecoreEnumLiteral="base.ecore#//layout/EOrientation/NORTH"/>
-        <genEnumLiterals ecoreEnumLiteral="base.ecore#//layout/EOrientation/EAST"/>
-        <genEnumLiterals ecoreEnumLiteral="base.ecore#//layout/EOrientation/SOUTH"/>
-        <genEnumLiterals ecoreEnumLiteral="base.ecore#//layout/EOrientation/WEST"/>
-      </genEnums>
-      <genClasses image="false" ecoreClass="base.ecore#//layout/ILayoutedModelElement">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//layout/ILayoutedModelElement/layoutData"/>
-      </genClasses>
-      <genClasses image="false" ecoreClass="base.ecore#//layout/ILayoutData">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/ILayoutData/key"/>
-      </genClasses>
-      <genClasses ecoreClass="base.ecore#//layout/Point">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Point/x"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Point/y"/>
-      </genClasses>
-      <genClasses ecoreClass="base.ecore#//layout/Dimension">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Dimension/width"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Dimension/height"/>
-      </genClasses>
-      <genClasses ecoreClass="base.ecore#//layout/Orientation">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Orientation/orientation"/>
-      </genClasses>
-      <genClasses ecoreClass="base.ecore#//layout/Points">
-        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//layout/Points/points"/>
-      </genClasses>
-      <genClasses ecoreClass="base.ecore#//layout/Angle">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Angle/angle"/>
-      </genClasses>
-      <genClasses ecoreClass="base.ecore#//layout/Offset">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Offset/offset"/>
-      </genClasses>
-      <genClasses ecoreClass="base.ecore#//layout/OffsetOrientation"/>
-    </nestedGenPackages>
-    <nestedGenPackages prefix="Base" basePackage="org.fortiss.tooling.base.model"
-        disposableProviderFactory="true" ecorePackage="base.ecore#//base">
-      <genClasses image="false" ecoreClass="base.ecore#//base/HierarchicElementBase"/>
-      <genClasses image="false" ecoreClass="base.ecore#//base/ConnectorBase"/>
-      <genClasses image="false" ecoreClass="base.ecore#//base/EntryConnectorBase"/>
-      <genClasses image="false" ecoreClass="base.ecore#//base/ExitConnectorBase"/>
-      <genClasses image="false" ecoreClass="base.ecore#//base/LocalConnectorBase"/>
-      <genClasses image="false" ecoreClass="base.ecore#//base/ConnectionSegmentBase"/>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
+<?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="/org.fortiss.tooling.base/generated-src"
+    modelPluginID="org.fortiss.tooling.base" modelName="Base" importerID="org.eclipse.emf.importer.ecore"
+    containmentProxies="true" arrayAccessors="true" complianceLevel="6.0" copyrightFields="false"
+    usedGenPackages="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
+  <foreignModel>base.ecore</foreignModel>
+  <genPackages prefix="Base" basePackage="org.fortiss.tooling.base" disposableProviderFactory="true"
+      ecorePackage="base.ecore#/">
+    <nestedGenPackages prefix="Element" basePackage="org.fortiss.tooling.base.model"
+        disposableProviderFactory="true" ecorePackage="base.ecore#//element">
+      <genClasses ecoreClass="base.ecore#//element/IModelElement">
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IModelElement/specifications"/>
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/IModelElement/referencedBy"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//element/IModelElementSpecification"/>
+      <genClasses image="false" ecoreClass="base.ecore#//element/IModelElementReference">
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/IModelElementReference/reference"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//element/IHierarchicElement">
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IHierarchicElement/connections"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IHierarchicElement/connectors"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//element/IHierarchicElementContainer">
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//element/IHierarchicElementContainer/containedElements"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//element/IConnector">
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/IConnector/incoming"/>
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/IConnector/outgoing"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//element/IConnection">
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/IConnection/source"/>
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference base.ecore#//element/IConnection/target"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//element/IHiddenSpecification"/>
+      <genClasses ecoreClass="base.ecore#//element/IAnnotatedSpecification"/>
+    </nestedGenPackages>
+    <nestedGenPackages prefix="Layout" basePackage="org.fortiss.tooling.base.model"
+        disposableProviderFactory="true" ecorePackage="base.ecore#//layout">
+      <genEnums typeSafeEnumCompatible="false" ecoreEnum="base.ecore#//layout/EOrientation">
+        <genEnumLiterals ecoreEnumLiteral="base.ecore#//layout/EOrientation/NORTH"/>
+        <genEnumLiterals ecoreEnumLiteral="base.ecore#//layout/EOrientation/EAST"/>
+        <genEnumLiterals ecoreEnumLiteral="base.ecore#//layout/EOrientation/SOUTH"/>
+        <genEnumLiterals ecoreEnumLiteral="base.ecore#//layout/EOrientation/WEST"/>
+      </genEnums>
+      <genClasses image="false" ecoreClass="base.ecore#//layout/ILayoutedModelElement">
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//layout/ILayoutedModelElement/layoutData"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="base.ecore#//layout/ILayoutData">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/ILayoutData/key"/>
+      </genClasses>
+      <genClasses ecoreClass="base.ecore#//layout/Point">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Point/x"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Point/y"/>
+      </genClasses>
+      <genClasses ecoreClass="base.ecore#//layout/Dimension">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Dimension/width"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Dimension/height"/>
+      </genClasses>
+      <genClasses ecoreClass="base.ecore#//layout/Orientation">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Orientation/orientation"/>
+      </genClasses>
+      <genClasses ecoreClass="base.ecore#//layout/Points">
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference base.ecore#//layout/Points/points"/>
+      </genClasses>
+      <genClasses ecoreClass="base.ecore#//layout/Angle">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Angle/angle"/>
+      </genClasses>
+      <genClasses ecoreClass="base.ecore#//layout/Offset">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute base.ecore#//layout/Offset/offset"/>
+      </genClasses>
+      <genClasses ecoreClass="base.ecore#//layout/OffsetOrientation"/>
+    </nestedGenPackages>
+    <nestedGenPackages prefix="Base" basePackage="org.fortiss.tooling.base.model"
+        disposableProviderFactory="true" ecorePackage="base.ecore#//base">
+      <genClasses image="false" ecoreClass="base.ecore#//base/HierarchicElementBase"/>
+      <genClasses image="false" ecoreClass="base.ecore#//base/ConnectorBase"/>
+      <genClasses image="false" ecoreClass="base.ecore#//base/EntryConnectorBase"/>
+      <genClasses image="false" ecoreClass="base.ecore#//base/ExitConnectorBase"/>
+      <genClasses image="false" ecoreClass="base.ecore#//base/LocalConnectorBase"/>
+      <genClasses image="false" ecoreClass="base.ecore#//base/ConnectionSegmentBase"/>
+    </nestedGenPackages>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/org.fortiss.tooling.kernel/trunk/.project b/org.fortiss.tooling.kernel/trunk/.project
index e3b998e785a2b87bb65640315b726c83728a3a3e..9dcbadffe89f485b2537acacce8377c180ab60f9 100644
--- a/org.fortiss.tooling.kernel/trunk/.project
+++ b/org.fortiss.tooling.kernel/trunk/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.fortiss.ide.dev_tools.emf.builder.EcoreBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
index a84e422afaf9db93a08496c374c2e4ce6ba193e4..dbd89d36f1121b556eb10318ab1a5ed284b1548e 100644
--- a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
+++ b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    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/tooling/kernel" nsPrefix="org-fortiss-tooling-kernel">
-  <eClassifiers xsi:type="ecore:EClass" name="INamedElement" abstract="true" interface="true"
-      eSuperTypes="#//IIdLabeled">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Model elements implementing this interface have a unique id and a name."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The name attribute."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="INamedCommentedElement" abstract="true"
-      interface="true" eSuperTypes="#//INamedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Model elements implementing this interface have a unique id, a name and a comment."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The comment attribute."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IProjectRootElement" abstract="true"
-      interface="true" eSuperTypes="#//INamedCommentedElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="IProjectRootElement is the super class of all root elements contained in emfStore projects."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IIdLabeled" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Model elements implementing this interface have a unique identifier."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The unique integer id."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IIdLabeledReference" abstract="true"
-      interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Interface for model elements referencing IIdLabeled model elements."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="idReference" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The int reference."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+    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/tooling/kernel" nsPrefix="org-fortiss-tooling-kernel">
+  <eClassifiers xsi:type="ecore:EClass" name="INamedElement" abstract="true" interface="true"
+      eSuperTypes="#//IIdLabeled">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Model elements implementing this interface have a unique id and a name."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The name attribute."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="INamedCommentedElement" abstract="true"
+      interface="true" eSuperTypes="#//INamedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Model elements implementing this interface have a unique id, a name and a comment."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The comment attribute."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IProjectRootElement" abstract="true"
+      interface="true" eSuperTypes="#//INamedCommentedElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="IProjectRootElement is the super class of all root elements contained in emfStore projects."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IIdLabeled" abstract="true" interface="true">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Model elements implementing this interface have a unique identifier."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The unique integer id."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IIdLabeledReference" abstract="true"
+      interface="true">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Interface for model elements referencing IIdLabeled model elements."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="idReference" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="The int reference."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
index 069aabd62a17adf758c7f586c906afe08cb76658..568fedb91c4d5778bea82764e2b23e599a83de88 100644
--- a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
+++ b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
@@ -1,29 +1,28 @@
-<?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" copyrightText="(c) 2011 ForTISS GmbH"
-    modelDirectory="/org.fortiss.tooling.kernel/generated-src" editDirectory="org.fortiss.tooling.kernel.edit/src"
-    editorDirectory="/org.fortiss.tooling.kernel.editor/src" modelPluginID="org.fortiss.tooling.kernel"
-    modelName="Model" modelPluginClass="" editPluginClass="org.fortiss.tooling.kernel.model.provider.ModelEditPlugin"
-    editorPluginClass="org.fortiss.tooling.kernel.model.presentation.ModelEditorPlugin"
-    testsDirectory="/org.fortiss.tooling.kernel.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
-    containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false">
-  <foreignModel>kernel.ecore</foreignModel>
-  <genPackages prefix="FortissToolingKernel" basePackage="org.fortiss.tooling.kernel"
-      disposableProviderFactory="true" ecorePackage="kernel.ecore#/">
-    <genClasses image="false" ecoreClass="kernel.ecore#//INamedElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//INamedElement/name"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="kernel.ecore#//INamedCommentedElement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//INamedCommentedElement/comment"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="kernel.ecore#//IProjectRootElement"/>
-    <genClasses image="false" ecoreClass="kernel.ecore#//IIdLabeled">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//IIdLabeled/id"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="kernel.ecore#//IRemovable">
-      <genOperations ecoreOperation="kernel.ecore#//IRemovable/canRemove"/>
-      <genOperations ecoreOperation="kernel.ecore#//IRemovable/remove"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?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" copyrightText="(c) 2011 ForTISS GmbH"
+    modelDirectory="/org.fortiss.tooling.kernel/generated-src" editDirectory="org.fortiss.tooling.kernel.edit/src"
+    editorDirectory="/org.fortiss.tooling.kernel.editor/src" modelPluginID="org.fortiss.tooling.kernel"
+    modelName="Model" modelPluginClass="" editPluginClass="org.fortiss.tooling.kernel.model.provider.ModelEditPlugin"
+    editorPluginClass="org.fortiss.tooling.kernel.model.presentation.ModelEditorPlugin"
+    testsDirectory="/org.fortiss.tooling.kernel.tests/test-src" importerID="org.eclipse.emf.importer.ecore"
+    containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false">
+  <foreignModel>kernel.ecore</foreignModel>
+  <genPackages prefix="FortissToolingKernel" basePackage="org.fortiss.tooling.kernel"
+      disposableProviderFactory="true" ecorePackage="kernel.ecore#/">
+    <genClasses image="false" ecoreClass="kernel.ecore#//INamedElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//INamedElement/name"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="kernel.ecore#//INamedCommentedElement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//INamedCommentedElement/comment"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="kernel.ecore#//IProjectRootElement"/>
+    <genClasses image="false" ecoreClass="kernel.ecore#//IIdLabeled">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//IIdLabeled/id"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="kernel.ecore#//IIdLabeledReference">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//IIdLabeledReference/idReference"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>